X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..7c11806499166993dffcbb99139d5b248a2c6c82:/include/wx/msw/spinctrl.h?ds=sidebyside diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h index 677e2f181a..bd13d0e305 100644 --- a/include/wx/msw/spinctrl.h +++ b/include/wx/msw/spinctrl.h @@ -18,6 +18,8 @@ #include "wx/spinbutt.h" // the base class +#if wxUSE_SPINCTRL + #include "wx/dynarray.h" class WXDLLEXPORT wxSpinCtrl; @@ -35,7 +37,7 @@ public: wxSpinCtrl() { } wxSpinCtrl(wxWindow *parent, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -47,7 +49,7 @@ public: } bool Create(wxWindow *parent, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -72,8 +74,8 @@ public: virtual bool SetFont(const wxFont &font); virtual void SetFocus(); - virtual bool Enable(bool enable = TRUE); - virtual bool Show(bool show = TRUE); + virtual bool Enable(bool enable = true); + virtual bool Show(bool show = true); // wxSpinButton doesn't accept focus, but we do virtual bool AcceptsFocus() const { return wxWindow::AcceptsFocus(); } @@ -94,6 +96,9 @@ protected: virtual void DoMoveWindow(int x, int y, int width, int height); virtual wxSize DoGetBestSize() const; virtual void DoGetSize(int *width, int *height) const; +#if wxUSE_TOOLTIPS + virtual void DoSetToolTip( wxToolTip *tip ); +#endif // wxUSE_TOOLTIPS // the handler for wxSpinButton events void OnSpinChange(wxSpinEvent& event); @@ -116,6 +121,8 @@ private: DECLARE_NO_COPY_CLASS(wxSpinCtrl) }; +#endif // wxUSE_SPINCTRL + #endif // _WX_MSW_SPINCTRL_H_