X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/xrc/xh_cald.cpp

diff --git a/src/xrc/xh_cald.cpp b/src/xrc/xh_cald.cpp
index 4fba39eb75..2f9399a2db 100644
--- a/src/xrc/xh_cald.cpp
+++ b/src/xrc/xh_cald.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "xh_cald.h"
 #endif
 
@@ -19,29 +19,32 @@
     #pragma hdrstop
 #endif
 
+#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()
 {
-    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(),
@@ -50,17 +53,15 @@ wxObject *wxCalendarCtrlXmlHandler::DoCreateResource()
                      GetPosition(), GetSize(),
                      GetStyle(),
                      GetName());
-    
+
     SetupWindow(calendar);
-    
+
     return calendar;
 }
 
-
-
 bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxCalendarCtrl"));
 }
 
-
+#endif // wxUSE_XRC && wxUSE_CALENDARCTRL