X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0d5e7a25aef93d3a907d005c572bc8cca4f41a1..f21fcc9d2e6ba3e02a686b4ed11102fdcc4c49bb:/src/generic/calctrl.cpp?ds=inline diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp index 0352b4c2f5..688946988a 100644 --- a/src/generic/calctrl.cpp +++ b/src/generic/calctrl.cpp @@ -34,6 +34,7 @@ #include "wx/brush.h" #include "wx/combobox.h" #include "wx/stattext.h" + #include "wx/textctrl.h" #endif //WX_PRECOMP #if wxUSE_CALENDARCTRL @@ -59,6 +60,7 @@ private: wxCalendarCtrl *m_cal; DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxMonthComboBox) }; class wxYearSpinCtrl : public wxSpinCtrl @@ -73,6 +75,7 @@ private: wxCalendarCtrl *m_cal; DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxYearSpinCtrl) }; // ---------------------------------------------------------------------------- @@ -154,6 +157,19 @@ wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl *cal) // wxCalendarCtrl // ---------------------------------------------------------------------------- +wxCalendarCtrl::wxCalendarCtrl(wxWindow *parent, + wxWindowID id, + const wxDateTime& date, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) +{ + Init(); + + (void)Create(parent, id, date, pos, size, style, name); +} + void wxCalendarCtrl::Init() { m_comboMonth = NULL; @@ -1555,7 +1571,7 @@ void wxCalendarCtrl::OnYearChange(wxCommandEvent& event) void wxCalendarCtrl::OnChar(wxKeyEvent& event) { wxDateTime target; - switch ( event.KeyCode() ) + switch ( event.GetKeyCode() ) { case _T('+'): case WXK_ADD: