use newly added GetViewRect() instead of trying to guess the list ctrl size ourselves

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

diff --git a/src/xrc/xh_cald.cpp b/src/xrc/xh_cald.cpp
index 861928fb96252e868b4245c23c78859b49f58974..29ab1b9b94e0d0dbd02cfe9e0523d38a57f5cb1f 100644 (file)
--- a/src/xrc/xh_cald.cpp
+++ b/src/xrc/xh_cald.cpp
@@ -19,10 +19,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/setup.h"
+
+#if wxUSE_CALENDARCTRL
+

 #include "wx/xrc/xh_cald.h"
 #include "wx/event.h"
 #include "wx/calctrl.h"
 
 #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() 


@@ -32,6 +37,9 @@ wxCalendarCtrlXmlHandler::wxCalendarCtrlXmlHandler()
     XRC_ADD_STYLE(wxCAL_SHOW_HOLIDAYS);
     XRC_ADD_STYLE(wxCAL_NO_YEAR_CHANGE);
     XRC_ADD_STYLE(wxCAL_NO_MONTH_CHANGE);
     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();
 }
 
     AddWindowStyles();
 }
 


@@ -57,3 +65,5 @@ bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxCalendarCtrl"));
 }
 {
     return IsOfClass(node, wxT("wxCalendarCtrl"));
 }

+
+#endif