X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ea105e0ba20c15e4d83f829e1c4faeb0a4952f0..c5a451873e7ff8a8c66683496bd320c93d4f213c:/include/wx/defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 2df71e010d..1e17c22014 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -28,7 +28,8 @@
 // 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__
@@ -83,6 +84,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
+#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
@@ -441,8 +447,8 @@ typedef  wxUint16        wxWord;
     
 #define wxINT16_SWAP_ALWAYS(val) \
    ((wxInt16) ( \
-    (((wxInt16) (val) & (wxInt16) 0x00ffU) << 8) | \
-    (((wxInt16) (val) & (wxInt16) 0xff00U) >> 8)))
+    (((wxUint16) (val) & (wxUint16) 0x00ffU) << 8) | \
+    (((wxUint16) (val) & (wxUint16) 0xff00U) >> 8)))
     
 #define wxUINT32_SWAP_ALWAYS(val) \
    ((wxUint32) ( \
@@ -453,31 +459,31 @@ typedef  wxUint16        wxWord;
 
 #define wxINT32_SWAP_ALWAYS(val) \
    ((wxInt32) ( \
-    (((wxInt32) (val) & (wxInt32) 0x000000ffU) << 24) | \
-    (((wxInt32) (val) & (wxInt32) 0x0000ff00U) <<  8) | \
-    (((wxInt32) (val) & (wxInt32) 0x00ff0000U) >>  8) | \
-    (((wxInt32) (val) & (wxInt32) 0xff000000U) >> 24)))
+    (((wxUint32) (val) & (wxUint32) 0x000000ffU) << 24) | \
+    (((wxUint32) (val) & (wxUint32) 0x0000ff00U) <<  8) | \
+    (((wxUint32) (val) & (wxUint32) 0x00ff0000U) >>  8) | \
+    (((wxUint32) (val) & (wxUint32) 0xff000000U) >> 24)))
 
 // machine specific byte swapping
 
 #ifdef WORDS_BIGENDIAN
-  #define wxUINT16_SWAP_FROM_LE(val)  wxUINT16_SWAP_ALWAYS(val)
-  #define wxINT16_SWAP_FROM_LE(val)   wxINT16_SWAP_ALWAYS(val)
-  #define wxUINT16_SWAP_FROM_BE(val)  (val)
-  #define wxINT16_SWAP_FROM_BE(val)   (val)
-  #define wxUINT32_SWAP_FROM_LE(val)  wxUINT32_SWAP_ALWAYS(val)
-  #define wxINT32_SWAP_FROM_LE(val)   wxINT32_SWAP_ALWAYS(val)
-  #define wxUINT32_SWAP_FROM_BE(val)  (val)
-  #define wxINT32_SWAP_FROM_BE(val)   (val)
+  #define wxUINT16_SWAP_ON_BE(val)  wxUINT16_SWAP_ALWAYS(val)
+  #define wxINT16_SWAP_ON_BE(val)   wxINT16_SWAP_ALWAYS(val)
+  #define wxUINT16_SWAP_ON_LE(val)  (val)
+  #define wxINT16_SWAP_ON_LE(val)   (val)
+  #define wxUINT32_SWAP_ON_BE(val)  wxUINT32_SWAP_ALWAYS(val)
+  #define wxINT32_SWAP_ON_BE(val)   wxINT32_SWAP_ALWAYS(val)
+  #define wxUINT32_SWAP_ON_LE(val)  (val)
+  #define wxINT32_SWAP_ON_LE(val)   (val)
 #else
-  #define wxUINT16_SWAP_FROM_BE(val)  wxUINT16_SWAP_ALWAYS(val)
-  #define wxINT16_SWAP_FROM_BE(val)   wxINT16_SWAP_ALWAYS(val)
-  #define wxUINT16_SWAP_FROM_LE(val)  (val)
-  #define wxINT16_SWAP_FROM_LE(val)   (val)
-  #define wxUINT32_SWAP_FROM_BE(val)  wxUINT32_SWAP_ALWAYS(val)
-  #define wxINT32_SWAP_FROM_BE(val)   wxINT32_SWAP_ALWAYS(val)
-  #define wxUINT32_SWAP_FROM_LE(val)  (val)
-  #define wxINT32_SWAP_FROM_LE(val)   (val)
+  #define wxUINT16_SWAP_ON_LE(val)  wxUINT16_SWAP_ALWAYS(val)
+  #define wxINT16_SWAP_ON_LE(val)   wxINT16_SWAP_ALWAYS(val)
+  #define wxUINT16_SWAP_ON_BE(val)  (val)
+  #define wxINT16_SWAP_ON_BE(val)   (val)
+  #define wxUINT32_SWAP_ON_LE(val)  wxUINT32_SWAP_ALWAYS(val)
+  #define wxINT32_SWAP_ON_LE(val)   wxINT32_SWAP_ALWAYS(val)
+  #define wxUINT32_SWAP_ON_BE(val)  (val)
+  #define wxINT32_SWAP_ON_BE(val)   (val)
 #endif
 
 // ----------------------------------------------------------------------------
@@ -904,11 +910,12 @@ typedef enum
 #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