X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e711d5c093dcc758e3f1670caf845612ea9fa92..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/spinbutt.h?ds=sidebyside diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h index 52928d24d4..776868fa73 100644 --- a/include/wx/spinbutt.h +++ b/include/wx/spinbutt.h @@ -39,7 +39,8 @@ class WXDLLEXPORT wxSpinButtonBase : public wxControl { public: - wxSpinButtonBase() { InitBase(); } + // ctor initializes the range with the default (0..100) values + wxSpinButtonBase() { m_min = 0; m_max = 100; } // accessors virtual int GetValue() const = 0; @@ -48,6 +49,8 @@ public: // 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; @@ -58,16 +61,11 @@ public: 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; + + DECLARE_NO_COPY_CLASS(wxSpinButtonBase) }; // ---------------------------------------------------------------------------- @@ -76,18 +74,20 @@ protected: #if defined(__WXUNIVERSAL__) #include "wx/univ/spinbutt.h" -#elif defined(__WXMSW__) && defined(__WIN95__) +#elif defined(__WXMSW__) #include "wx/msw/spinbutt.h" #elif defined(__WXMOTIF__) #include "wx/motif/spinbutt.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/spinbutt.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/spinbutt.h" #elif defined(__WXMAC__) #include "wx/mac/spinbutt.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/spinbutt.h" #elif defined(__WXPM__) #include "wx/os2/spinbutt.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/spinbutt.h" #endif // ---------------------------------------------------------------------------- @@ -97,8 +97,8 @@ protected: class WXDLLEXPORT wxSpinEvent : public wxNotifyEvent { public: - wxSpinEvent(wxEventType commandType = wxEVT_NULL, int id = 0) - : wxNotifyEvent(commandType, id) + wxSpinEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) + : wxNotifyEvent(commandType, winid) { } @@ -107,18 +107,21 @@ public: void SetPosition(int pos) { m_commandInt = pos; } private: - DECLARE_DYNAMIC_CLASS(wxSpinEvent) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinEvent) }; typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&); +#define wxSpinEventHandler(func) \ + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSpinEventFunction, &func) + // macros for handling spin events -#define EVT_SPIN_UP(id, func) \ - DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ), -#define EVT_SPIN_DOWN(id, func) \ - DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ), -#define EVT_SPIN(id, func) \ - DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ), +#define EVT_SPIN_UP(winid, func) \ + wx__DECLARE_EVT1(wxEVT_SCROLL_LINEUP, winid, wxSpinEventHandler(func)) +#define EVT_SPIN_DOWN(winid, func) \ + wx__DECLARE_EVT1(wxEVT_SCROLL_LINEDOWN, winid, wxSpinEventHandler(func)) +#define EVT_SPIN(winid, func) \ + wx__DECLARE_EVT1(wxEVT_SCROLL_THUMBTRACK, winid, wxSpinEventHandler(func)) #endif // wxUSE_SPINBTN