X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/442b35b53bf95f5c6c003ea9ddbefd17adbc2a00..058f225a44d83d42ba9d773efc705badbf0e5e3c:/include/wx/univ/spinbutt.h?ds=sidebyside diff --git a/include/wx/univ/spinbutt.h b/include/wx/univ/spinbutt.h index 884618a626..aac61f9644 100644 --- a/include/wx/univ/spinbutt.h +++ b/include/wx/univ/spinbutt.h @@ -12,10 +12,6 @@ #ifndef _WX_UNIV_SPINBUTT_H_ #define _WX_UNIV_SPINBUTT_H_ -#ifdef __GNUG__ - #pragma interface "univspinbutt.h" -#endif - #include "wx/univ/scrarrow.h" // ---------------------------------------------------------------------------- @@ -26,20 +22,20 @@ #define wxACTION_SPIN_INC _T("inc") #define wxACTION_SPIN_DEC _T("dec") -class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase, +class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase, public wxControlWithArrows { public: wxSpinButton(); wxSpinButton(wxWindow *parent, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, const wxString& name = wxSPIN_BUTTON_NAME); bool Create(wxWindow *parent, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, @@ -57,27 +53,33 @@ public: virtual int GetArrowState(wxScrollArrows::Arrow arrow) const; virtual void SetArrowFlag(wxScrollArrows::Arrow arrow, int flag, bool set); virtual bool OnArrow(wxScrollArrows::Arrow arrow); - virtual wxScrollArrows::Arrow HitTest(const wxPoint& pt) const; + virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const; // for wxStdSpinButtonInputHandler const wxScrollArrows& GetArrows() { return m_arrows; } + virtual bool PerformAction(const wxControlAction& action, + long numArg = 0, + const wxString& strArg = wxEmptyString); + + static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + { + return GetStdInputHandler(handlerDef); + } + protected: virtual wxSize DoGetBestClientSize() const; virtual void DoDraw(wxControlRenderer *renderer); virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - virtual bool PerformAction(const wxControlAction& action, - long numArg = 0, - const wxString& strArg = wxEmptyString); - // the common part of all ctors void Init(); // normalize the value to fit into min..max range int NormalizeValue(int value) const; - // change the value by +1/-1 and send the event, return TRUE if value was + // change the value by +1/-1 and send the event, return true if value was // changed bool ChangeValue(int inc); @@ -102,17 +104,17 @@ private: // wxStdScrollBarInputHandler) and processes keyboard events too // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStdSpinButtonInputHandler : public wxStdInputHandler +class WXDLLIMPEXP_CORE wxStdSpinButtonInputHandler : public wxStdInputHandler { public: wxStdSpinButtonInputHandler(wxInputHandler *inphand); - virtual bool HandleKey(wxControl *control, + virtual bool HandleKey(wxInputConsumer *consumer, const wxKeyEvent& event, bool pressed); - virtual bool HandleMouse(wxControl *control, + virtual bool HandleMouse(wxInputConsumer *consumer, const wxMouseEvent& event); - virtual bool HandleMouseMove(wxControl *control, + virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event); };