Added some #defines

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 9bdeb7b0f6f4b39d1b426213002c5e1e8728d229..ae8cc520a5aaf43adff3e52d64e82001f062f74c 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -19,6 +19,14 @@
 #include <stddef.h>
 
 #include "wx/setup.h"
 #include <stddef.h>
 
 #include "wx/setup.h"

+
+#ifdef PACKAGE
+  #undef PACKAGE
+#endif
+#ifdef VERSION
+  #undef VERSION
+#endif
+

 #include "wx/version.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/version.h"
 
 // ----------------------------------------------------------------------------


@@ -28,7 +36,8 @@
 // OS
 #if defined(__unix) || defined(__unix__) || defined(____SVR4____) || \
     defined(__LINUX__) || defined(__sgi ) || \
 // OS
 #if defined(__unix) || defined(__unix__) || defined(____SVR4____) || \
     defined(__LINUX__) || defined(__sgi ) || \

-    defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX)
+    defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \
+    defined(__EMX__)

 
     #ifndef __UNIX__
         #define __UNIX__
 
     #ifndef __UNIX__
         #define __UNIX__


@@ -83,6 +92,11 @@
 #   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: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:4134)    // conversion between pointers to members of same class
+#   pragma warning(disable:4135)    // conversion between different integral types
+#   pragma warning(disable:4769)    // assignment of near pointer to long integer
+#endif

 #endif // __VISUALC__
 
 // suppress some Salford C++ warnings
 #endif // __VISUALC__
 
 // suppress some Salford C++ warnings


@@ -904,11 +918,12 @@ typedef enum
 #define wxCANCEL            0x0004
 #define wxYES               0x0008
 #define wxNO                0x0010
 #define wxCANCEL            0x0004
 #define wxYES               0x0008
 #define wxNO                0x0010

-
-#define wxICON_EXCLAMATION  0x0020
-#define wxICON_HAND         0x0040
-#define wxICON_QUESTION     0x0080
-#define wxICON_INFORMATION  0x0100
+#define wxNO_DEFAULT        0x0020
+#define wxYES_DEFAULT       0x0000  // has no effect
+#define wxICON_EXCLAMATION  0x0040
+#define wxICON_HAND         0x0080
+#define wxICON_QUESTION     0x0100
+#define wxICON_INFORMATION  0x0200

 
 #define wxICON_STOP         wxICON_HAND
 #define wxICON_ASTERISK     wxICON_INFORMATION
 
 #define wxICON_STOP         wxICON_HAND
 #define wxICON_ASTERISK     wxICON_INFORMATION