Add *wxTopLevelWindowGTK*RequestUserAttention*int*;

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

diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index a40cc6c3c4c6c6b0a1b822b0736f76a7a4b3d3e6..7490dc47663748b83c49f996bb4353ab84caa939 100644 (file)
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -12,6 +12,10 @@
 #ifndef _WX_SPINCTRL_H_
 #define _WX_SPINCTRL_H_
 
 #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
 
 // ----------------------------------------------------------------------------
 #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;
 
     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; }
 protected:
     // initialize m_min/max with the default values
     void Init() { m_min = 0; m_max = 100; }


@@ -52,7 +59,7 @@ protected:
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/generic/spinctlg.h"
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/generic/spinctlg.h"

-#elif defined(__WXMSW__) && defined(__WIN32__)
+#elif defined(__WXMSW__)

     #include "wx/msw/spinctrl.h"
 #elif defined(__WXPM__)
     #include "wx/os2/spinctrl.h"
     #include "wx/msw/spinctrl.h"
 #elif defined(__WXPM__)
     #include "wx/os2/spinctrl.h"


@@ -62,12 +69,13 @@ protected:
     #include "wx/generic/spinctlg.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/spinctrl.h"
     #include "wx/generic/spinctlg.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/spinctrl.h"

-#else // Win16 || !Win
+#elif defined(__WXCOCOA__)

     #include "wx/generic/spinctlg.h"
 #endif // platform
 
 #define EVT_SPINCTRL(id, fn) \
     #include "wx/generic/spinctlg.h"
 #endif // platform
 
 #define EVT_SPINCTRL(id, fn) \

-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_SPINCTRL_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & fn, (wxObject *) NULL ),
+    wx__DECLARE_EVT1(wxEVT_COMMAND_SPINCTRL_UPDATED, id, wxSpinEventHandler(fn))

 
 

-#endif // _WX_SPINCTRL_H_
+#endif // wxUSE_SPINCTRL

 
 

+#endif // _WX_SPINCTRL_H_