X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..e07d33e7244bbc6192b00cd7839ea96a50014228:/src/xrc/xh_cald.cpp diff --git a/src/xrc/xh_cald.cpp b/src/xrc/xh_cald.cpp index 4fba39eb75..29ab1b9b94 100644 --- a/src/xrc/xh_cald.cpp +++ b/src/xrc/xh_cald.cpp @@ -19,29 +19,34 @@ #pragma hdrstop #endif +#include "wx/setup.h" + +#if wxUSE_CALENDARCTRL + #include "wx/xrc/xh_cald.h" #include "wx/event.h" #include "wx/calctrl.h" +IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler, wxXmlResourceHandler) wxCalendarCtrlXmlHandler::wxCalendarCtrlXmlHandler() : wxXmlResourceHandler() { - ADD_STYLE(wxCAL_SUNDAY_FIRST); - ADD_STYLE(wxCAL_MONDAY_FIRST); - ADD_STYLE(wxCAL_SHOW_HOLIDAYS); - ADD_STYLE(wxCAL_NO_YEAR_CHANGE); - ADD_STYLE(wxCAL_NO_MONTH_CHANGE); + 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() { - wxCalendarCtrl *calendar = wxStaticCast(m_instance, wxCalendarCtrl); - - if (!calendar) - calendar = new wxCalendarCtrl; + XRC_MAKE_INSTANCE(calendar, wxCalendarCtrl); calendar->Create(m_parentAsWindow, GetID(), @@ -56,11 +61,9 @@ wxObject *wxCalendarCtrlXmlHandler::DoCreateResource() return calendar; } - - bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxCalendarCtrl")); } - +#endif