X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5dd26b083956439f0147c134e9365c222fba3726..9e15c94f41c8cdf42470d318269e48e90d6ba75e:/include/wx/spinctrl.h?ds=sidebyside

diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index 9d6cd5c3e5..6080b61365 100644
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -12,6 +12,10 @@
 #ifndef _WX_SPINCTRL_H_
 #define _WX_SPINCTRL_H_
 
+#include "wx/defs.h"
+
+#if wxUSE_SPINCTRL
+
 #include "wx/spinbutt.h"        // should make wxSpinEvent visible to the app
 
 // ----------------------------------------------------------------------------
@@ -37,6 +41,9 @@ public:
     virtual void SetValue(int val) = 0;
     virtual void SetRange(int minVal, int maxVal) = 0;
 
+    // as the wxTextCtrl method
+    virtual void SetSelection(long from, long to) = 0;
+
 protected:
     // initialize m_min/max with the default values
     void Init() { m_min = 0; m_max = 100; }
@@ -50,18 +57,27 @@ protected:
 // include the platform-dependent class implementation
 // ----------------------------------------------------------------------------
 
-#if defined(__WXMSW__) && defined(__WIN32__)
+#if defined(__WXUNIVERSAL__)
+    #include "wx/generic/spinctlg.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/spinctrl.h"
 #elif defined(__WXPM__)
     #include "wx/os2/spinctrl.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/spinctrl.h"
-#else // Win16 || !Win
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/spinctrl.h"
+#elif defined(__WXMOTIF__)
+    #include "wx/generic/spinctlg.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/spinctrl.h"
+#elif defined(__WXCOCOA__)
     #include "wx/generic/spinctlg.h"
 #endif // platform
 
-// Macro must be defined here, not event.h, since it must reference wxSpinEventFunction
-#define EVT_SPINCTRL(id, fn) { wxEVT_COMMAND_SPINCTRL_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & fn, (wxObject *) NULL },
+#define EVT_SPINCTRL(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_SPINCTRL_UPDATED, id, wxSpinEventHandler(fn))
 
-#endif // _WX_SPINCTRL_H_
+#endif // wxUSE_SPINCTRL
 
+#endif // _WX_SPINCTRL_H_