Fixes so joystick not only compiles on Linux, but it actually works too!

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

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index f45c5f2f63e1eac62dad3d3743f90957757c43a7..722ba593acea5e3569d49eb65183e5937488b38d 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -39,7 +39,8 @@
 class WXDLLEXPORT wxSpinButtonBase : public wxControl
 {
 public:
 class WXDLLEXPORT wxSpinButtonBase : public wxControl
 {
 public:

-    wxSpinButtonBase() { InitBase(); }
+    // ctor intiializes the range with the default (0..100) values
+    wxSpinButtonBase() { m_min = 0; m_max = 100; }

 
     // accessors
     virtual int GetValue() const = 0;
 
     // accessors
     virtual int GetValue() const = 0;


@@ -48,6 +49,8 @@ public:
 
     // operations
     virtual void SetValue(int val) = 0;
 
     // operations
     virtual void SetValue(int val) = 0;

+    virtual void SetMin(int minVal) { SetRange ( minVal , m_max ) ; }
+    virtual void SetMax(int maxVal) { SetRange ( m_min , maxVal ) ; }

     virtual void SetRange(int minVal, int maxVal)
     {
         m_min = minVal;
     virtual void SetRange(int minVal, int maxVal)
     {
         m_min = minVal;


@@ -58,13 +61,6 @@ public:
     bool IsVertical() const { return (m_windowStyle & wxSP_VERTICAL) != 0; }
 
 protected:
     bool IsVertical() const { return (m_windowStyle & wxSP_VERTICAL) != 0; }
 
 protected:

-    // init the base part of the control
-    void InitBase()
-    {
-        m_min = 0;
-        m_max = 100;
-    }
-

     // the range value
     int   m_min;
     int   m_max;
     // the range value
     int   m_min;
     int   m_max;


@@ -116,11 +112,11 @@ typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
 
 // macros for handling spin events
 #define EVT_SPIN_UP(winid, func) \
 
 // macros for handling spin events
 #define EVT_SPIN_UP(winid, func) \

-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEUP, winid, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ),
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEUP, winid, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxSpinEventFunction, & func ), NULL ),

 #define EVT_SPIN_DOWN(winid, func) \
 #define EVT_SPIN_DOWN(winid, func) \

-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEDOWN, winid, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ),
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEDOWN, winid, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxSpinEventFunction, & func ), NULL ),

 #define EVT_SPIN(winid, func) \
 #define EVT_SPIN(winid, func) \

-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBTRACK, winid, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ),
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBTRACK, winid, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxSpinEventFunction, & func ), NULL ),

 
 #endif // wxUSE_SPINBTN
 
 
 #endif // wxUSE_SPINBTN