INTEGRATION: CWS res32bit (1.2.46); FILE MERGED

2004/10/22 14:01:15 pl 1.2.46.2: RESYNC: (1.2-1.3); FILE MERGED
2004/10/22 13:54:29 pl 1.2.46.1: #i34513# free rsc of 32 bit constraints

1 files changed, 123 insertions, 123 deletions

diff --git a/rsc/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx
index 20c7417fdefc..51631917637f 100644
--- a/rsc/inc/vclrsc.hxx
+++ b/rsc/inc/vclrsc.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: vclrsc.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2004-10-13 08:23:23 $
+ *  last change: $Author: obo $ $Date: 2005-01-03 17:24:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -229,128 +229,128 @@ enum TimeFieldFormat {TIMEF_NONE, TIMEF_SEC, TIMEF_100TH_SEC, TIMEF_SEC_CS, Time
 
 // from vcl/inc/keycodes.hxx
 // Key-Gruppen
-#define KEYGROUP_NUM    ((USHORT)0x0100)
-#define KEYGROUP_ALPHA  ((USHORT)0x0200)
-#define KEYGROUP_FKEYS  ((USHORT)0x0300)
-#define KEYGROUP_CURSOR ((USHORT)0x0400)
-#define KEYGROUP_MISC   ((USHORT)0x0500)
-#define KEYGROUP_TYPE   ((USHORT)0x0F00)
+#define KEYGROUP_NUM    ((sal_uInt16)0x0100)
+#define KEYGROUP_ALPHA  ((sal_uInt16)0x0200)
+#define KEYGROUP_FKEYS  ((sal_uInt16)0x0300)
+#define KEYGROUP_CURSOR ((sal_uInt16)0x0400)
+#define KEYGROUP_MISC   ((sal_uInt16)0x0500)
+#define KEYGROUP_TYPE   ((sal_uInt16)0x0F00)
 
 // Key-Codes
-#define KEY_0           ((USHORT)(KEYGROUP_NUM+0))
-#define KEY_1           ((USHORT)(KEYGROUP_NUM+1))
-#define KEY_2           ((USHORT)(KEYGROUP_NUM+2))
-#define KEY_3           ((USHORT)(KEYGROUP_NUM+3))
-#define KEY_4           ((USHORT)(KEYGROUP_NUM+4))
-#define KEY_5           ((USHORT)(KEYGROUP_NUM+5))
-#define KEY_6           ((USHORT)(KEYGROUP_NUM+6))
-#define KEY_7           ((USHORT)(KEYGROUP_NUM+7))
-#define KEY_8           ((USHORT)(KEYGROUP_NUM+8))
-#define KEY_9           ((USHORT)(KEYGROUP_NUM+9))
-
-#define KEY_A           ((USHORT)(KEYGROUP_ALPHA+0))
-#define KEY_B           ((USHORT)(KEYGROUP_ALPHA+1))
-#define KEY_C           ((USHORT)(KEYGROUP_ALPHA+2))
-#define KEY_D           ((USHORT)(KEYGROUP_ALPHA+3))
-#define KEY_E           ((USHORT)(KEYGROUP_ALPHA+4))
-#define KEY_F           ((USHORT)(KEYGROUP_ALPHA+5))
-#define KEY_G           ((USHORT)(KEYGROUP_ALPHA+6))
-#define KEY_H           ((USHORT)(KEYGROUP_ALPHA+7))
-#define KEY_I           ((USHORT)(KEYGROUP_ALPHA+8))
-#define KEY_J           ((USHORT)(KEYGROUP_ALPHA+9))
-#define KEY_K           ((USHORT)(KEYGROUP_ALPHA+10))
-#define KEY_L           ((USHORT)(KEYGROUP_ALPHA+11))
-#define KEY_M           ((USHORT)(KEYGROUP_ALPHA+12))
-#define KEY_N           ((USHORT)(KEYGROUP_ALPHA+13))
-#define KEY_O           ((USHORT)(KEYGROUP_ALPHA+14))
-#define KEY_P           ((USHORT)(KEYGROUP_ALPHA+15))
-#define KEY_Q           ((USHORT)(KEYGROUP_ALPHA+16))
-#define KEY_R           ((USHORT)(KEYGROUP_ALPHA+17))
-#define KEY_S           ((USHORT)(KEYGROUP_ALPHA+18))
-#define KEY_T           ((USHORT)(KEYGROUP_ALPHA+19))
-#define KEY_U           ((USHORT)(KEYGROUP_ALPHA+20))
-#define KEY_V           ((USHORT)(KEYGROUP_ALPHA+21))
-#define KEY_W           ((USHORT)(KEYGROUP_ALPHA+22))
-#define KEY_X           ((USHORT)(KEYGROUP_ALPHA+23))
-#define KEY_Y           ((USHORT)(KEYGROUP_ALPHA+24))
-#define KEY_Z           ((USHORT)(KEYGROUP_ALPHA+25))
-
-#define KEY_F1          ((USHORT)(KEYGROUP_FKEYS+0))
-#define KEY_F2          ((USHORT)(KEYGROUP_FKEYS+1))
-#define KEY_F3          ((USHORT)(KEYGROUP_FKEYS+2))
-#define KEY_F4          ((USHORT)(KEYGROUP_FKEYS+3))
-#define KEY_F5          ((USHORT)(KEYGROUP_FKEYS+4))
-#define KEY_F6          ((USHORT)(KEYGROUP_FKEYS+5))
-#define KEY_F7          ((USHORT)(KEYGROUP_FKEYS+6))
-#define KEY_F8          ((USHORT)(KEYGROUP_FKEYS+7))
-#define KEY_F9          ((USHORT)(KEYGROUP_FKEYS+8))
-#define KEY_F10         ((USHORT)(KEYGROUP_FKEYS+9))
-#define KEY_F11         ((USHORT)(KEYGROUP_FKEYS+10))
-#define KEY_F12         ((USHORT)(KEYGROUP_FKEYS+11))
-#define KEY_F13         ((USHORT)(KEYGROUP_FKEYS+12))
-#define KEY_F14         ((USHORT)(KEYGROUP_FKEYS+13))
-#define KEY_F15         ((USHORT)(KEYGROUP_FKEYS+14))
-#define KEY_F16         ((USHORT)(KEYGROUP_FKEYS+15))
-#define KEY_F17         ((USHORT)(KEYGROUP_FKEYS+16))
-#define KEY_F18         ((USHORT)(KEYGROUP_FKEYS+17))
-#define KEY_F19         ((USHORT)(KEYGROUP_FKEYS+18))
-#define KEY_F20         ((USHORT)(KEYGROUP_FKEYS+19))
-#define KEY_F21         ((USHORT)(KEYGROUP_FKEYS+20))
-#define KEY_F22         ((USHORT)(KEYGROUP_FKEYS+21))
-#define KEY_F23         ((USHORT)(KEYGROUP_FKEYS+22))
-#define KEY_F24         ((USHORT)(KEYGROUP_FKEYS+23))
-#define KEY_F25         ((USHORT)(KEYGROUP_FKEYS+24))
-#define KEY_F26         ((USHORT)(KEYGROUP_FKEYS+25))
-
-#define KEY_DOWN        ((USHORT)(KEYGROUP_CURSOR+0))
-#define KEY_UP          ((USHORT)(KEYGROUP_CURSOR+1))
-#define KEY_LEFT        ((USHORT)(KEYGROUP_CURSOR+2))
-#define KEY_RIGHT       ((USHORT)(KEYGROUP_CURSOR+3))
-#define KEY_HOME        ((USHORT)(KEYGROUP_CURSOR+4))
-#define KEY_END         ((USHORT)(KEYGROUP_CURSOR+5))
-#define KEY_PAGEUP      ((USHORT)(KEYGROUP_CURSOR+6))
-#define KEY_PAGEDOWN    ((USHORT)(KEYGROUP_CURSOR+7))
-
-#define KEY_RETURN      ((USHORT)(KEYGROUP_MISC+0))
-#define KEY_ESCAPE      ((USHORT)(KEYGROUP_MISC+1))
-#define KEY_TAB         ((USHORT)(KEYGROUP_MISC+2))
-#define KEY_BACKSPACE   ((USHORT)(KEYGROUP_MISC+3))
-#define KEY_SPACE       ((USHORT)(KEYGROUP_MISC+4))
-#define KEY_INSERT      ((USHORT)(KEYGROUP_MISC+5))
-#define KEY_DELETE      ((USHORT)(KEYGROUP_MISC+6))
-
-#define KEY_ADD         ((USHORT)(KEYGROUP_MISC+7))
-#define KEY_SUBTRACT    ((USHORT)(KEYGROUP_MISC+8))
-#define KEY_MULTIPLY    ((USHORT)(KEYGROUP_MISC+9))
-#define KEY_DIVIDE      ((USHORT)(KEYGROUP_MISC+10))
-#define KEY_POINT       ((USHORT)(KEYGROUP_MISC+11))
-#define KEY_COMMA       ((USHORT)(KEYGROUP_MISC+12))
-#define KEY_LESS        ((USHORT)(KEYGROUP_MISC+13))
-#define KEY_GREATER     ((USHORT)(KEYGROUP_MISC+14))
-#define KEY_EQUAL       ((USHORT)(KEYGROUP_MISC+15))
-
-#define KEY_OPEN        ((USHORT)(KEYGROUP_MISC+16))
-#define KEY_CUT         ((USHORT)(KEYGROUP_MISC+17))
-#define KEY_COPY        ((USHORT)(KEYGROUP_MISC+18))
-#define KEY_PASTE       ((USHORT)(KEYGROUP_MISC+19))
-#define KEY_UNDO        ((USHORT)(KEYGROUP_MISC+20))
-#define KEY_REPEAT      ((USHORT)(KEYGROUP_MISC+21))
-#define KEY_FIND        ((USHORT)(KEYGROUP_MISC+22))
-#define KEY_PROPERTIES  ((USHORT)(KEYGROUP_MISC+23))
-#define KEY_FRONT       ((USHORT)(KEYGROUP_MISC+24))
-#define KEY_CONTEXTMENU ((USHORT)(KEYGROUP_MISC+25))
-#define KEY_MENU        ((USHORT)(KEYGROUP_MISC+26))
-#define KEY_HELP        ((USHORT)(KEYGROUP_MISC+27))
-
-#define KEY_CODE        ((USHORT)0x0FFF)
+#define KEY_0           ((sal_uInt16)(KEYGROUP_NUM+0))
+#define KEY_1           ((sal_uInt16)(KEYGROUP_NUM+1))
+#define KEY_2           ((sal_uInt16)(KEYGROUP_NUM+2))
+#define KEY_3           ((sal_uInt16)(KEYGROUP_NUM+3))
+#define KEY_4           ((sal_uInt16)(KEYGROUP_NUM+4))
+#define KEY_5           ((sal_uInt16)(KEYGROUP_NUM+5))
+#define KEY_6           ((sal_uInt16)(KEYGROUP_NUM+6))
+#define KEY_7           ((sal_uInt16)(KEYGROUP_NUM+7))
+#define KEY_8           ((sal_uInt16)(KEYGROUP_NUM+8))
+#define KEY_9           ((sal_uInt16)(KEYGROUP_NUM+9))
+
+#define KEY_A           ((sal_uInt16)(KEYGROUP_ALPHA+0))
+#define KEY_B           ((sal_uInt16)(KEYGROUP_ALPHA+1))
+#define KEY_C           ((sal_uInt16)(KEYGROUP_ALPHA+2))
+#define KEY_D           ((sal_uInt16)(KEYGROUP_ALPHA+3))
+#define KEY_E           ((sal_uInt16)(KEYGROUP_ALPHA+4))
+#define KEY_F           ((sal_uInt16)(KEYGROUP_ALPHA+5))
+#define KEY_G           ((sal_uInt16)(KEYGROUP_ALPHA+6))
+#define KEY_H           ((sal_uInt16)(KEYGROUP_ALPHA+7))
+#define KEY_I           ((sal_uInt16)(KEYGROUP_ALPHA+8))
+#define KEY_J           ((sal_uInt16)(KEYGROUP_ALPHA+9))
+#define KEY_K           ((sal_uInt16)(KEYGROUP_ALPHA+10))
+#define KEY_L           ((sal_uInt16)(KEYGROUP_ALPHA+11))
+#define KEY_M           ((sal_uInt16)(KEYGROUP_ALPHA+12))
+#define KEY_N           ((sal_uInt16)(KEYGROUP_ALPHA+13))
+#define KEY_O           ((sal_uInt16)(KEYGROUP_ALPHA+14))
+#define KEY_P           ((sal_uInt16)(KEYGROUP_ALPHA+15))
+#define KEY_Q           ((sal_uInt16)(KEYGROUP_ALPHA+16))
+#define KEY_R           ((sal_uInt16)(KEYGROUP_ALPHA+17))
+#define KEY_S           ((sal_uInt16)(KEYGROUP_ALPHA+18))
+#define KEY_T           ((sal_uInt16)(KEYGROUP_ALPHA+19))
+#define KEY_U           ((sal_uInt16)(KEYGROUP_ALPHA+20))
+#define KEY_V           ((sal_uInt16)(KEYGROUP_ALPHA+21))
+#define KEY_W           ((sal_uInt16)(KEYGROUP_ALPHA+22))
+#define KEY_X           ((sal_uInt16)(KEYGROUP_ALPHA+23))
+#define KEY_Y           ((sal_uInt16)(KEYGROUP_ALPHA+24))
+#define KEY_Z           ((sal_uInt16)(KEYGROUP_ALPHA+25))
+
+#define KEY_F1          ((sal_uInt16)(KEYGROUP_FKEYS+0))
+#define KEY_F2          ((sal_uInt16)(KEYGROUP_FKEYS+1))
+#define KEY_F3          ((sal_uInt16)(KEYGROUP_FKEYS+2))
+#define KEY_F4          ((sal_uInt16)(KEYGROUP_FKEYS+3))
+#define KEY_F5          ((sal_uInt16)(KEYGROUP_FKEYS+4))
+#define KEY_F6          ((sal_uInt16)(KEYGROUP_FKEYS+5))
+#define KEY_F7          ((sal_uInt16)(KEYGROUP_FKEYS+6))
+#define KEY_F8          ((sal_uInt16)(KEYGROUP_FKEYS+7))
+#define KEY_F9          ((sal_uInt16)(KEYGROUP_FKEYS+8))
+#define KEY_F10         ((sal_uInt16)(KEYGROUP_FKEYS+9))
+#define KEY_F11         ((sal_uInt16)(KEYGROUP_FKEYS+10))
+#define KEY_F12         ((sal_uInt16)(KEYGROUP_FKEYS+11))
+#define KEY_F13         ((sal_uInt16)(KEYGROUP_FKEYS+12))
+#define KEY_F14         ((sal_uInt16)(KEYGROUP_FKEYS+13))
+#define KEY_F15         ((sal_uInt16)(KEYGROUP_FKEYS+14))
+#define KEY_F16         ((sal_uInt16)(KEYGROUP_FKEYS+15))
+#define KEY_F17         ((sal_uInt16)(KEYGROUP_FKEYS+16))
+#define KEY_F18         ((sal_uInt16)(KEYGROUP_FKEYS+17))
+#define KEY_F19         ((sal_uInt16)(KEYGROUP_FKEYS+18))
+#define KEY_F20         ((sal_uInt16)(KEYGROUP_FKEYS+19))
+#define KEY_F21         ((sal_uInt16)(KEYGROUP_FKEYS+20))
+#define KEY_F22         ((sal_uInt16)(KEYGROUP_FKEYS+21))
+#define KEY_F23         ((sal_uInt16)(KEYGROUP_FKEYS+22))
+#define KEY_F24         ((sal_uInt16)(KEYGROUP_FKEYS+23))
+#define KEY_F25         ((sal_uInt16)(KEYGROUP_FKEYS+24))
+#define KEY_F26         ((sal_uInt16)(KEYGROUP_FKEYS+25))
+
+#define KEY_DOWN        ((sal_uInt16)(KEYGROUP_CURSOR+0))
+#define KEY_UP          ((sal_uInt16)(KEYGROUP_CURSOR+1))
+#define KEY_LEFT        ((sal_uInt16)(KEYGROUP_CURSOR+2))
+#define KEY_RIGHT       ((sal_uInt16)(KEYGROUP_CURSOR+3))
+#define KEY_HOME        ((sal_uInt16)(KEYGROUP_CURSOR+4))
+#define KEY_END         ((sal_uInt16)(KEYGROUP_CURSOR+5))
+#define KEY_PAGEUP      ((sal_uInt16)(KEYGROUP_CURSOR+6))
+#define KEY_PAGEDOWN    ((sal_uInt16)(KEYGROUP_CURSOR+7))
+
+#define KEY_RETURN      ((sal_uInt16)(KEYGROUP_MISC+0))
+#define KEY_ESCAPE      ((sal_uInt16)(KEYGROUP_MISC+1))
+#define KEY_TAB         ((sal_uInt16)(KEYGROUP_MISC+2))
+#define KEY_BACKSPACE   ((sal_uInt16)(KEYGROUP_MISC+3))
+#define KEY_SPACE       ((sal_uInt16)(KEYGROUP_MISC+4))
+#define KEY_INSERT      ((sal_uInt16)(KEYGROUP_MISC+5))
+#define KEY_DELETE      ((sal_uInt16)(KEYGROUP_MISC+6))
+
+#define KEY_ADD         ((sal_uInt16)(KEYGROUP_MISC+7))
+#define KEY_SUBTRACT    ((sal_uInt16)(KEYGROUP_MISC+8))
+#define KEY_MULTIPLY    ((sal_uInt16)(KEYGROUP_MISC+9))
+#define KEY_DIVIDE      ((sal_uInt16)(KEYGROUP_MISC+10))
+#define KEY_POINT       ((sal_uInt16)(KEYGROUP_MISC+11))
+#define KEY_COMMA       ((sal_uInt16)(KEYGROUP_MISC+12))
+#define KEY_LESS        ((sal_uInt16)(KEYGROUP_MISC+13))
+#define KEY_GREATER     ((sal_uInt16)(KEYGROUP_MISC+14))
+#define KEY_EQUAL       ((sal_uInt16)(KEYGROUP_MISC+15))
+
+#define KEY_OPEN        ((sal_uInt16)(KEYGROUP_MISC+16))
+#define KEY_CUT         ((sal_uInt16)(KEYGROUP_MISC+17))
+#define KEY_COPY        ((sal_uInt16)(KEYGROUP_MISC+18))
+#define KEY_PASTE       ((sal_uInt16)(KEYGROUP_MISC+19))
+#define KEY_UNDO        ((sal_uInt16)(KEYGROUP_MISC+20))
+#define KEY_REPEAT      ((sal_uInt16)(KEYGROUP_MISC+21))
+#define KEY_FIND        ((sal_uInt16)(KEYGROUP_MISC+22))
+#define KEY_PROPERTIES  ((sal_uInt16)(KEYGROUP_MISC+23))
+#define KEY_FRONT       ((sal_uInt16)(KEYGROUP_MISC+24))
+#define KEY_CONTEXTMENU ((sal_uInt16)(KEYGROUP_MISC+25))
+#define KEY_MENU        ((sal_uInt16)(KEYGROUP_MISC+26))
+#define KEY_HELP        ((sal_uInt16)(KEYGROUP_MISC+27))
+
+#define KEY_CODE        ((sal_uInt16)0x0FFF)
 
 // Modifier-Tasten
-#define KEY_SHIFT       ((USHORT)0x1000)
-#define KEY_MOD1        ((USHORT)0x2000)
-#define KEY_MOD2        ((USHORT)0x4000)
-#define KEY_MODTYPE     ((USHORT)0x7000)
-#define KEY_CONTROLMOD  ((USHORT)0x8000)
-#define KEY_ALLMODTYPE  ((USHORT)0xF000)
+#define KEY_SHIFT       ((sal_uInt16)0x1000)
+#define KEY_MOD1        ((sal_uInt16)0x2000)
+#define KEY_MOD2        ((sal_uInt16)0x4000)
+#define KEY_MODTYPE     ((sal_uInt16)0x7000)
+#define KEY_CONTROLMOD  ((sal_uInt16)0x8000)
+#define KEY_ALLMODTYPE  ((sal_uInt16)0xF000)
 
 
 // from vcl/inc/vclenum.hxx
@@ -391,7 +391,7 @@ enum MapUnit { MAP_100TH_MM, MAP_10TH_MM, MAP_MM, MAP_CM,
 // --------------------------
 
 // from vcl/inc/toolbox.hxx
-typedef USHORT ToolBoxItemBits;
+typedef sal_uInt16 ToolBoxItemBits;
 
 #define TIB_CHECKABLE           ((ToolBoxItemBits)0x0001)
 #define TIB_RADIOCHECK          ((ToolBoxItemBits)0x0002)
@@ -424,7 +424,7 @@ enum ImageAlign { IMAGEALIGN_LEFT, IMAGEALIGN_TOP, IMAGEALIGN_RIGHT, IMAGEALIGN_
 enum MenuItemType { MENUITEM_DONTKNOW, MENUITEM_STRING, MENUITEM_IMAGE,
                     MENUITEM_STRINGIMAGE, MENUITEM_SEPARATOR };
 
-typedef USHORT MenuItemBits;
+typedef sal_uInt16 MenuItemBits;
 
 #define MIB_CHECKABLE           ((MenuItemBits)0x0001)
 #define MIB_RADIOCHECK          ((MenuItemBits)0x0002)
@@ -438,7 +438,7 @@ typedef USHORT MenuItemBits;
 // ----------------
 
 // from vcl/inc/symbol.hxx
-typedef USHORT SymbolType;
+typedef sal_uInt16 SymbolType;
 #define SYMBOL_DONTKNOW         ((SymbolType)0)
 #define SYMBOL_IMAGE            ((SymbolType)1)
 #define SYMBOL_ARROW_UP         ((SymbolType)2)