X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f7d425f604e1d812a2f1723063c40ac7f804e41..ca9e2173a63d0e5a56fa9c2f8e1ff6ff32a9b71f:/include/wx/generic/datectrl.h?ds=sidebyside diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h index 65065d6c50..75172a2d44 100644 --- a/include/wx/generic/datectrl.h +++ b/include/wx/generic/datectrl.h @@ -12,10 +12,9 @@ #ifndef _WX_GENERIC_DATECTRL_H_ #define _WX_GENERIC_DATECTRL_H_ -class WXDLLIMPEXP_FWD_ADV wxCalendarDateAttr; -class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl; -class WXDLLIMPEXP_FWD_ADV wxCalendarEvent; -class WXDLLIMPEXP_FWD_CORE wxComboCtrl; +#include "wx/calctrl.h" +#include "wx/combo.h" + class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup; class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase @@ -59,7 +58,7 @@ public: // 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 @@ -78,11 +77,9 @@ private: void OnSize(wxSizeEvent& event); void OnFocus(wxFocusEvent& event); - wxCalendarCtrl *m_cal; wxComboCtrl* m_combo; wxCalendarComboPopup* m_popup; - DECLARE_EVENT_TABLE() DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric) };