Fixed an off-by-one error

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

diff --git a/src/xrc/xh_scrol.cpp b/src/xrc/xh_scrol.cpp
index 6e2dfb1b7125973f4cce23beeb10837a055b23cf..ac99ba1b40046321b7c8c67e821b1b11e49e5321 100644 (file)
--- a/src/xrc/xh_scrol.cpp
+++ b/src/xrc/xh_scrol.cpp
@@ -22,21 +22,19 @@
 #include "wx/xrc/xh_scrol.h"
 #include "wx/scrolbar.h"
 
 #include "wx/xrc/xh_scrol.h"
 #include "wx/scrolbar.h"
 

+IMPLEMENT_DYNAMIC_CLASS(wxScrollBarXmlHandler, wxXmlResourceHandler)

 
 wxScrollBarXmlHandler::wxScrollBarXmlHandler() 
 : wxXmlResourceHandler() 
 {
 
 wxScrollBarXmlHandler::wxScrollBarXmlHandler() 
 : wxXmlResourceHandler() 
 {

-    ADD_STYLE( wxSB_HORIZONTAL );
-    ADD_STYLE( wxSB_VERTICAL );
+    XRC_ADD_STYLE(wxSB_HORIZONTAL);
+    XRC_ADD_STYLE(wxSB_VERTICAL);

     AddWindowStyles();
 }
 
 wxObject *wxScrollBarXmlHandler::DoCreateResource()
 { 
     AddWindowStyles();
 }
 
 wxObject *wxScrollBarXmlHandler::DoCreateResource()
 { 

-    wxScrollBar *control = wxStaticCast(m_instance, wxScrollBar);
-
-    if (!control)
-       control = new wxScrollBar;
+    XRC_MAKE_INSTANCE(control, wxScrollBar)

 
     control->Create(m_parentAsWindow,
                     GetID(),
 
     control->Create(m_parentAsWindow,
                     GetID(),


@@ -48,21 +46,15 @@ wxObject *wxScrollBarXmlHandler::DoCreateResource()
     control->SetScrollbar(GetLong( wxT("value"), 0), 
                           GetLong( wxT("thumbsize"),1),
                           GetLong( wxT("range"), 10),
     control->SetScrollbar(GetLong( wxT("value"), 0), 
                           GetLong( wxT("thumbsize"),1),
                           GetLong( wxT("range"), 10),

-                          GetLong( wxT("pagesize"),1)
-                          );
-                          
-    
+                          GetLong( wxT("pagesize"),1));
+

     SetupWindow(control);
     SetupWindow(control);

+    CreateChildren(control);

     
     return control;
 }
 
     
     return control;
 }
 

-
-

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

-
-
-