X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f03b9d4585c6b087330598205d7e1de5ac10592b..1fdc16adf72fbd051d1f4ffdbc8d35d00b3e2837:/src/xrc/xh_cald.cpp diff --git a/src/xrc/xh_cald.cpp b/src/xrc/xh_cald.cpp index 70359323c9..3259a04e1c 100644 --- a/src/xrc/xh_cald.cpp +++ b/src/xrc/xh_cald.cpp @@ -7,10 +7,6 @@ // Copyright: (c) 2000 Brian Gavin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "xh_cald.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,29 +15,31 @@ #pragma hdrstop #endif -#include "wx/setup.h" - -#if wxUSE_CALENDARCTRL +#if wxUSE_XRC && wxUSE_CALENDARCTRL #include "wx/xrc/xh_cald.h" #include "wx/event.h" #include "wx/calctrl.h" +IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler, wxXmlResourceHandler) -wxCalendarCtrlXmlHandler::wxCalendarCtrlXmlHandler() -: wxXmlResourceHandler() +wxCalendarCtrlXmlHandler::wxCalendarCtrlXmlHandler() +: wxXmlResourceHandler() { XRC_ADD_STYLE(wxCAL_SUNDAY_FIRST); XRC_ADD_STYLE(wxCAL_MONDAY_FIRST); XRC_ADD_STYLE(wxCAL_SHOW_HOLIDAYS); XRC_ADD_STYLE(wxCAL_NO_YEAR_CHANGE); XRC_ADD_STYLE(wxCAL_NO_MONTH_CHANGE); + XRC_ADD_STYLE(wxCAL_SEQUENTIAL_MONTH_SELECTION); + XRC_ADD_STYLE(wxCAL_SHOW_SURROUNDING_WEEKS); + AddWindowStyles(); } wxObject *wxCalendarCtrlXmlHandler::DoCreateResource() -{ +{ XRC_MAKE_INSTANCE(calendar, wxCalendarCtrl); calendar->Create(m_parentAsWindow, @@ -51,9 +49,9 @@ wxObject *wxCalendarCtrlXmlHandler::DoCreateResource() GetPosition(), GetSize(), GetStyle(), GetName()); - + SetupWindow(calendar); - + return calendar; } @@ -62,4 +60,4 @@ bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node) return IsOfClass(node, wxT("wxCalendarCtrl")); } -#endif +#endif // wxUSE_XRC && wxUSE_CALENDARCTRL