corrected after wxUniv merge

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/spinctrl.cpp b/src/mac/carbon/spinctrl.cpp
index effc48b853c886268ae04c548c14533fe9206f74..54384ccb1cac80082a83aac2906631d5aba165a5 100644 (file)
--- a/src/mac/carbon/spinctrl.cpp
+++ b/src/mac/carbon/spinctrl.cpp
@@ -12,19 +12,30 @@
 #pragma implementation "spinctlg.h"
 #endif
 
 #pragma implementation "spinctlg.h"
 #endif
 

-#include "wx/spinctrl.h"
+#include "wx/defs.h"

 
 #if wxUSE_SPINCTRL
 
 
 #if wxUSE_SPINCTRL
 

+#include "wx/spinctrl.h"
+

 
 //-----------------------------------------------------------------------------
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 

+#if wxUSE_SPINBTN
+
+#if !USE_SHARED_LIBRARY
+     IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl,wxControl)
+#endif
+
+#else // !wxUSE_SPINBTN
+

 #if !USE_SHARED_LIBRARY
      IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl,wxTextCtrl)
 #endif
 
 #if !USE_SHARED_LIBRARY
      IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl,wxTextCtrl)
 #endif
 

+#endif // wxUSE_SPINBTN/!wxUSE_SPINBTN

 
 #endif   // wxUSE_SPINCTRL
 
 
 #endif   // wxUSE_SPINCTRL
 

diff --git a/src/mac/spinctrl.cpp b/src/mac/spinctrl.cpp
index effc48b853c886268ae04c548c14533fe9206f74..54384ccb1cac80082a83aac2906631d5aba165a5 100644 (file)
--- a/src/mac/spinctrl.cpp
+++ b/src/mac/spinctrl.cpp
@@ -12,19 +12,30 @@
 #pragma implementation "spinctlg.h"
 #endif
 
 #pragma implementation "spinctlg.h"
 #endif
 

-#include "wx/spinctrl.h"
+#include "wx/defs.h"

 
 #if wxUSE_SPINCTRL
 
 
 #if wxUSE_SPINCTRL
 

+#include "wx/spinctrl.h"
+

 
 //-----------------------------------------------------------------------------
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 

+#if wxUSE_SPINBTN
+
+#if !USE_SHARED_LIBRARY
+     IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl,wxControl)
+#endif
+
+#else // !wxUSE_SPINBTN
+

 #if !USE_SHARED_LIBRARY
      IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl,wxTextCtrl)
 #endif
 
 #if !USE_SHARED_LIBRARY
      IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl,wxTextCtrl)
 #endif
 

+#endif // wxUSE_SPINBTN/!wxUSE_SPINBTN

 
 #endif   // wxUSE_SPINCTRL
 
 
 #endif   // wxUSE_SPINCTRL