Get the stock label when stock ID is used with empty label in Create()

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

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

- 
+

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


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

+#if wxUSE_XRC
+

 #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()

 {
     XRC_ADD_STYLE(wxSB_HORIZONTAL);
     XRC_ADD_STYLE(wxSB_VERTICAL);
 {
     XRC_ADD_STYLE(wxSB_HORIZONTAL);
     XRC_ADD_STYLE(wxSB_VERTICAL);


@@ -32,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,


@@ -42,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;
 }
 


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

+
+#endif // wxUSE_XRC