X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..7ddb15416407390de67cc26b04e91ea99a521f57:/include/wx/generic/datectrl.h diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h index 6e10829231..37734a803e 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,13 +12,15 @@ #ifndef _WX_GENERIC_DATECTRL_H_ #define _WX_GENERIC_DATECTRL_H_ -class WXDLLIMPEXP_FWD_ADV wxCalendarDateAttr; +#include "wx/compositewin.h" + +class WXDLLIMPEXP_FWD_CORE wxComboCtrl; + class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl; -class WXDLLIMPEXP_FWD_ADV wxCalendarEvent; -class WXDLLIMPEXP_FWD_ADV wxComboCtrl; class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup; -class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase +class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric + : public wxCompositeWindow { public: // creating the control @@ -58,8 +60,7 @@ public: const wxDateTime& upperdate = wxDefaultDateTime); // extra methods available only in this (generic) implementation - bool SetFormat(const wxString& fmt); - wxCalendarCtrl *GetCalendar() const { return m_cal; } + wxCalendarCtrl *GetCalendar() const; // implementation only from now on @@ -74,17 +75,22 @@ 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); - wxCalendarCtrl *m_cal; +#ifdef __WXOSX_COCOA__ + virtual void OSXGenerateEvent(const wxDateTime& WXUNUSED(dt)) { } +#endif + wxComboCtrl* m_combo; wxCalendarComboPopup* m_popup; - DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric) + wxDECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric); }; #endif // _WX_GENERIC_DATECTRL_H_