X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/spinbutt.h diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h index 820e8c33b4..899bacea15 100644 --- a/include/wx/spinbutt.h +++ b/include/wx/spinbutt.h @@ -22,8 +22,9 @@ #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 @@ -46,6 +47,7 @@ public: 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; @@ -56,6 +58,7 @@ public: 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; } @@ -65,7 +68,7 @@ protected: 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__) - #include "wx/mac/spinbutt.h" + #include "wx/osx/spinbutt.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/spinbutt.h" #elif defined(__WXPM__) @@ -120,15 +123,19 @@ private: 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) \ - wx__DECLARE_EVT1(wxEVT_SCROLL_LINEUP, winid, wxSpinEventHandler(func)) + wx__DECLARE_EVT1(wxEVT_SPIN_UP, winid, wxSpinEventHandler(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) \ - wx__DECLARE_EVT1(wxEVT_SCROLL_THUMBTRACK, winid, wxSpinEventHandler(func)) + wx__DECLARE_EVT1(wxEVT_SPIN, winid, wxSpinEventHandler(func)) #endif // wxUSE_SPINBTN