Add some basic tests for wxDataViewCtrl selection handling.

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

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 776868fa73b4c1eedd978838d3b9f7f322a1f192..899bacea15bea1e4c7f4fe6cbf4af70a2ac3ad5a 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -22,8 +22,9 @@
 
 #include "wx/control.h"
 #include "wx/event.h"
 
 #include "wx/control.h"
 #include "wx/event.h"

+#include "wx/range.h"

 
 

-#define wxSPIN_BUTTON_NAME _T("wxSpinButton")
+#define wxSPIN_BUTTON_NAME wxT("wxSpinButton")

 
 // ----------------------------------------------------------------------------
 //  The wxSpinButton is like a small scrollbar than is often placed next
 
 // ----------------------------------------------------------------------------
 //  The wxSpinButton is like a small scrollbar than is often placed next


@@ -36,7 +37,7 @@
 //  wxSP_WRAP:         value wraps at either end
 // ----------------------------------------------------------------------------
 
 //  wxSP_WRAP:         value wraps at either end
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSpinButtonBase : public wxControl
+class WXDLLIMPEXP_CORE wxSpinButtonBase : public wxControl

 {
 public:
     // ctor initializes the range with the default (0..100) values
 {
 public:
     // ctor initializes the range with the default (0..100) values


@@ -46,6 +47,7 @@ public:
     virtual int GetValue() const = 0;
     virtual int GetMin() const { return m_min; }
     virtual int GetMax() const { return m_max; }
     virtual int GetValue() const = 0;
     virtual int GetMin() const { return m_min; }
     virtual int GetMax() const { return m_max; }

+    wxRange GetRange() const { return wxRange( GetMin(), GetMax() );}

 
     // operations
     virtual void SetValue(int val) = 0;
 
     // operations
     virtual void SetValue(int val) = 0;


@@ -56,6 +58,7 @@ public:
         m_min = minVal;
         m_max = maxVal;
     }
         m_min = minVal;
         m_max = maxVal;
     }

+    void SetRange( const wxRange& range) { SetRange( range.GetMin(), range.GetMax()); }

 
     // is this spin button vertically oriented?
     bool IsVertical() const { return (m_windowStyle & wxSP_VERTICAL) != 0; }
 
     // is this spin button vertically oriented?
     bool IsVertical() const { return (m_windowStyle & wxSP_VERTICAL) != 0; }


@@ -65,7 +68,7 @@ protected:
     int   m_min;
     int   m_max;
 
     int   m_min;
     int   m_max;
 

-    DECLARE_NO_COPY_CLASS(wxSpinButtonBase)
+    wxDECLARE_NO_COPY_CLASS(wxSpinButtonBase);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -83,7 +86,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/spinbutt.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXGTK__)
     #include "wx/gtk1/spinbutt.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/spinbutt.h"
+    #include "wx/osx/spinbutt.h"

 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/spinbutt.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/spinbutt.h"
 #elif defined(__WXPM__)


@@ -94,7 +97,7 @@ protected:
 // the wxSpinButton event
 // ----------------------------------------------------------------------------
 
 // the wxSpinButton event
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSpinEvent : public wxNotifyEvent
+class WXDLLIMPEXP_CORE wxSpinEvent : public wxNotifyEvent

 {
 public:
     wxSpinEvent(wxEventType commandType = wxEVT_NULL, int winid = 0)
 {
 public:
     wxSpinEvent(wxEventType commandType = wxEVT_NULL, int winid = 0)


@@ -102,26 +105,37 @@ public:
     {
     }
 
     {
     }
 

+    wxSpinEvent(const wxSpinEvent& event) : wxNotifyEvent(event) {}
+

     // get the current value of the control
     // get the current value of the control

+    int GetValue() const { return m_commandInt; }
+    void SetValue(int value) { m_commandInt = value; }
+

     int GetPosition() const { return m_commandInt; }
     void SetPosition(int pos) { m_commandInt = pos; }
 
     int GetPosition() const { return m_commandInt; }
     void SetPosition(int pos) { m_commandInt = pos; }
 

+    virtual wxEvent *Clone() const { return new wxSpinEvent(*this); }
+

 private:
 private:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSpinEvent)

 };
 
 typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
 
 #define wxSpinEventHandler(func) \
 };
 
 typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
 
 #define wxSpinEventHandler(func) \

-    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSpinEventFunction, &func)
+    wxEVENT_HANDLER_CAST(wxSpinEventFunction, func)

 
 

-// macros for handling spin events
+// macros for handling spin events: notice that we must use the real values of
+// the event type constants and not their references (wxEVT_SPIN[_UP/DOWN])
+// here as otherwise the event tables could end up with non-initialized
+// (because of undefined initialization order of the globals defined in
+// different translation units) references in them

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

-    wx__DECLARE_EVT1(wxEVT_SCROLL_LINEUP, winid, wxSpinEventHandler(func))
+    wx__DECLARE_EVT1(wxEVT_SPIN_UP, winid, wxSpinEventHandler(func))

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

-    wx__DECLARE_EVT1(wxEVT_SCROLL_LINEDOWN, winid, wxSpinEventHandler(func))
+    wx__DECLARE_EVT1(wxEVT_SPIN_DOWN, winid, wxSpinEventHandler(func))

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

-    wx__DECLARE_EVT1(wxEVT_SCROLL_THUMBTRACK, winid, wxSpinEventHandler(func))
+    wx__DECLARE_EVT1(wxEVT_SPIN, winid, wxSpinEventHandler(func))

 
 #endif // wxUSE_SPINBTN
 
 
 #endif // wxUSE_SPINBTN