X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85fa9d60c470e58fe8ff3589b0516cbbe853cbb0..8fde39dfea217d340c9151ae70b4d23d93e0eaf7:/include/wx/generic/datectrl.h?ds=sidebyside diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h index 642a693647..65065d6c50 100644 --- a/include/wx/generic/datectrl.h +++ b/include/wx/generic/datectrl.h @@ -12,11 +12,11 @@ #ifndef _WX_GENERIC_DATECTRL_H_ #define _WX_GENERIC_DATECTRL_H_ -class WXDLLIMPEXP_ADV wxCalendarDateAttr; -class WXDLLIMPEXP_ADV wxCalendarCtrl; -class WXDLLIMPEXP_ADV wxCalendarEvent; -class WXDLLIMPEXP_ADV wxComboCtrl; -class WXDLLIMPEXP_ADV wxCalendarComboPopup; +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 wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase { @@ -58,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; } @@ -76,6 +76,7 @@ private: void OnText(wxCommandEvent &event); void OnSize(wxSizeEvent& event); + void OnFocus(wxFocusEvent& event); wxCalendarCtrl *m_cal; wxComboCtrl* m_combo;