Mingw32/gcc-2.95 change

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index f80688c80a22703fea7d8b57848be4b123a6a487..e35d3e8c9785fb060291e6fa50ca478b7793d45e 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -91,14 +91,18 @@
 
 // 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
-#ifndef WIN32
+#   pragma warning(disable:4699)    // Using precompiled header
 #   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
+// 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__
 
@@ -129,7 +133,7 @@
 #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)
@@ -239,7 +243,7 @@
 // (under Unix, configure tests for this)
 #ifndef HAVE_BOOL
     #if defined( __MWERKS__ )
-        #if (__MWERKS__ >= 0x1000) && !__option(bool)
+        #if (__MWERKS__ >= 0x1000) && __option(bool)
             #define HAVE_BOOL
         #endif
     #elif defined(__VISUALC__) && (__VISUALC__ == 1020)
@@ -599,7 +603,7 @@ enum wxOrientation
 {
     wxHORIZONTAL              = 0x0004,
     wxVERTICAL                = 0x0008,
-    
+
     wxBOTH                    = (wxVERTICAL | wxHORIZONTAL)
 };
 
@@ -609,15 +613,15 @@ enum wxDirection
     wxRIGHT                   = 0x0020,
     wxUP                      = 0x0040,
     wxDOWN                    = 0x0080,
-    
+
     wxTOP                     = wxUP,
     wxBOTTOM                  = wxDOWN,
-    
+
     wxNORTH                   = wxUP,
     wxSOUTH                   = wxDOWN,
     wxWEST                    = wxLEFT,
     wxEAST                    = wxRIGHT,
-    
+
     wxALL                     = (wxUP | wxDOWN | wxRIGHT | wxLEFT)
 };
 
@@ -805,6 +809,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
+#define wxTE_NO_VSCROLL     0x0100
+#define wxTE_AUTO_SCROLL    0x0200
 
 /*
  * wxComboBox style flags
@@ -836,16 +842,16 @@ enum wxStretch
 #define wxGA_HORIZONTAL      wxHORIZONTAL
 #define wxGA_VERTICAL        wxVERTICAL
 // Windows only
-#define wxGA_SMOOTH          0x0008
+#define wxGA_SMOOTH          0x0010
 
 /*
  * 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
-#define wxSL_AUTOTICKS       0x0008
+#define wxSL_AUTOTICKS       0x0010
 // #define wxSL_MANUALTICKS     0x0010
 #define wxSL_LABELS          0x0020
 #define wxSL_LEFT            0x0040
@@ -1061,6 +1067,8 @@ enum wxStretch
 #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
 
 // ----------------------------------------------------------------------------