X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2cfbeac8141db28d9a022cdf92c12f82631a3c82..8fde39dfea217d340c9151ae70b4d23d93e0eaf7:/include/wx/generic/datectrl.h?ds=inline diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h index 8fa4b2c590..65065d6c50 100644 --- a/include/wx/generic/datectrl.h +++ b/include/wx/generic/datectrl.h @@ -12,22 +12,31 @@ #ifndef _WX_GENERIC_DATECTRL_H_ #define _WX_GENERIC_DATECTRL_H_ -class WXDLLIMPEXP_ADV wxCalendarDateAttr; -class WXDLLIMPEXP_ADV wxCalendarCtrl; -class WXDLLIMPEXP_ADV wxCalendarEvent; +class WXDLLIMPEXP_FWD_ADV wxCalendarDateAttr; +class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl; +class WXDLLIMPEXP_FWD_ADV wxCalendarEvent; +class WXDLLIMPEXP_FWD_CORE wxComboCtrl; +class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup; -class WXDLLIMPEXP_ADV wxDatePickerCtrl : public wxDatePickerCtrlBase +class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase { public: // creating the control - wxDatePickerCtrl() { Init(); } - wxDatePickerCtrl(wxWindow *parent, - wxWindowID id, - const wxDateTime& date = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, - const wxString& name = wxDatePickerCtrlNameStr); + wxDatePickerCtrlGeneric() { Init(); } + virtual ~wxDatePickerCtrlGeneric(); + wxDatePickerCtrlGeneric(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) + { + Init(); + + (void)Create(parent, id, date, pos, size, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, @@ -35,6 +44,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, + const wxValidator& validator = wxDefaultValidator, const wxString& name = wxDatePickerCtrlNameStr); // wxDatePickerCtrl methods @@ -48,7 +58,7 @@ public: const wxDateTime& upperdate = wxDefaultDateTime); // extra methods available only in this (generic) implementation - bool SetFormat(const wxChar *fmt); + bool SetFormat(const wxString& fmt); wxCalendarCtrl *GetCalendar() const { return m_cal; } @@ -58,37 +68,23 @@ public: // overridden base class methods virtual bool Destroy(); - virtual bool Enable(bool enable = TRUE); - virtual bool Show(bool show = TRUE); - protected: virtual wxSize DoGetBestSize() const; - virtual void DoMoveWindow(int x, int y, int width, int height); private: - wxDialog *m_dlg; - wxTextCtrl *m_txt; + void Init(); + + void OnText(wxCommandEvent &event); + void OnSize(wxSizeEvent& event); + void OnFocus(wxFocusEvent& event); + wxCalendarCtrl *m_cal; - wxButton *m_btn; - wxString m_format; + wxComboCtrl* m_combo; + wxCalendarComboPopup* m_popup; - bool m_dropped, m_ignoreDrop; - void Init(); - void DropDown(bool down=true); - - void OnText(wxCommandEvent &ev); - void OnEditKey(wxKeyEvent & event); - void OnCalKey(wxKeyEvent & event); - void OnClick(wxCommandEvent &ev); - void OnSelChange(wxCalendarEvent &ev); - void OnSetFocus(wxFocusEvent &ev); - void OnKillFocus(wxFocusEvent &ev); - void OnChildSetFocus(wxChildFocusEvent &ev); - - DECLARE_DYNAMIC_CLASS(wxDatePickerCtrl) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxDatePickerCtrl) + DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric) }; #endif // _WX_GENERIC_DATECTRL_H_