Applied patch [ 1195797 ] Fixes to compile on Win64

[wxWidgets.git] / include / wx / spinctrl.h

diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index db8ddd129f7376d0c0e7691df2b16a9f5a6fb365..7490dc47663748b83c49f996bb4353ab84caa939 100644 (file)
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -12,8 +12,11 @@
 #ifndef _WX_SPINCTRL_H_
 #define _WX_SPINCTRL_H_
 
-#include "wx/control.h"
-#include "wx/event.h"
+#include "wx/defs.h"
+
+#if wxUSE_SPINCTRL
+
+#include "wx/spinbutt.h"        // should make wxSpinEvent visible to the app
 
 // ----------------------------------------------------------------------------
 // a spin ctrl is a text control with a spin button which is usually used to
@@ -34,9 +37,13 @@ public:
     virtual int GetMax() const { return m_max; }
 
     // operations
+    virtual void SetValue(const wxString& value) = 0;
     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,15 +57,25 @@ 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__)
     #include "wx/gtk/spinctrl.h"
-#else // Win16 || !Win
-    #include "wx/generic/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
 
-#endif // _WX_SPINCTRL_H_
+#define EVT_SPINCTRL(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_SPINCTRL_UPDATED, id, wxSpinEventHandler(fn))
+
+#endif // wxUSE_SPINCTRL
 
+#endif // _WX_SPINCTRL_H_