From: Gilles Depeyrot <gilles_depeyrot@mac.com>
Date: Thu, 28 Jun 2001 06:28:32 +0000 (+0000)
Subject: corrected after wxUniv merge
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a842a96e24cff3d4448fbdb6c2e94dd9f4ad54da

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 effc48b853..54384ccb1c 100644
--- a/src/mac/carbon/spinctrl.cpp
+++ b/src/mac/carbon/spinctrl.cpp
@@ -12,19 +12,30 @@
 #pragma implementation "spinctlg.h"
 #endif
 
-#include "wx/spinctrl.h"
+#include "wx/defs.h"
 
 #if wxUSE_SPINCTRL
 
+#include "wx/spinctrl.h"
+
 
 //-----------------------------------------------------------------------------
 // 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
 
+#endif // wxUSE_SPINBTN/!wxUSE_SPINBTN
 
 #endif   // wxUSE_SPINCTRL
 
diff --git a/src/mac/spinctrl.cpp b/src/mac/spinctrl.cpp
index effc48b853..54384ccb1c 100644
--- a/src/mac/spinctrl.cpp
+++ b/src/mac/spinctrl.cpp
@@ -12,19 +12,30 @@
 #pragma implementation "spinctlg.h"
 #endif
 
-#include "wx/spinctrl.h"
+#include "wx/defs.h"
 
 #if wxUSE_SPINCTRL
 
+#include "wx/spinctrl.h"
+
 
 //-----------------------------------------------------------------------------
 // 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
 
+#endif // wxUSE_SPINBTN/!wxUSE_SPINBTN
 
 #endif   // wxUSE_SPINCTRL