Added defines to allow altered tab placement under gcc-2.95

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index c908c55ce86bd8697cd52786a206a915b5d95260..42dbd1e910c45d14fa1d2f99bd2d33dbacab7690 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -465,7 +465,8 @@ enum
   wxMGL_UNIX,               // MGL with direct hardware access
   wxMGL_X,                  // MGL on X
   wxMGL_WIN32,              // MGL on Win32
   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
+  wxWINDOWS_OS2             // Native OS/2 PM

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -810,6 +811,7 @@ enum wxStretch
 // and Win32 and is silently ignored under all other platforms
 #define wxTE_RICH           0x0080
 #define wxTE_NO_VSCROLL     0x0100
 // and Win32 and is silently ignored under all other platforms
 #define wxTE_RICH           0x0080
 #define wxTE_NO_VSCROLL     0x0100

+#define wxTE_AUTO_SCROLL    0x0200

 
 /*
  * wxComboBox style flags
 
 /*
  * wxComboBox style flags


@@ -947,6 +949,9 @@ enum wxStretch
  * wxNotebook flags
  */
 #define wxNB_FIXEDWIDTH       0x0008
  * wxNotebook flags
  */
 #define wxNB_FIXEDWIDTH       0x0008

+#define wxNB_LEFT             0x0020
+#define wxNB_RIGHT            0x0040
+#define wxNB_BOTTOM           0x0080

 
 /*
  * wxStatusBar95 flags
 
 /*
  * wxStatusBar95 flags


@@ -1066,6 +1071,8 @@ enum wxStretch
 #define wxID_SETUP              5110
 #define wxID_RESET              5111
 
 #define wxID_SETUP              5110
 #define wxID_RESET              5111
 

+// IDs used by generic file dialog (11 consecutive starting from this value)
+#define wxID_FILEDLGG           5900

 #define wxID_HIGHEST            5999
 
 // ----------------------------------------------------------------------------
 #define wxID_HIGHEST            5999
 
 // ----------------------------------------------------------------------------


@@ -1466,8 +1473,15 @@ typedef unsigned long   WXHDC;
 typedef unsigned int    WXUINT;
 typedef unsigned long   WXDWORD;
 typedef unsigned short  WXWORD;
 typedef unsigned int    WXUINT;
 typedef unsigned long   WXDWORD;
 typedef unsigned short  WXWORD;

+#ifdef __WXMSW__

 typedef unsigned int    WXWPARAM;
 typedef long            WXLPARAM;
 typedef unsigned int    WXWPARAM;
 typedef long            WXLPARAM;

+#else
+#  define WXWPARAM      MPARAM
+#  define WXLPARAM      MPARAM
+#  define RECT          RECTL
+#  define LOGFONT       FATTRS
+#endif

 typedef unsigned long   WXCOLORREF;
 typedef void *          WXRGNDATA;
 typedef void *          WXMSG;
 typedef unsigned long   WXCOLORREF;
 typedef void *          WXRGNDATA;
 typedef void *          WXMSG;