forgot wx.rc

[wxWidgets.git] / include / wx / defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 565f80c520d3816fda4872fbd952bafb2e8b7fbd..1fc466a7dce0565e3f520e7ddbf2dd57936c2a8f 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -108,6 +108,14 @@
 #   pragma suppress 571             // Virtual function hiding
 #endif // __SALFORDC__
 
 #   pragma suppress 571             // Virtual function hiding
 #endif // __SALFORDC__
 

+#ifdef __VISUALC__
+#ifndef WIN32
+// VC1.5 does not have LPTSTR type
+#define LPTSTR LPSTR
+#define LPCTSTR LPCSTR
+#endif
+#endif
+

 // Digital Unix C++ compiler only defines this symbol for .cxx and .hxx files,
 // so define it ourselves
 #ifdef __DECCXX
 // Digital Unix C++ compiler only defines this symbol for .cxx and .hxx files,
 // so define it ourselves
 #ifdef __DECCXX


@@ -411,54 +419,54 @@ enum
 
 // fixed length types
 
 
 // fixed length types
 

-typedef  char    signed  wxInt8;
-typedef  char  unsigned  wxUint8;
+#define wxInt8    char    signed
+#define wxUint8   char  unsigned  

 
 #ifdef __WIN16__
 
 #ifdef __WIN16__

-typedef  int     signed  wxInt16;
-typedef  int   unsigned  wxUint16;
-typedef  long    signed  wxInt32;
-typedef  long  unsigned  wxUint32;
+#define wxInt16    int    signed  
+#define wxUint16   int  unsigned  
+#define wxInt32   long    signed  
+#define wxUint32  long  unsigned  

 #endif
 
 #ifdef __WIN32__
 #endif
 
 #ifdef __WIN32__

-typedef  short   signed  wxInt16;
-typedef  short unsigned  wxUint16;
-typedef  int     signed  wxInt32;
-typedef  int   unsigned  wxUint32;
+#define wxInt16  short    signed  
+#define wxUint16 short  unsigned  
+#define wxInt32    int    signed  
+#define wxUint32   int  unsigned  

 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__

-typedef  short   signed  wxInt16;
-typedef  short unsigned  wxUint16;
-typedef  int     signed  wxInt32;
-typedef  int   unsigned  wxUint32;
+#define wxInt16  short    signed  
+#define wxUint16 short  unsigned  
+#define wxInt32    int    signed  
+#define wxUint32   int  unsigned  

 #endif
 
 #ifdef __WXOS2__
 #endif
 
 #ifdef __WXOS2__

-typedef  short   signed  wxInt16;
-typedef  short unsigned  wxUint16;
-typedef  int     signed  wxInt32;
-typedef  int   unsigned  wxUint32;
+#define wxInt16  short    signed  
+#define wxUint16 short  unsigned  
+#define wxInt32    int    signed  
+#define wxUint32   int  unsigned  

 #endif
 
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXOS2__)
   #if defined(SIZEOF_INT)
     /* well, this shouldn't happen... */
 #endif
 
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXOS2__)
   #if defined(SIZEOF_INT)
     /* well, this shouldn't happen... */

-    typedef  short   signed  wxInt16;
-    typedef  short unsigned  wxUint16;
-    typedef  int     signed  wxInt32;
-    typedef  int   unsigned  wxUint32;
+    #define wxInt16  short    signed  
+    #define wxUint16 short  unsigned  
+    #define wxInt32    int    signed  
+    #define wxUint32   int  unsigned  

   #else
   #else

-    typedef  short   signed  wxInt16;
-    typedef  short unsigned  wxUint16;
-    typedef  int     signed  wxInt32;
-    typedef  int   unsigned  wxUint32;
+    #define wxInt16  short    signed  
+    #define wxUint16 short  unsigned  
+    #define wxInt32    int    signed  
+    #define wxUint32   int  unsigned  

   #endif
 #endif
 
   #endif
 #endif
 

-typedef  wxUint8         wxByte;
-typedef  wxUint16        wxWord;
+#define  wxByte   wxUint8
+#define  wxWord   wxUint16        

 
 // byte sex
 
 
 // byte sex
 


@@ -644,8 +652,6 @@ typedef  wxUint16        wxWord;
  */
 // use native docking
 #define wxMB_DOCKABLE       0x0001
  */
 // use native docking
 #define wxMB_DOCKABLE       0x0001

-// make all menus tearoff menus, even if not set on per-menu basis
-#define wxMB_TEAROFF        0x0002

 
 /*
  * wxMenu style flags
 
 /*
  * wxMenu style flags