X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c245a01202a4acc00db8a2d5a3f56052c0d1ee58..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/generic/datectrl.h?ds=sidebyside diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h index 75172a2d44..6151d81b08 100644 --- a/include/wx/generic/datectrl.h +++ b/include/wx/generic/datectrl.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: generic/datectrl.h +// Name: wx/generic/datectrl.h // Purpose: generic wxDatePickerCtrl implementation // Author: Andreas Pflug // Modified by: @@ -12,12 +12,15 @@ #ifndef _WX_GENERIC_DATECTRL_H_ #define _WX_GENERIC_DATECTRL_H_ -#include "wx/calctrl.h" -#include "wx/combo.h" +#include "wx/compositewin.h" +class WXDLLIMPEXP_FWD_CORE wxComboCtrl; + +class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl; class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup; -class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase +class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric + : public wxCompositeWindow { public: // creating the control @@ -57,7 +60,6 @@ public: const wxDateTime& upperdate = wxDefaultDateTime); // extra methods available only in this (generic) implementation - bool SetFormat(const wxString& fmt); wxCalendarCtrl *GetCalendar() const; @@ -73,6 +75,9 @@ protected: private: void Init(); + // return the list of the windows composing this one + virtual wxWindowList GetCompositeWindowParts() const; + void OnText(wxCommandEvent &event); void OnSize(wxSizeEvent& event); void OnFocus(wxFocusEvent& event); @@ -81,7 +86,7 @@ private: wxCalendarComboPopup* m_popup; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric) + wxDECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric); }; #endif // _WX_GENERIC_DATECTRL_H_