summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-01-14 15:20:04 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-01-14 15:20:04 +0000
commit2a823d4321227cb486d2994f110073f6427de6bb (patch)
tree801b0e2f9150b82d89a4dbb244b792bb88bc9079
parent4016b5175fd5e53ef9c36a74d8bfab1b6563256f (diff)
INTEGRATION: CWS aquavcl04 (1.2.178); FILE MERGED
2007/10/19 14:42:28 pl 1.2.178.1: #i79131# no more KEY_CONTROLMOD
-rw-r--r--vcl/inc/vcl/keycod.hxx20
-rw-r--r--vcl/inc/vcl/keycodes.hxx11
2 files changed, 7 insertions, 24 deletions
diff --git a/vcl/inc/vcl/keycod.hxx b/vcl/inc/vcl/keycod.hxx
index 13e14419cac8..8c91c5728546 100644
--- a/vcl/inc/vcl/keycod.hxx
+++ b/vcl/inc/vcl/keycod.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: keycod.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: vg $ $Date: 2007-04-11 17:58:51 $
+ * last change: $Author: ihi $ $Date: 2008-01-14 16:19:51 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -95,11 +95,7 @@ public:
KeyCode( KeyFuncType eFunction );
USHORT GetFullCode() const { return nCode; }
-#ifdef MACOSX
USHORT GetFullKeyCode() const { return (nCode) ; }
-#else
- USHORT GetFullKeyCode() const { return (nCode & ~KEY_CONTROLMOD); }
-#endif
KeyFuncType GetFullFunction() const { return eFunc; }
BOOL IsDefinedKeyCodeEqual( const KeyCode& rKeyCode ) const;
@@ -116,16 +112,8 @@ public:
{ return ((nCode & KEY_MOD1) != 0); }
BOOL IsMod2() const
{ return ((nCode & KEY_MOD2) != 0); }
-#ifdef MACOSX
- // [ericb 07/2006]] Remap ALT with mod5, working fine with Tiger
- BOOL IsMod5() const
- { return ((nCode & KEY_MOD5) != 0); }
- BOOL IsControlMod() const
- { return (IsMod2() && IsMod1() && IsMod5()); }
-#else
- BOOL IsControlMod() const
- { return ((nCode & KEY_CONTROLMOD) != 0); }
-#endif
+ BOOL IsMod3() const
+ { return ((nCode & KEY_MOD3) != 0); }
USHORT GetGroup() const
{ return (nCode & KEYGROUP_TYPE); }
diff --git a/vcl/inc/vcl/keycodes.hxx b/vcl/inc/vcl/keycodes.hxx
index 55019a3782f0..051528439d51 100644
--- a/vcl/inc/vcl/keycodes.hxx
+++ b/vcl/inc/vcl/keycodes.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: keycodes.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: vg $ $Date: 2007-04-11 17:59:01 $
+ * last change: $Author: ihi $ $Date: 2008-01-14 16:20:04 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -177,13 +177,8 @@
#define KEY_SHIFT ((USHORT)0x1000)
#define KEY_MOD1 ((USHORT)0x2000)
#define KEY_MOD2 ((USHORT)0x4000)
-#ifdef MACOSX
-#define KEY_MOD5 ((USHORT)0x8000)
+#define KEY_MOD3 ((USHORT)0x8000)
#define KEY_MODTYPE ((USHORT)0xF000)
-#else
-#define KEY_MODTYPE ((USHORT)0x7000)
-#define KEY_CONTROLMOD ((USHORT)0x8000)
-#endif
#define KEY_ALLMODTYPE ((USHORT)0xF000)
// extended Modifier-Keys (only used for modkey events)