Removed debug comments

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

diff --git a/src/xrc/xh_cald.cpp b/src/xrc/xh_cald.cpp
index 4fba39eb75b8e5c2bd4dd282860cbcef87f5e1e0..861928fb96252e868b4245c23c78859b49f58974 100644 (file)
--- a/src/xrc/xh_cald.cpp
+++ b/src/xrc/xh_cald.cpp
@@ -27,21 +27,18 @@
 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);

     AddWindowStyles();
 }
 
 
 wxObject *wxCalendarCtrlXmlHandler::DoCreateResource()
 { 
     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(),
 
     calendar->Create(m_parentAsWindow,
                      GetID(),


@@ -56,11 +53,7 @@ wxObject *wxCalendarCtrlXmlHandler::DoCreateResource()
     return calendar;
 }
 
     return calendar;
 }
 

-
-

 bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxCalendarCtrl"));
 }
 bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxCalendarCtrl"));
 }

-
-