X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27a9bd487b5ee30238e35ff4962bf70237cfc2c0..4714ef79af518f74214126559ef48607acf89180:/include/wx/defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 1e17c22014..a61061304a 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -19,6 +19,14 @@
 #include <stddef.h>
 
 #include "wx/setup.h"
+
+#ifdef PACKAGE
+  #undef PACKAGE
+#endif
+#ifdef VERSION
+  #undef VERSION
+#endif
+
 #include "wx/version.h"
 
 // ----------------------------------------------------------------------------
@@ -403,18 +411,10 @@ typedef  int   unsigned  wxUint32;
 
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXOS2__)
   #if defined(SIZEOF_INT)
-    #if (SIZEOF_SHORT == 2)
       typedef  short   signed  wxInt16;
       typedef  short unsigned  wxUint16;
-    #else
-      #error "FIXME"
-    #endif
-    #if (SIZEOF_INT == 4)
       typedef  int     signed  wxInt32;
       typedef  int   unsigned  wxUint32;
-    #else
-      #error "FIXME"
-    #endif
   #else
     typedef  short   signed  wxInt16;
     typedef  short unsigned  wxUint16;
@@ -610,7 +610,13 @@ enum wxOrientation
  */
 // 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
@@ -808,6 +814,9 @@ enum wxOrientation
 #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
@@ -919,7 +928,7 @@ typedef enum
 
 #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
@@ -1333,6 +1342,9 @@ typedef void*           WXFont;
 typedef void*           WXImage;
 typedef void*           WXCursor;
 typedef void*           WXFontList;
+
+typedef unsigned long   Atom;  /* this might fail on a few architectures */
+
 #endif // Motif
 
 #ifdef __WXGTK__