diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-10-13 08:37:03 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-10-13 08:37:03 +0000 |
| commit | 8ef6f49690547f2f1c5cbbd85d3b47d8d2e0af78 (patch) | |
| tree | 0b219fcca5f1548ea9845541aca93dbcc7f6d451 /vcl/unx/gtk/window/gtkframe.cxx | |
| parent | b88549bbe05a0f2cba1064daf002a949f357f5ae (diff) | |
INTEGRATION: CWS merge20to201v2 (1.34.28); FILE MERGED
2005/10/07 14:28:03 hr 1.34.28.1: #i55617: merge OOO680 CWS macosx11
Diffstat (limited to 'vcl/unx/gtk/window/gtkframe.cxx')
| -rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 810a4afbbb2b..b934c59b9a75 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.35 $ + * $Revision: 1.36 $ * - * last change: $Author: hr $ $Date: 2005-09-28 14:56:47 $ + * last change: $Author: obo $ $Date: 2005-10-13 09:37:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,7 +67,11 @@ static USHORT GetKeyModCode( guint state ) USHORT nCode = 0; if( (state & GDK_SHIFT_MASK) ) nCode |= KEY_SHIFT; - if( (state & GDK_CONTROL_MASK) ) + if( (state & GDK_CONTROL_MASK) +#ifdef MACOSX + || (state & GDK_MOD2_MASK) // map Meta (aka Command key) to Ctrl +#endif + ) nCode |= KEY_MOD1; if( (state & GDK_MOD1_MASK) ) { @@ -1980,10 +1984,16 @@ gboolean GtkSalFrame::signalKey( GtkWidget* pWidget, GdkEventKey* pEvent, gpoint // The modifier mode therefore has to be adapted manually. switch( pEvent->keyval ) { +#ifdef MACOSX + case GDK_Meta_L: // map Meta (aka Command key) to Ctrl +#endif case GDK_Control_L: nExtModMask = MODKEY_LMOD1; nModMask = KEY_MOD1; break; +#ifdef MACOSX + case GDK_Meta_R: // map Meta (aka Command key) to Ctrl +#endif case GDK_Control_R: nExtModMask = MODKEY_RMOD1; nModMask = KEY_MOD1; |