X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab473127c64c9e20c3401bd8f0e173953c049d45..dfc69c6d5bd613a20a9cb815622167a258d4a623:/include/wx/generic/calctrl.h diff --git a/include/wx/generic/calctrl.h b/include/wx/generic/calctrl.h index cb10d1019b..21a6bb95e8 100644 --- a/include/wx/generic/calctrl.h +++ b/include/wx/generic/calctrl.h @@ -9,10 +9,6 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "calctrl.h" -#endif - #ifndef _WX_GENERIC_CALCTRL_H #define _WX_GENERIC_CALCTRL_H @@ -31,9 +27,6 @@ class WXDLLEXPORT wxSpinCtrl; class WXDLLIMPEXP_ADV wxCalendarCtrl : public wxControl { -friend class wxMonthComboBox; -friend class wxYearSpinCtrl; - public: // construction wxCalendarCtrl() { Init(); } @@ -179,6 +172,7 @@ private: void OnChar(wxKeyEvent& event); void OnMonthChange(wxCommandEvent& event); void OnYearChange(wxCommandEvent& event); + void OnYearTextChange(wxCommandEvent& event); // override some base class virtuals virtual wxSize DoGetBestSize() const; @@ -248,6 +242,10 @@ private: // show the correct controls void ShowCurrentControls(); + // create the month combo and year spin controls + void CreateMonthComboBox(); + void CreateYearSpinCtrl(); + public: // get the currently shown control for month/year wxControl *GetMonthControl() const;