X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/544fee32eeac1a4f6ca3e0c7c1b13ee24f1d1c1c..a766986f6d443ba1d50e3af25f3306fa56e4518e:/src/xrc/xh_cald.cpp?ds=sidebyside diff --git a/src/xrc/xh_cald.cpp b/src/xrc/xh_cald.cpp index 861928fb96..d6514cbe7e 100644 --- a/src/xrc/xh_cald.cpp +++ b/src/xrc/xh_cald.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_cald.cpp +// Name: src/xrc/xh_cald.cpp // Purpose: XRC resource for wxCalendarCtrl // Author: Brian Gavin // Created: 2000/09/09 @@ -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,25 +15,35 @@ #pragma hdrstop #endif +#if wxUSE_XRC && wxUSE_CALENDARCTRL + #include "wx/xrc/xh_cald.h" -#include "wx/event.h" + +#ifndef WX_PRECOMP + #include "wx/event.h" +#endif //WX_PRECOMP + #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, @@ -47,9 +53,9 @@ wxObject *wxCalendarCtrlXmlHandler::DoCreateResource() GetPosition(), GetSize(), GetStyle(), GetName()); - + SetupWindow(calendar); - + return calendar; } @@ -57,3 +63,5 @@ bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxCalendarCtrl")); } + +#endif // wxUSE_XRC && wxUSE_CALENDARCTRL