X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/807f503834e3451a8c355172cb8e90bb20a7ee7d..e143fb636d50d5802dcc8c7c2e9e8e2944afa467:/include/wx/generic/datectrl.h diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h index eb761b9bd1..28461eb130 100644 --- a/include/wx/generic/datectrl.h +++ b/include/wx/generic/datectrl.h @@ -12,18 +12,17 @@ #ifndef _WX_GENERIC_DATECTRL_H_ #define _WX_GENERIC_DATECTRL_H_ -class WXDLLIMPEXP_CORE wxButton; -class WXDLLIMPEXP_ADV wxCalendarDateAttr; -class WXDLLIMPEXP_ADV wxCalendarCtrl; -class WXDLLIMPEXP_ADV wxCalendarEvent; -class WXDLLIMPEXP_CORE wxPopupWindow; -class WXDLLIMPEXP_CORE wxTextCtrl; +#include "wx/calctrl.h" +#include "wx/combo.h" + +class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup; class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase { public: // creating the control wxDatePickerCtrlGeneric() { Init(); } + virtual ~wxDatePickerCtrlGeneric(); wxDatePickerCtrlGeneric(wxWindow *parent, wxWindowID id, const wxDateTime& date = wxDefaultDateTime, @@ -58,8 +57,8 @@ public: const wxDateTime& upperdate = wxDefaultDateTime); // extra methods available only in this (generic) implementation - bool SetFormat(const wxChar *fmt); - wxCalendarCtrl *GetCalendar() const { return m_cal; } + bool SetFormat(const wxString& fmt); + wxCalendarCtrl *GetCalendar() const; // implementation only from now on @@ -68,39 +67,21 @@ 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: 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); - - - wxPopupWindow *m_popup; - wxTextCtrl *m_txt; - wxCalendarCtrl *m_cal; - wxButton *m_btn; - wxString m_format; - bool m_dropped, - m_ignoreDrop; + void OnText(wxCommandEvent &event); + void OnSize(wxSizeEvent& event); + void OnFocus(wxFocusEvent& event); + wxComboCtrl* m_combo; + wxCalendarComboPopup* m_popup; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric) + wxDECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric); }; #endif // _WX_GENERIC_DATECTRL_H_