fix getting tooltip colors for GTK 2.11

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

diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp
index 5748e7443a169cdf010e66ceb9b5a9ef8d16ef76..15e878c3d383156fba5a71dbb7a11fce1db140da 100644 (file)
--- a/src/xrc/xh_spin.cpp
+++ b/src/xrc/xh_spin.cpp
@@ -7,10 +7,6 @@
 // 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_spin.h"
-#endif

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


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

+#if wxUSE_XRC 
+

 #include "wx/xrc/xh_spin.h"
 #include "wx/xrc/xh_spin.h"

-#include "wx/spinctrl.h"

 
 #if wxUSE_SPINBTN
 
 
 #if wxUSE_SPINBTN
 

+#include "wx/spinbutt.h"
+

 IMPLEMENT_DYNAMIC_CLASS(wxSpinButtonXmlHandler, wxXmlResourceHandler)
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinButtonXmlHandler, wxXmlResourceHandler)
 

-wxSpinButtonXmlHandler::wxSpinButtonXmlHandler() 
-: wxXmlResourceHandler() 
+wxSpinButtonXmlHandler::wxSpinButtonXmlHandler()
+: wxXmlResourceHandler()

 {
     XRC_ADD_STYLE(wxSP_HORIZONTAL);
     XRC_ADD_STYLE(wxSP_VERTICAL);
 {
     XRC_ADD_STYLE(wxSP_HORIZONTAL);
     XRC_ADD_STYLE(wxSP_VERTICAL);


@@ -37,7 +36,7 @@ wxSpinButtonXmlHandler::wxSpinButtonXmlHandler()
 }
 
 wxObject *wxSpinButtonXmlHandler::DoCreateResource()
 }
 
 wxObject *wxSpinButtonXmlHandler::DoCreateResource()

-{ 
+{

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


@@ -50,7 +49,7 @@ wxObject *wxSpinButtonXmlHandler::DoCreateResource()
     control->SetRange(GetLong( wxT("min"), wxSP_DEFAULT_MIN),
                       GetLong(wxT("max"), wxSP_DEFAULT_MAX));
     SetupWindow(control);
     control->SetRange(GetLong( wxT("min"), wxSP_DEFAULT_MIN),
                       GetLong(wxT("max"), wxSP_DEFAULT_MAX));
     SetupWindow(control);

-    
+

     return control;
 }
 
     return control;
 }
 


@@ -63,10 +62,12 @@ bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node)
 
 #if wxUSE_SPINCTRL
 
 
 #if wxUSE_SPINCTRL
 

+#include "wx/spinctrl.h"
+

 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlXmlHandler, wxXmlResourceHandler)
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlXmlHandler, wxXmlResourceHandler)
 

-wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler() 
-: wxXmlResourceHandler() 
+wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler()
+: wxXmlResourceHandler()

 {
     XRC_ADD_STYLE(wxSP_HORIZONTAL);
     XRC_ADD_STYLE(wxSP_VERTICAL);
 {
     XRC_ADD_STYLE(wxSP_HORIZONTAL);
     XRC_ADD_STYLE(wxSP_VERTICAL);


@@ -75,9 +76,9 @@ wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler()
 }
 
 wxObject *wxSpinCtrlXmlHandler::DoCreateResource()
 }
 
 wxObject *wxSpinCtrlXmlHandler::DoCreateResource()

-{ 
+{

     XRC_MAKE_INSTANCE(control, wxSpinCtrl)
     XRC_MAKE_INSTANCE(control, wxSpinCtrl)

-    
+

     control->Create(m_parentAsWindow,
                     GetID(),
                     GetText(wxT("value")),
     control->Create(m_parentAsWindow,
                     GetID(),
                     GetText(wxT("value")),


@@ -89,7 +90,7 @@ wxObject *wxSpinCtrlXmlHandler::DoCreateResource()
                     GetName());
 
     SetupWindow(control);
                     GetName());
 
     SetupWindow(control);

-    
+

     return control;
 }
 
     return control;
 }
 


@@ -99,3 +100,5 @@ bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node)
 }
 
 #endif // wxUSE_SPINCTRL
 }
 
 #endif // wxUSE_SPINCTRL

+
+#endif // wxUSE_XRC