fixed previous revision: call wxControl's, not wxButton's DoGetBestSize

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

diff --git a/src/xrc/xh_slidr.cpp b/src/xrc/xh_slidr.cpp
index 10e16450ccadf28ac2a59d0f4bf152484a06c803..3ca8b26aa7bc36f8ecdd1b895c2c82727a8c824e 100644 (file)
--- a/src/xrc/xh_slidr.cpp
+++ b/src/xrc/xh_slidr.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
+

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


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

+#if wxUSE_XRC && wxUSE_SLIDER
+

 #include "wx/xrc/xh_slidr.h"
 #include "wx/slider.h"
 
 #include "wx/xrc/xh_slidr.h"
 #include "wx/slider.h"
 

-#if wxUSE_SLIDER
-

 IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler)
 
 IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler)
 

-wxSliderXmlHandler::wxSliderXmlHandler() 
-: wxXmlResourceHandler() 
+wxSliderXmlHandler::wxSliderXmlHandler()
+: wxXmlResourceHandler()

 {
     XRC_ADD_STYLE(wxSL_HORIZONTAL);
     XRC_ADD_STYLE(wxSL_VERTICAL);
 {
     XRC_ADD_STYLE(wxSL_HORIZONTAL);
     XRC_ADD_STYLE(wxSL_VERTICAL);


@@ -43,12 +43,12 @@ wxSliderXmlHandler::wxSliderXmlHandler()
 }
 
 wxObject *wxSliderXmlHandler::DoCreateResource()
 }
 
 wxObject *wxSliderXmlHandler::DoCreateResource()

-{ 
+{

     XRC_MAKE_INSTANCE(control, wxSlider)
 
     control->Create(m_parentAsWindow,
                     GetID(),
     XRC_MAKE_INSTANCE(control, wxSlider)
 
     control->Create(m_parentAsWindow,
                     GetID(),

-                    GetLong(wxT("value"), wxSL_DEFAULT_VALUE), 
+                    GetLong(wxT("value"), wxSL_DEFAULT_VALUE),

                     GetLong(wxT("min"), wxSL_DEFAULT_MIN),
                     GetLong(wxT("max"), wxSL_DEFAULT_MAX),
                     GetPosition(), GetSize(),
                     GetLong(wxT("min"), wxSL_DEFAULT_MIN),
                     GetLong(wxT("max"), wxSL_DEFAULT_MAX),
                     GetPosition(), GetSize(),


@@ -82,7 +82,7 @@ wxObject *wxSliderXmlHandler::DoCreateResource()
     }
 
     SetupWindow(control);
     }
 
     SetupWindow(control);

-    
+

     return control;
 }
 
     return control;
 }
 


@@ -91,4 +91,4 @@ bool wxSliderXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxSlider"));
 }
 
     return IsOfClass(node, wxT("wxSlider"));
 }
 

-#endif
+#endif // wxUSE_XRC && wxUSE_SLIDER