X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..d2ce59e9bb71dbe7a01d96ec3df158e626aaa145:/include/wx/generic/spinctlg.h diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h index 1175f102d0..9d4f63f7fe 100644 --- a/include/wx/generic/spinctlg.h +++ b/include/wx/generic/spinctlg.h @@ -20,14 +20,10 @@ // without tons of #ifdefs. // ---------------------------------------------------------------------------- -#if wxUSE_SPINBTN +#if wxUSE_SPINBTN -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma interface "spinctlg.h" -#endif - -class WXDLLEXPORT wxSpinButton; -class WXDLLEXPORT wxTextCtrl; +class WXDLLIMPEXP_FWD_CORE wxSpinButton; +class WXDLLIMPEXP_FWD_CORE wxTextCtrl; // ---------------------------------------------------------------------------- // wxSpinCtrl is a combination of wxTextCtrl and wxSpinButton @@ -39,7 +35,7 @@ public: wxSpinCtrl() { Init(); } wxSpinCtrl(wxWindow *parent, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -52,7 +48,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, @@ -66,6 +62,7 @@ public: void SetValue(int val); void SetValue(const wxString& text); void SetRange(int min, int max); + void SetSelection(long from, long to); // accessors int GetValue() const; @@ -75,8 +72,8 @@ public: // implementation from now on // forward these functions to all subcontrols - virtual bool Enable(bool enable = TRUE); - virtual bool Show(bool show = TRUE); + virtual bool Enable(bool enable = true); + virtual bool Show(bool show = true); // get the subcontrols wxTextCtrl *GetText() const { return m_text; } @@ -86,7 +83,7 @@ public: void SetTextValue(int val); // put the numeric value of the string in the text ctrl into val and return - // TRUE or return FALSE if the text ctrl doesn't contain a number or if the + // true or return false if the text ctrl doesn't contain a number or if the // number is out of range bool GetTextValue(int *val) const; @@ -102,7 +99,7 @@ private: // the subcontrols wxTextCtrl *m_text; wxSpinButton *m_btn; - + private: DECLARE_DYNAMIC_CLASS(wxSpinCtrl) }; @@ -121,7 +118,7 @@ public: wxSpinCtrl() { Init(); } wxSpinCtrl(wxWindow *parent, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -133,7 +130,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,