X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d422d01eec769f5339087b4b3ad352d3d164bf1b..558820fd083635d3e1dc026a56b2f14870cb5c38:/include/wx/spinbutt.h diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h index 02f38a74b0..776868fa73 100644 --- a/include/wx/spinbutt.h +++ b/include/wx/spinbutt.h @@ -12,22 +12,19 @@ #ifndef _WX_SPINBUTT_H_BASE_ #define _WX_SPINBUTT_H_BASE_ -#ifdef __GNUG__ -#pragma interface "spinbutbase.h" -#pragma implementation "spinbutbase.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- #include "wx/defs.h" -#ifdef wxUSE_SPINBTN +#if wxUSE_SPINBTN #include "wx/control.h" #include "wx/event.h" +#define wxSPIN_BUTTON_NAME _T("wxSpinButton") + // ---------------------------------------------------------------------------- // The wxSpinButton is like a small scrollbar than is often placed next // to a text control. @@ -42,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; @@ -51,43 +49,45 @@ 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; m_max = maxVal; } -protected: - // init the base part of the control - void InitBase() - { - m_min = 0; - m_max = 100; - } + // is this spin button vertically oriented? + bool IsVertical() const { return (m_windowStyle & wxSP_VERTICAL) != 0; } +protected: // the range value int m_min; int m_max; + + DECLARE_NO_COPY_CLASS(wxSpinButtonBase) }; // ---------------------------------------------------------------------------- // include the declaration of the real class // ---------------------------------------------------------------------------- -#if defined(__WXMSW__) +#if defined(__WXUNIVERSAL__) + #include "wx/univ/spinbutt.h" +#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(__WXQT__) - #include "wx/qt/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 // ---------------------------------------------------------------------------- @@ -96,31 +96,32 @@ protected: class WXDLLEXPORT wxSpinEvent : public wxNotifyEvent { - DECLARE_DYNAMIC_CLASS(wxSpinEvent) - public: - wxSpinEvent(wxEventType commandType = wxEVT_NULL, int id = 0) - : wxNotifyEvent(commandType, id) + wxSpinEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) + : wxNotifyEvent(commandType, winid) { } // get the current value of the control int GetPosition() const { return m_commandInt; } void SetPosition(int pos) { m_commandInt = pos; } + +private: + DECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinEvent) }; typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&); +#define wxSpinEventHandler(func) \ + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSpinEventFunction, &func) + // macros for handling spin events -#ifndef EVT_SPIN_UP -#define EVT_SPIN_UP(id, func) { wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func }, -#endif -#ifndef EVT_SPIN_DOWN -#define EVT_SPIN_DOWN(id, func) { wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func }, -#endif -#ifndef EVT_SPIN -#define EVT_SPIN(id, func) { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func }, -#endif +#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