Applied fixes for AIX (GTK 1.0 compilation).

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 3bc4487512db8245d82a7e7bc93db6720a1904a8..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"
 
 // ----------------------------------------------------------------------------


@@ -84,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


@@ -398,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;


@@ -605,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


@@ -803,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


@@ -914,7 +928,7 @@ typedef enum
 
 #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


@@ -1328,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__