X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/feb72429e84a705de867331397ff7b6cbaeec48a..6968a3b87cee46f5c5af9b46e1ef97f17133cef7:/include/wx/datectrl.h?ds=sidebyside

diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h
index a6adde5db7..3bf46761c0 100644
--- a/include/wx/datectrl.h
+++ b/include/wx/datectrl.h
@@ -12,16 +12,40 @@
 #ifndef _WX_DATECTRL_H_
 #define _WX_DATECTRL_H_
 
-#include "wx/control.h"         // the base class
-#include "wx/datetime.h"
+#include "wx/defs.h"
 
-#define wxDatePickerCtrlNameStr _T("datectrl")
+#if wxUSE_DATEPICKCTRL
+
+#include "wx/datetimectrl.h"    // the base class
+
+#define wxDatePickerCtrlNameStr wxT("datectrl")
+
+// wxDatePickerCtrl styles
+enum
+{
+    // default style on this platform, either wxDP_SPIN or wxDP_DROPDOWN
+    wxDP_DEFAULT = 0,
+
+    // a spin control-like date picker (not supported in generic version)
+    wxDP_SPIN = 1,
+
+    // a combobox-like date picker (not supported in mac version)
+    wxDP_DROPDOWN = 2,
+
+    // 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,
+
+    // 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
+};
 
 // ----------------------------------------------------------------------------
 // wxDatePickerCtrl: allow the user to enter the date
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxDatePickerCtrlBase : public wxControl
+class WXDLLIMPEXP_ADV wxDatePickerCtrlBase : public wxDateTimePickerCtrl
 {
 public:
     /*
@@ -33,27 +57,58 @@ public:
                     const wxDateTime& dt = wxDefaultDateTime,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
-                    long style = 0,
+                    long style = wxDP_DEFAULT | wxDP_SHOWCENTURY,
                     const wxValidator& validator = wxDefaultValidator,
                     const wxString& name = wxDatePickerCtrlNameStr);
      */
 
-    // set/get the date
-    virtual void SetValue(const wxDateTime& dt) = 0;
-    virtual wxDateTime GetValue() const = 0;
+    /*
+        We inherit the methods to set/get the date from the base class.
+
+        virtual void SetValue(const wxDateTime& dt) = 0;
+        virtual wxDateTime GetValue() const = 0;
+    */
 
-    // set/get the allowed valid range for the dates, if either/both of them
-    // are invalid, there is no corresponding limit and if neither is set
-    // GetRange() returns false
+    // And add methods to set/get the allowed valid range for the dates. If
+    // either/both of them are invalid, there is no corresponding limit and if
+    // neither is set, GetRange() returns false.
     virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) = 0;
     virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const = 0;
 };
 
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/datectrl.h"
+
+    #define wxHAS_NATIVE_DATEPICKCTRL
+#elif defined(__WXOSX_COCOA__) && !defined(__WXUNIVERSAL__)
+    #include "wx/osx/datectrl.h"
+
+    #define wxHAS_NATIVE_DATEPICKCTRL
 #else
-    // TODO: #include "wx/generic/datectrl.h"
+    #include "wx/generic/datectrl.h"
+
+    class WXDLLIMPEXP_ADV wxDatePickerCtrl : public wxDatePickerCtrlGeneric
+    {
+    public:
+        wxDatePickerCtrl() { }
+        wxDatePickerCtrl(wxWindow *parent,
+                         wxWindowID id,
+                         const wxDateTime& date = wxDefaultDateTime,
+                         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, validator, name)
+        {
+        }
+
+    private:
+        DECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl)
+    };
 #endif
 
+#endif // wxUSE_DATEPICKCTRL
+
 #endif // _WX_DATECTRL_H_