fixed label case so that the link works (patch 1263943)

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

diff --git a/src/xrc/xh_scrol.cpp b/src/xrc/xh_scrol.cpp
index 653d8ec180036223995fd55ce8faf4e636d7c64e..7d8ae347281edb71089250948ff5f4403169456f 100644 (file)
--- a/src/xrc/xh_scrol.cpp
+++ b/src/xrc/xh_scrol.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "xh_scrol.h"
 #endif
 
 #pragma implementation "xh_scrol.h"
 #endif
 


@@ -19,13 +19,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC && wxUSE_SCROLLBAR
+

 #include "wx/xrc/xh_scrol.h"
 #include "wx/scrolbar.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBarXmlHandler, wxXmlResourceHandler)
 
 #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);
 {
     XRC_ADD_STYLE(wxSB_HORIZONTAL);
     XRC_ADD_STYLE(wxSB_VERTICAL);


@@ -33,7 +35,7 @@ wxScrollBarXmlHandler::wxScrollBarXmlHandler()
 }
 
 wxObject *wxScrollBarXmlHandler::DoCreateResource()
 }
 
 wxObject *wxScrollBarXmlHandler::DoCreateResource()

-{ 
+{

     XRC_MAKE_INSTANCE(control, wxScrollBar)
 
     control->Create(m_parentAsWindow,
     XRC_MAKE_INSTANCE(control, wxScrollBar)
 
     control->Create(m_parentAsWindow,


@@ -43,13 +45,14 @@ wxObject *wxScrollBarXmlHandler::DoCreateResource()
                     wxDefaultValidator,
                     GetName());
 
                     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);
                           GetLong( wxT("thumbsize"),1),
                           GetLong( wxT("range"), 10),
                           GetLong( wxT("pagesize"),1));
 
     SetupWindow(control);

-    
+    CreateChildren(control);
+

     return control;
 }
 
     return control;
 }
 


@@ -57,3 +60,5 @@ bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxScrollBar"));
 }
 {
     return IsOfClass(node, wxT("wxScrollBar"));
 }

+
+#endif // wxUSE_XRC && wxUSE_SCROLLBAR