X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82a5f02c861e8d57ba8255a9553b941118ad4520..6e264973e636cc41915d166cb7eddf2a7e72cf9b:/include/wx/spinbutt.h?ds=sidebyside diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h index 5df76fb0a3..52bf67cbeb 100644 --- a/include/wx/spinbutt.h +++ b/include/wx/spinbutt.h @@ -13,9 +13,9 @@ #define _WX_SPINBUTT_H_BASE_ #ifdef __GNUG__ - #ifndef __WXMOTIF__ // because there is no matching .cpp for Motif + #if !defined(__WXMOTIF__) && !defined(__WXMAC__) // because there is no matching .cpp #pragma interface "spinbutbase.h" - #endif // Motif + #endif #endif // ---------------------------------------------------------------------------- @@ -29,6 +29,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. @@ -58,6 +60,9 @@ public: m_max = maxVal; } + // is this spin button vertically oriented? + bool IsVertical() const { return (m_windowStyle & wxSP_VERTICAL) != 0; } + protected: // init the base part of the control void InitBase() @@ -75,7 +80,9 @@ protected: // 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" @@ -97,8 +104,6 @@ protected: class WXDLLEXPORT wxSpinEvent : public wxNotifyEvent { - DECLARE_DYNAMIC_CLASS(wxSpinEvent) - public: wxSpinEvent(wxEventType commandType = wxEVT_NULL, int id = 0) : wxNotifyEvent(commandType, id) @@ -108,23 +113,20 @@ public: // get the current value of the control int GetPosition() const { return m_commandInt; } void SetPosition(int pos) { m_commandInt = pos; } + +private: + DECLARE_DYNAMIC_CLASS(wxSpinEvent) }; typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&); // macros for handling spin events -#ifndef EVT_SPIN_UP #define EVT_SPIN_UP(id, func) \ - wxEventTableEntry( wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func ), -#endif -#ifndef EVT_SPIN_DOWN + DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ), #define EVT_SPIN_DOWN(id, func) \ - wxEventTableEntry( wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func ), -#endif -#ifndef EVT_SPIN + DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ), #define EVT_SPIN(id, func) \ - wxEventTableEntry( wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func ), -#endif + DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ), #endif // wxUSE_SPINBTN