X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..dd71bfb9921430755a885117cc6c9843c62dafda:/src/xrc/xh_scrol.cpp

diff --git a/src/xrc/xh_scrol.cpp b/src/xrc/xh_scrol.cpp
index 6e2dfb1b71..3916339bd5 100644
--- a/src/xrc/xh_scrol.cpp
+++ b/src/xrc/xh_scrol.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_scrol.cpp
+// Name:        src/xrc/xh_scrol.cpp
 // Purpose:     XRC resource for wxScrollBar
 // Author:      Brian Gavin
 // Created:     2000/09/09
@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_scrol.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -19,24 +15,27 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_SCROLLBAR
+
 #include "wx/xrc/xh_scrol.h"
-#include "wx/scrolbar.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/scrolbar.h"
+#endif
+
+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()
-{ 
-    wxScrollBar *control = wxStaticCast(m_instance, wxScrollBar);
-
-    if (!control)
-       control = new wxScrollBar;
+{
+    XRC_MAKE_INSTANCE(control, wxScrollBar)
 
     control->Create(m_parentAsWindow,
                     GetID(),
@@ -45,24 +44,20 @@ wxObject *wxScrollBarXmlHandler::DoCreateResource()
                     wxDefaultValidator,
                     GetName());
 
-    control->SetScrollbar(GetLong( wxT("value"), 0), 
+    control->SetScrollbar(GetLong( wxT("value"), 0),
                           GetLong( wxT("thumbsize"),1),
                           GetLong( wxT("range"), 10),
-                          GetLong( wxT("pagesize"),1)
-                          );
-                          
-    
+                          GetLong( wxT("pagesize"),1));
+
     SetupWindow(control);
-    
+    CreateChildren(control);
+
     return control;
 }
 
-
-
 bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxScrollBar"));
 }
 
-
-
+#endif // wxUSE_XRC && wxUSE_SCROLLBAR