X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..77ec05d4776a5210c766fcd4b6b2c63a23b1f86a:/include/wx/msw/spinctrl.h diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h index 1034191b6d..350c6ea861 100644 --- a/include/wx/msw/spinctrl.h +++ b/include/wx/msw/spinctrl.h @@ -18,10 +18,12 @@ #include "wx/spinbutt.h" // the base class +#if wxUSE_SPINCTRL + #include "wx/dynarray.h" class WXDLLEXPORT wxSpinCtrl; -WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxSpinCtrl *, wxArraySpins); +WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins); // ---------------------------------------------------------------------------- // Under Win32, wxSpinCtrl is a wxSpinButton with a buddy (as MSDN docs call @@ -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(); } @@ -116,6 +118,8 @@ private: DECLARE_NO_COPY_CLASS(wxSpinCtrl) }; +#endif // wxUSE_SPINCTRL + #endif // _WX_MSW_SPINCTRL_H_