X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ee3fb3846ae47c5292128a6f0bd4c8e38d7ba31..f6669958924c3c3833e2932b65598b06073d2e65:/include/wx/datectrl.h diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h index 76a6ffb332..3bf46761c0 100644 --- a/include/wx/datectrl.h +++ b/include/wx/datectrl.h @@ -16,10 +16,9 @@ #if wxUSE_DATEPICKCTRL -#include "wx/control.h" // the base class -#include "wx/datetime.h" +#include "wx/datetimectrl.h" // the base class -#define wxDatePickerCtrlNameStr _T("datectrl") +#define wxDatePickerCtrlNameStr wxT("datectrl") // wxDatePickerCtrl styles enum @@ -35,14 +34,18 @@ 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 }; // ---------------------------------------------------------------------------- // wxDatePickerCtrl: allow the user to enter the date // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_ADV wxDatePickerCtrlBase : public wxControl +class WXDLLIMPEXP_ADV wxDatePickerCtrlBase : public wxDateTimePickerCtrl { public: /* @@ -59,13 +62,16 @@ public: 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; }; @@ -73,6 +79,10 @@ public: #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 #include "wx/generic/datectrl.h" @@ -87,14 +97,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