Prevent seg fault for older GTK+

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

diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h
index 76a6ffb332006c2cbf3776a80af6be3ebbc227d0..7adfbf775e310a0a33afd0c46e3c681fada497bc 100644 (file)
--- a/include/wx/datectrl.h
+++ b/include/wx/datectrl.h
@@ -16,6 +16,13 @@
 
 #if wxUSE_DATEPICKCTRL
 
+// this is currently defined in wx/msw/setup.h but not for MSW configure builds
+// and other ports which only have the generic version anyhow, so provide a
+// fallback definition here for them
+#ifndef wxUSE_DATEPICKCTRL_GENERIC
+    #define wxUSE_DATEPICKCTRL_GENERIC 0
+#endif
+
 #include "wx/control.h"         // the base class
 #include "wx/datetime.h"
 
@@ -35,7 +42,11 @@ enum
 
     // always show century in the default date display (otherwise it depends on
     // the system date format which may include the century or not)
-    wxDP_SHOWCENTURY = 4
+    wxDP_SHOWCENTURY = 4,
+
+    // allow not having any valid date in the control (by default it always has
+    // some date, today initially if no valid date specified in ctor)
+    wxDP_ALLOWNONE = 8
 };
 
 // ----------------------------------------------------------------------------
@@ -70,7 +81,11 @@ public:
     virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const = 0;
 };
 
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/datectrl.h"
+
+    #define wxHAS_NATIVE_DATEPICKCTRL
+#elif defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/datectrl.h"
 
     #define wxHAS_NATIVE_DATEPICKCTRL
@@ -87,14 +102,14 @@ public:
                          const wxPoint& pos = wxDefaultPosition,
                          const wxSize& size = wxDefaultSize,
                          long style = wxDP_DEFAULT | wxDP_SHOWCENTURY,
+                         const wxValidator& validator = wxDefaultValidator,
                          const wxString& name = wxDatePickerCtrlNameStr)
-            : wxDatePickerCtrlGeneric(parent, id, date, pos, size, style, name)
+            : wxDatePickerCtrlGeneric(parent, id, date, pos, size, style, validator, name)
         {
         }
 
     private:
-        DECLARE_DYNAMIC_CLASS(wxDatePickerCtrl)
-        DECLARE_NO_COPY_CLASS(wxDatePickerCtrl)
+        DECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl)
     };
 #endif