Rebake from clean wx tree.

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

diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h
index d221993aa05affc9f149021dcfb9832347da4057..822902f0626f7699c5819a0f2331adac090e9523 100644 (file)
--- a/include/wx/datectrl.h
+++ b/include/wx/datectrl.h
@@ -12,10 +12,14 @@
 #ifndef _WX_DATECTRL_H_
 #define _WX_DATECTRL_H_
 
+#include "wx/defs.h"
+
+#if wxUSE_DATEPICKCTRL
+
 #include "wx/control.h"         // the base class
 #include "wx/datetime.h"
 
-#define wxDatePickerCtrlNameStr _T("datectrl")
+#define wxDatePickerCtrlNameStr wxT("datectrl")
 
 // wxDatePickerCtrl styles
 enum
@@ -31,7 +35,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
 };
 
 // ----------------------------------------------------------------------------
@@ -66,7 +74,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
@@ -83,16 +95,18 @@ 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
 
+#endif // wxUSE_DATEPICKCTRL
+
 #endif // _WX_DATECTRL_H_