diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 15:24:00 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 15:24:00 +0000 |
| commit | fccdb28ea96232f34ee7d02a6c7b74ddaa6f4d18 (patch) | |
| tree | 0b234bed687bca7267b436ce8c20ab5a26381c78 /vcl/unx/gtk/window/gtkframe.cxx | |
| parent | 10fe07bfa5afccd39f6d50e991d0662e385ef05a (diff) | |
INTEGRATION: CWS aquavcl04 (1.71.2); FILE MERGED
2007/10/19 16:46:41 pl 1.71.2.2: fix a typo
2007/10/19 14:42:30 pl 1.71.2.1: #i79131# no more KEY_CONTROLMOD
Diffstat (limited to 'vcl/unx/gtk/window/gtkframe.cxx')
| -rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 460d70dbd450..e75a6604aedf 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -4,9 +4,9 @@ * * $RCSfile: gtkframe.cxx,v $ * - * $Revision: 1.72 $ + * $Revision: 1.73 $ * - * last change: $Author: kz $ $Date: 2007-12-12 13:21:04 $ + * last change: $Author: ihi $ $Date: 2008-01-14 16:24:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -98,11 +98,9 @@ static USHORT GetKeyModCode( guint state ) if( (state & GDK_MOD1_MASK) ) { nCode |= KEY_MOD2; - if( ! (nCode & KEY_MOD1) ) #ifdef MACOSX - nCode |= KEY_MOD5; -#else - nCode |= KEY_CONTROLMOD; + if( ! (nCode & KEY_MOD1) ) + nCode |= KEY_MOD3; #endif } return nCode; @@ -2835,17 +2833,17 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame case GDK_Alt_L: nExtModMask = MODKEY_LMOD2; #ifdef MACOSX - nModMask = KEY_MOD5 | (pEvent->type == GDK_KEY_RELEASE ? KEY_MOD5: 0); + nModMask = KEY_MOD3; #else - nModMask = KEY_MOD2 | (pEvent->type == GDK_KEY_RELEASE ? KEY_CONTROLMOD : 0); + nModMask = KEY_MOD2; #endif break; case GDK_Alt_R: nExtModMask = MODKEY_RMOD2; #ifdef MACOSX - nModMask = KEY_MOD2 | (pEvent->type == GDK_KEY_RELEASE ? KEY_MOD5 : 0); + nModMask = KEY_MOD2 | (pEvent->type == GDK_KEY_RELEASE ? KEY_MOD3 : 0); #else - nModMask = KEY_MOD2 | (pEvent->type == GDK_KEY_RELEASE ? KEY_CONTROLMOD : 0); + nModMask = KEY_MOD2; #endif break; case GDK_Shift_L: @@ -2877,11 +2875,7 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame { // emulate KEY_MENU if( ( pEvent->keyval == GDK_Alt_L || pEvent->keyval == GDK_Alt_R ) && -#ifdef MACOSX - ( nModCode & ~(KEY_MOD5|KEY_MOD2)) == 0 ) -#else - ( nModCode & ~(KEY_CONTROLMOD|KEY_MOD2)) == 0 ) -#endif + ( nModCode & ~(KEY_MOD3|KEY_MOD2)) == 0 ) { if( pEvent->type == GDK_KEY_PRESS ) pThis->m_bSingleAltPress = true; |