recall initial font

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

diff --git a/src/xrc/xh_cald.cpp b/src/xrc/xh_cald.cpp
index 15c58fc79714b48c774cece0c08508554c2d3506..67fa6e5edf4a4fe43b2d97943cd83f532e656617 100644 (file)
--- a/src/xrc/xh_cald.cpp
+++ b/src/xrc/xh_cald.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
+

 #ifdef __GNUG__
 #pragma implementation "xh_cald.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "xh_cald.h"
 #endif


@@ -19,9 +19,7 @@
     #pragma hdrstop
 #endif
 
     #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/xrc/xh_cald.h"
 #include "wx/event.h"


@@ -29,20 +27,23 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler, wxXmlResourceHandler)
 
 
 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_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()
     AddWindowStyles();
 }
 
 
 wxObject *wxCalendarCtrlXmlHandler::DoCreateResource()

-{ 
+{

     XRC_MAKE_INSTANCE(calendar, wxCalendarCtrl);
 
     calendar->Create(m_parentAsWindow,
     XRC_MAKE_INSTANCE(calendar, wxCalendarCtrl);
 
     calendar->Create(m_parentAsWindow,


@@ -52,9 +53,9 @@ wxObject *wxCalendarCtrlXmlHandler::DoCreateResource()
                      GetPosition(), GetSize(),
                      GetStyle(),
                      GetName());
                      GetPosition(), GetSize(),
                      GetStyle(),
                      GetName());

-    
+

     SetupWindow(calendar);
     SetupWindow(calendar);

-    
+

     return calendar;
 }
 
     return calendar;
 }
 


@@ -63,4 +64,4 @@ bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxCalendarCtrl"));
 }
 
     return IsOfClass(node, wxT("wxCalendarCtrl"));
 }
 

-#endif
+#endif // wxUSE_XRC && wxUSE_CALENDARCTRL