From 6bc807b35dd64472634549aa219107a8044072ca Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 19 Nov 2006 15:01:48 +0000 Subject: [PATCH] assert if wxCAL_SEQUENTIAL_MONTH_SELECTION style is changed after creation as this doesn't currently work git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/calctrl.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp index 7648d8917e..f10b5015ca 100644 --- a/src/generic/calctrl.cpp +++ b/src/generic/calctrl.cpp @@ -255,6 +255,17 @@ wxCalendarCtrl::~wxCalendarCtrl() } } +void wxCalendarCtrl::SetWindowStyleFlag(long style) +{ + // changing this style doesn't work because the controls are not + // created/shown/hidden accordingly + wxASSERT_MSG( (style & wxCAL_SEQUENTIAL_MONTH_SELECTION) == + (m_windowStyle & wxCAL_SEQUENTIAL_MONTH_SELECTION), + _T("wxCAL_SEQUENTIAL_MONTH_SELECTION can't be changed after creation") ); + + wxControl::SetWindowStyleFlag(style); +} + // ---------------------------------------------------------------------------- // Create the wxComboBox and wxSpinCtrl // ---------------------------------------------------------------------------- @@ -394,6 +405,7 @@ void wxCalendarCtrl::ShowCurrentControls() m_spinYear->Hide(); m_staticYear->Show(); } + //else: these controls are not even created, don't show/hide them } wxControl *wxCalendarCtrl::GetMonthControl() const