Various fixes for Textctrl and Popup Menus.

[wxWidgets.git] / src / mac / carbon / spinctrl.cpp

diff --git a/src/mac/carbon/spinctrl.cpp b/src/mac/carbon/spinctrl.cpp
index effc48b853c886268ae04c548c14533fe9206f74..272c0791f351eefd4919902012cdf8bb7769669b 100644 (file)
--- a/src/mac/carbon/spinctrl.cpp
+++ b/src/mac/carbon/spinctrl.cpp
@@ -12,19 +12,34 @@
 #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"
+
+#if 0

 
 

+// now using the generic impl

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

+#if wxUSE_SPINBTN && !defined(__WXMAC__)
+
+#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

 
 #endif   // wxUSE_SPINCTRL
 
 
 #endif   // wxUSE_SPINCTRL