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 bb9ac4effae41eaa6cb7e19397a8062c97a178bd..42dbd1e910c45d14fa1d2f99bd2d33dbacab7690 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -91,14 +91,18 @@
 
 // suppress some Visual C++ warnings
 #ifdef __VISUALC__
 
 // suppress some Visual C++ warnings
 #ifdef __VISUALC__

+#   pragma warning(disable:4201)    // nonstandard extension used: nameless struct/union

 #   pragma warning(disable:4244)    // conversion from double to float
 #   pragma warning(disable:4100)    // unreferenced formal parameter
 #   pragma warning(disable:4511)    // copy ctor couldn't be generated
 #   pragma warning(disable:4512)    // operator=() couldn't be generated
 #   pragma warning(disable:4244)    // conversion from double to float
 #   pragma warning(disable:4100)    // unreferenced formal parameter
 #   pragma warning(disable:4511)    // copy ctor couldn't be generated
 #   pragma warning(disable:4512)    // operator=() couldn't be generated

-#ifndef WIN32
+#   pragma warning(disable:4699)    // Using precompiled header

 #   pragma warning(disable:4134)    // conversion between pointers to members of same class
 #   pragma warning(disable:4134)    // conversion between pointers to members of same class

+#ifndef WIN32

 #   pragma warning(disable:4135)    // conversion between different integral types
 #   pragma warning(disable:4769)    // assignment of near pointer to long integer
 #   pragma warning(disable:4135)    // conversion between different integral types
 #   pragma warning(disable:4769)    // assignment of near pointer to long integer

+// This one is really annoying, since it occurs for each cast to (HANDLE)...
+#   pragma warning(disable:4305)    // truncation of long to near ptr

 #endif
 #endif // __VISUALC__
 
 #endif
 #endif // __VISUALC__
 


@@ -129,7 +133,7 @@
 #if defined(__HPUX__) && defined(__GNUG__)
     #define va_list __gnuc_va_list
 #endif // HP-UX
 #if defined(__HPUX__) && defined(__GNUG__)
     #define va_list __gnuc_va_list
 #endif // HP-UX

-    
+

 // Mingw32 gcc-2.95 uses new windows headers which are more ms-like
 // we are setting this define because of the complex check
 // using NORLANDER as Cygwin may follow. (header author is Anders Norlander)
 // Mingw32 gcc-2.95 uses new windows headers which are more ms-like
 // we are setting this define because of the complex check
 // using NORLANDER as Cygwin may follow. (header author is Anders Norlander)


@@ -461,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

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


@@ -599,7 +604,7 @@ enum wxOrientation
 {
     wxHORIZONTAL              = 0x0004,
     wxVERTICAL                = 0x0008,
 {
     wxHORIZONTAL              = 0x0004,
     wxVERTICAL                = 0x0008,

-    
+

     wxBOTH                    = (wxVERTICAL | wxHORIZONTAL)
 };
 
     wxBOTH                    = (wxVERTICAL | wxHORIZONTAL)
 };
 


@@ -609,15 +614,15 @@ enum wxDirection
     wxRIGHT                   = 0x0020,
     wxUP                      = 0x0040,
     wxDOWN                    = 0x0080,
     wxRIGHT                   = 0x0020,
     wxUP                      = 0x0040,
     wxDOWN                    = 0x0080,

-    
+

     wxTOP                     = wxUP,
     wxBOTTOM                  = wxDOWN,
     wxTOP                     = wxUP,
     wxBOTTOM                  = wxDOWN,

-    
+

     wxNORTH                   = wxUP,
     wxSOUTH                   = wxDOWN,
     wxWEST                    = wxLEFT,
     wxEAST                    = wxRIGHT,
     wxNORTH                   = wxUP,
     wxSOUTH                   = wxDOWN,
     wxWEST                    = wxLEFT,
     wxEAST                    = wxRIGHT,

-    
+

     wxALL                     = (wxUP | wxDOWN | wxRIGHT | wxLEFT)
 };
 
     wxALL                     = (wxUP | wxDOWN | wxRIGHT | wxLEFT)
 };
 


@@ -805,6 +810,8 @@ enum wxStretch
 // this style means to use RICHEDIT control and does something only under wxMSW
 // and Win32 and is silently ignored under all other platforms
 #define wxTE_RICH           0x0080
 // this style means to use RICHEDIT control and does something only under wxMSW
 // 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


@@ -836,16 +843,16 @@ enum wxStretch
 #define wxGA_HORIZONTAL      wxHORIZONTAL
 #define wxGA_VERTICAL        wxVERTICAL
 // Windows only
 #define wxGA_HORIZONTAL      wxHORIZONTAL
 #define wxGA_VERTICAL        wxVERTICAL
 // Windows only

-#define wxGA_SMOOTH          0x0008
+#define wxGA_SMOOTH          0x0010

 
 /*
  * wxSlider flags
  */
 
 /*
  * wxSlider flags
  */

-#define wxSL_HORIZONTAL      wxHORIZONTAL
-#define wxSL_VERTICAL        wxVERTICAL
+#define wxSL_HORIZONTAL      wxHORIZONTAL // 4
+#define wxSL_VERTICAL        wxVERTICAL   // 8

 // The next one is obsolete - use scroll events instead
 #define wxSL_NOTIFY_DRAG     0x0000
 // The next one is obsolete - use scroll events instead
 #define wxSL_NOTIFY_DRAG     0x0000

-#define wxSL_AUTOTICKS       0x0008
+#define wxSL_AUTOTICKS       0x0010

 // #define wxSL_MANUALTICKS     0x0010
 #define wxSL_LABELS          0x0020
 #define wxSL_LEFT            0x0040
 // #define wxSL_MANUALTICKS     0x0010
 #define wxSL_LABELS          0x0020
 #define wxSL_LEFT            0x0040


@@ -942,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


@@ -1061,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
 
 // ----------------------------------------------------------------------------


@@ -1461,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;