X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fde6fcc9b551340a194ae4c726db5ab64b5c594..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/spinbutt.h?ds=inline diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h index 5f8026b488..53e84ea68f 100644 --- a/include/wx/spinbutt.h +++ b/include/wx/spinbutt.h @@ -12,12 +12,6 @@ #ifndef _WX_SPINBUTT_H_BASE_ #define _WX_SPINBUTT_H_BASE_ -#ifdef __GNUG__ - #if !defined(__WXMOTIF__) && !defined(__WXMAC__) // because there is no matching .cpp - #pragma interface "spinbutbase.h" - #endif -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -29,6 +23,8 @@ #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. @@ -40,10 +36,11 @@ // wxSP_WRAP: value wraps at either end // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSpinButtonBase : public wxControl +class WXDLLIMPEXP_CORE 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; @@ -52,73 +49,90 @@ 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; + + wxDECLARE_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" + #include "wx/osx/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 // ---------------------------------------------------------------------------- // the wxSpinButton event // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSpinEvent : public wxNotifyEvent +class WXDLLIMPEXP_CORE 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) { } + wxSpinEvent(const wxSpinEvent& event) : wxNotifyEvent(event) {} + // 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; } + + virtual wxEvent *Clone() const { return new wxSpinEvent(*this); } + +private: + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSpinEvent) }; typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&); -// 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 wxSpinEventHandler(func) \ + wxEVENT_HANDLER_CAST(wxSpinEventFunction, func) + +// 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_SPIN_UP, winid, wxSpinEventHandler(func)) +#define EVT_SPIN_DOWN(winid, func) \ + wx__DECLARE_EVT1(wxEVT_SPIN_DOWN, winid, wxSpinEventHandler(func)) +#define EVT_SPIN(winid, func) \ + wx__DECLARE_EVT1(wxEVT_SPIN, winid, wxSpinEventHandler(func)) #endif // wxUSE_SPINBTN