X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/854e189f90dac9ba5e0239bca79aed64e8d6f46c..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/xrc/xh_scrol.cpp?ds=sidebyside

diff --git a/src/xrc/xh_scrol.cpp b/src/xrc/xh_scrol.cpp
index 653d8ec180..7d8ae34728 100644
--- a/src/xrc/xh_scrol.cpp
+++ b/src/xrc/xh_scrol.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "xh_scrol.h"
 #endif
 
@@ -19,13 +19,15 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_SCROLLBAR
+
 #include "wx/xrc/xh_scrol.h"
 #include "wx/scrolbar.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBarXmlHandler, wxXmlResourceHandler)
 
-wxScrollBarXmlHandler::wxScrollBarXmlHandler() 
-: wxXmlResourceHandler() 
+wxScrollBarXmlHandler::wxScrollBarXmlHandler()
+: wxXmlResourceHandler()
 {
     XRC_ADD_STYLE(wxSB_HORIZONTAL);
     XRC_ADD_STYLE(wxSB_VERTICAL);
@@ -33,7 +35,7 @@ wxScrollBarXmlHandler::wxScrollBarXmlHandler()
 }
 
 wxObject *wxScrollBarXmlHandler::DoCreateResource()
-{ 
+{
     XRC_MAKE_INSTANCE(control, wxScrollBar)
 
     control->Create(m_parentAsWindow,
@@ -43,13 +45,14 @@ 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));
 
     SetupWindow(control);
-    
+    CreateChildren(control);
+
     return control;
 }
 
@@ -57,3 +60,5 @@ bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxScrollBar"));
 }
+
+#endif // wxUSE_XRC && wxUSE_SCROLLBAR