Work on streams of all sorts. More to come.

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 2df71e010d72626b72188120e2daf230c63173e3..a61061304a34aa06974a001b5fa8a985882433b5 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


@@ -397,18 +411,10 @@ typedef  int   unsigned  wxUint32;
 
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXOS2__)
   #if defined(SIZEOF_INT)
 
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXOS2__)
   #if defined(SIZEOF_INT)

-    #if (SIZEOF_SHORT == 2)

       typedef  short   signed  wxInt16;
       typedef  short unsigned  wxUint16;
       typedef  short   signed  wxInt16;
       typedef  short unsigned  wxUint16;

-    #else
-      #error "FIXME"
-    #endif
-    #if (SIZEOF_INT == 4)

       typedef  int     signed  wxInt32;
       typedef  int   unsigned  wxUint32;
       typedef  int     signed  wxInt32;
       typedef  int   unsigned  wxUint32;

-    #else
-      #error "FIXME"
-    #endif

   #else
     typedef  short   signed  wxInt16;
     typedef  short unsigned  wxUint16;
   #else
     typedef  short   signed  wxInt16;
     typedef  short unsigned  wxUint16;


@@ -441,8 +447,8 @@ typedef  wxUint16        wxWord;
     
 #define wxINT16_SWAP_ALWAYS(val) \
    ((wxInt16) ( \
     
 #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) ( \
     
 #define wxUINT32_SWAP_ALWAYS(val) \
    ((wxUint32) ( \


@@ -453,31 +459,31 @@ typedef  wxUint16        wxWord;
 
 #define wxINT32_SWAP_ALWAYS(val) \
    ((wxInt32) ( \
 
 #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
 
 // 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
 #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
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -604,7 +610,13 @@ enum wxOrientation
  */
 // use native docking
 #define wxMB_DOCKABLE       0x0001
  */
 // use native docking
 #define wxMB_DOCKABLE       0x0001

+// make all menus tearoff menus, even if not set on per-menu basis
+#define wxMB_TEAROFF        0x0002

 
 

+/*
+ * wxMenu style flags
+ */
+#define wxMENU_TEAROFF      0x0001

 
 /*
  * Apply to all panel items
 
 /*
  * Apply to all panel items


@@ -802,6 +814,9 @@ enum wxOrientation
 #define wxPD_CAN_ABORT      0x0001
 #define wxPD_APP_MODAL      0x0002
 #define wxPD_AUTO_HIDE      0x0004
 #define wxPD_CAN_ABORT      0x0001
 #define wxPD_APP_MODAL      0x0002
 #define wxPD_AUTO_HIDE      0x0004

+#define wxPD_ELAPSED_TIME   0x0008
+#define wxPD_ESTIMATED_TIME 0x0010
+#define wxPD_REMAINING_TIME 0x0020

 
 /*
  * GDI descriptions
 
 /*
  * GDI descriptions


@@ -904,15 +919,16 @@ 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

-#define wxICON_MASK         (0x0020|0x0040|0x0080|0x0100)
+#define wxICON_MASK         (0x0040|0x0080|0x0100|0x0200)

 
 #define wxCENTRE            0x0200
 #define wxCENTER wxCENTRE
 
 #define wxCENTRE            0x0200
 #define wxCENTER wxCENTRE


@@ -1326,6 +1342,9 @@ typedef void*           WXFont;
 typedef void*           WXImage;
 typedef void*           WXCursor;
 typedef void*           WXFontList;
 typedef void*           WXImage;
 typedef void*           WXCursor;
 typedef void*           WXFontList;

+
+typedef unsigned long   Atom;  /* this might fail on a few architectures */
+

 #endif // Motif
 
 #ifdef __WXGTK__
 #endif // Motif
 
 #ifdef __WXGTK__