one more fix for tree selection

[wxWidgets.git] / src / xrc / xh_cald.cpp

diff --git a/src/xrc/xh_cald.cpp b/src/xrc/xh_cald.cpp
index 1367c5e8f7cdf4bbc0034882e8fd4082e31055f3..2f9399a2db06c4abcfc04d5744889cba6db610c5 100644 (file)
--- 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,43 +19,49 @@
     #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 = new wxCalendarCtrl(m_parentAsWindow,
-                                    GetID(),
-                                    wxDefaultDateTime,
-                                    /*TODO: take it from resource*/
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    GetName());
-    
+{
+    XRC_MAKE_INSTANCE(calendar, wxCalendarCtrl);
+
+    calendar->Create(m_parentAsWindow,
+                     GetID(),
+                     wxDefaultDateTime,
+                     /*TODO: take it from resource*/
+                     GetPosition(), GetSize(),
+                     GetStyle(),
+                     GetName());
+
     SetupWindow(calendar);
-    
+
     return calendar;
 }
 
-
-
 bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxCalendarCtrl"));
 }
 
-
+#endif // wxUSE_XRC && wxUSE_CALENDARCTRL