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 31b582e513e8b099bcd59eddd7c89e271fd7e299..9d7dcf0338d4100c9a9eaa0f3ca61a9bf71965bb 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1117,6 +1117,8 @@ enum wxStretch
 #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
@@ -1794,9 +1796,15 @@ typedef struct _GdkColor        GdkColor;
 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;