wxMSW compilation fixes for old mingw32

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 31e62731b4c16bf23caec719d6d85a9bd45ba647..9d7dcf0338d4100c9a9eaa0f3ca61a9bf71965bb 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -885,13 +885,13 @@ enum wxStretch
 /*
  * wxToolBar style flags
  */
 /*
  * wxToolBar style flags
  */

-#define wxTB_3DBUTTONS          0x8000
-#define wxTB_HORIZONTAL         0x0002
-#define wxTB_VERTICAL           0x0004
+#define wxTB_HORIZONTAL         wxHORIZONTAL
+#define wxTB_VERTICAL           wxVERTICAL
+#define wxTB_3DBUTTONS          0x0010

 // Flatbar/Coolbar under Win98/ GTK 1.2
 // Flatbar/Coolbar under Win98/ GTK 1.2

-#define wxTB_FLAT               0x0008
+#define wxTB_FLAT               0x0020

 // use native docking under GTK
 // use native docking under GTK

-#define wxTB_DOCKABLE           0x0010
+#define wxTB_DOCKABLE           0x0040

 
 /*
  * wxMenuBar style flags
 
 /*
  * wxMenuBar style flags


@@ -1111,6 +1111,15 @@ enum wxStretch
 #define wxHW_SCROLLBAR_NEVER    0x0002
 #define wxHW_SCROLLBAR_AUTO     0x0004
 
 #define wxHW_SCROLLBAR_NEVER    0x0002
 #define wxHW_SCROLLBAR_AUTO     0x0004
 

+/*
+ * wxCalendarCtrl flags
+ */
+#define wxCAL_SUNDAY_FIRST      0x0000
+#define wxCAL_MONDAY_FIRST      0x0001
+#define wxCAL_SHOW_HOLIDAYS     0x0002
+#define wxCAL_NO_YEAR_CHANGE    0x0004
+#define wxCAL_NO_MONTH_CHANGE   0x000c // no month change => no year change
+

 /*
  * extended dialog specifiers. these values are stored in a different
  * flag and thus do not overlap with other style flags. note that these
 /*
  * extended dialog specifiers. these values are stored in a different
  * flag and thus do not overlap with other style flags. note that these


@@ -1787,9 +1796,15 @@ typedef struct _GdkColor        GdkColor;
 typedef struct _GdkColormap     GdkColormap;
 typedef struct _GdkFont         GdkFont;
 typedef struct _GdkGC           GdkGC;
 typedef struct _GdkColormap     GdkColormap;
 typedef struct _GdkFont         GdkFont;
 typedef struct _GdkGC           GdkGC;

-typedef struct _GdkWindow       GdkWindow;
-typedef struct _GdkWindow       GdkBitmap;
-typedef struct _GdkWindow       GdkPixmap;
+#ifdef __WXGTK13__
+    typedef struct _GdkDrawable     GdkWindow;
+    typedef struct _GdkDrawable     GdkBitmap;
+    typedef struct _GdkDrawable     GdkPixmap;
+#else
+    typedef struct _GdkWindow       GdkWindow;
+    typedef struct _GdkWindow       GdkBitmap;
+    typedef struct _GdkWindow       GdkPixmap;
+#endif

 typedef struct _GdkCursor       GdkCursor;
 typedef struct _GdkRegion       GdkRegion;
 typedef struct _GdkDragContext  GdkDragContext;
 typedef struct _GdkCursor       GdkCursor;
 typedef struct _GdkRegion       GdkRegion;
 typedef struct _GdkDragContext  GdkDragContext;