X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..1ebd017e14fe820f790487702bf493fb0e772429:/include/wx/univ/spinbutt.h?ds=sidebyside diff --git a/include/wx/univ/spinbutt.h b/include/wx/univ/spinbutt.h index 6f2ec38af0..9be6520514 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_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univspinbutt.h" -#endif - #include "wx/univ/scrarrow.h" // ---------------------------------------------------------------------------- @@ -32,14 +28,14 @@ class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase, 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, @@ -62,22 +58,22 @@ public: // for wxStdSpinButtonInputHandler const wxScrollArrows& GetArrows() { return m_arrows; } + virtual bool PerformAction(const wxControlAction& action, + long numArg = 0, + const wxString& strArg = wxEmptyString); + 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);