overseeing the obvious, there is already a perfect scroll call for HIView...

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

diff --git a/contrib/src/xrc/xh_scrol.cpp b/contrib/src/xrc/xh_scrol.cpp
index 0171894f87cbe0321597ecb694f7fa699e43f69f..ac99ba1b40046321b7c8c67e821b1b11e49e5321 100644 (file)
--- a/contrib/src/xrc/xh_scrol.cpp
+++ b/contrib/src/xrc/xh_scrol.cpp
@@ -22,42 +22,39 @@
 #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 = new wxScrollBar(m_parentAsWindow,
-                                    GetID(),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
+    XRC_MAKE_INSTANCE(control, wxScrollBar)
+
+    control->Create(m_parentAsWindow,
+                    GetID(),
+                    GetPosition(), GetSize(),
+                    GetStyle(),
+                    wxDefaultValidator,
+                    GetName());
+

     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"));
 }

-
-
-