use popen() instead of wxExecute(), it works inside wxYield() unlike the latter

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

diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp
index 73c96c7a430c85e979008eba77713318bc036832..616537b27cd0e8c2654b64b4fe860c42b16d8cc3 100644 (file)
--- a/src/xrc/xh_spin.cpp
+++ b/src/xrc/xh_spin.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "xh_spin.h"
 #endif
 
 #pragma implementation "xh_spin.h"
 #endif
 


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

-#if wxUSE_XRC && wxUSE_SPINBTN
+#if wxUSE_XRC

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

-#include "wx/spinctrl.h"
+
+#if wxUSE_SPINBTN
+
+#include "wx/spinbutt.h"

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


@@ -63,6 +66,8 @@ bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node)
 
 #if wxUSE_SPINCTRL
 
 
 #if wxUSE_SPINCTRL
 

+#include "wx/spinctrl.h"
+

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


@@ -98,4 +103,6 @@ bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxSpinCtrl"));
 }
 
     return IsOfClass(node, wxT("wxSpinCtrl"));
 }
 

-#endif // wxUSE_XRC && wxUSE_SPINCTRL
+#endif // wxUSE_SPINCTRL
+
+#endif // wxUSE_XRC