strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS vcl24 (1.6.2); FILE MERGED

Browse source 
2004/07/16 12:53:16 pl 1.6.2.3: RESYNC: (1.6-1.8); FILE MERGED
2004/07/06 13:04:31 pl 1.6.2.2: #i30981# menu highlight text color
2004/06/29 16:44:34 pl 1.6.2.1: #i29929# improve on keyinput <-> ime input conversion
This commit is contained in:
Rüdiger Timm 2004-07-23 09:05:32 +00:00
parent 50738ffe87
commit 88b1d319ec
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
vcl/unx/gtk/window/gtkframe.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: gtkframe.cxx,v $
*
* $Revision: 1.8 $
* $Revision: 1.9 $
*
* last change: $Author: obo $ $Date: 2004-07-06 13:50:35 $
* last change: $Author: rt $ $Date: 2004-07-23 10:05:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -165,7 +165,7 @@ static USHORT GetKeyCode( guint keyval )
return nCode;
}
static USHORT GetCharCodeFromUnicode( sal_Unicode cCode )
static USHORT GetKeyCodeFromUnicode( sal_Unicode cCode )
{
USHORT nRet = 0;
@ -1127,7 +1127,7 @@ void GtkSalFrame::UpdateSettings( AllSettings& rSettings )
// menu highlighting
aHighlightColor = getColor( pStyle->bg[ GTK_STATE_SELECTED ] );
aStyleSet.SetMenuHighlightColor( aHighlightColor );
aHighlightTextColor = getColor( pStyle->fg[ GTK_STATE_PRELIGHT ] );
aHighlightTextColor = getColor( pStyle->text[ GTK_STATE_PRELIGHT ] );
aStyleSet.SetMenuHighlightTextColor( aHighlightTextColor );
// UI font
@ -1517,7 +1517,7 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget* pWidget, GdkEventConfigure* pE
if( x != pThis->maGeometry.nX || y != pThis->maGeometry.nY )
bMoved = true;
if( (unsigned int)pEvent->width != pThis->maGeometry.nWidth || (unsigned int)pEvent->height != pThis->maGeometry.nHeight )
if( pEvent->width != (int)pThis->maGeometry.nWidth || pEvent->height != (int)pThis->maGeometry.nHeight )
bSized = true;
pThis->maGeometry.nX = x;
@ -1776,21 +1776,18 @@ void GtkSalFrame::signalIMCommit( GtkIMContext* pContext, gchar* pText, gpointer
*/
if( ! pThis->m_bWasPreedit && aTextEvent.maText.Len() == 1 )
{
USHORT nCharCode = GetCharCodeFromUnicode( aTextEvent.maText.GetChar( 0 ) );
if( nCharCode != 0 )
{
SalKeyEvent aEvent;
USHORT nCharCode = GetKeyCodeFromUnicode( aTextEvent.maText.GetChar( 0 ) );
SalKeyEvent aEvent;
aEvent.mnTime = 0;
aEvent.mnCode = nCharCode;
aEvent.mnCharCode = aTextEvent.maText.GetChar(0);
aEvent.mnRepeat = 0;
aEvent.mnTime = 0;
aEvent.mnCode = nCharCode;
aEvent.mnCharCode = aTextEvent.maText.GetChar(0);
aEvent.mnRepeat = 0;
pThis->m_bWasPreedit = false;
pThis->CallCallback( SALEVENT_KEYINPUT, &aEvent );
pThis->CallCallback( SALEVENT_KEYUP, &aEvent );
return;
}
pThis->m_bWasPreedit = false;
pThis->CallCallback( SALEVENT_KEYINPUT, &aEvent );
pThis->CallCallback( SALEVENT_KEYUP, &aEvent );
return;
}
pThis->m_bWasPreedit = false;