X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/329e86bfdedacf2736fa77eea1ae171c3c732355..bcbc841d417b8365e869003bb0552166f3ece204:/include/wx/defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 679247afa2..1fc466a7dc 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -108,6 +108,14 @@
 #   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
@@ -402,7 +410,7 @@ enum
   wxMGL_UNIX,               // MGL with direct hardware access
   wxMGL_X,                  // MGL on X 
   wxMGL_WIN32,              // MGL on Win32
-  wxMGL_OS2,                // MGL on OS/2
+  wxMGL_OS2                 // MGL on OS/2
 };
 
 // ----------------------------------------------------------------------------
@@ -411,54 +419,54 @@ enum
 
 // fixed length types
 
-typedef  char    signed  wxInt8;
-typedef  char  unsigned  wxUint8;
+#define wxInt8    char    signed
+#define wxUint8   char  unsigned  
 
 #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__
-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__
-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__
-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... */
-    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
-    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
 
-typedef  wxUint8         wxByte;
-typedef  wxUint16        wxWord;
+#define  wxByte   wxUint8
+#define  wxWord   wxUint16        
 
 // byte sex
 
@@ -644,8 +652,6 @@ typedef  wxUint16        wxWord;
  */
 // 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
@@ -862,6 +868,8 @@ typedef  wxUint16        wxWord;
 
 #define wxICON_EXCLAMATION      0x00000040
 #define wxICON_HAND             0x00000080
+#define wxICON_WARNING          wxICON_EXCLAMATION
+#define wxICON_ERROR            wxICON_HAND
 #define wxICON_QUESTION         0x00000100
 #define wxICON_INFORMATION      0x00000200
 #define wxICON_STOP             wxICON_HAND