X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..4850cc8b2e1037cd394806db4ddcf73868588a4c:/include/wx/generic/spinctlg.h diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h index 89a0501f0d..d01f8ba5bc 100644 --- a/include/wx/generic/spinctlg.h +++ b/include/wx/generic/spinctlg.h @@ -80,7 +80,7 @@ public: // forward these functions to all subcontrols virtual bool Enable(bool enable = true); virtual bool Show(bool show = true); - virtual bool Reparent(wxWindow *newParent); + virtual bool Reparent(wxWindowBase *newParent); // get the subcontrols wxTextCtrl *GetText() const { return m_textCtrl; } @@ -247,10 +247,10 @@ public: } // accessors - int GetValue(wxSPINCTRL_GETVALUE_FIX) const { return int(DoGetValue() + 0.5); } - int GetMin() const { return int(m_min + 0.5); } - int GetMax() const { return int(m_max + 0.5); } - int GetIncrement() const { return int(m_increment + 0.5); } + int GetValue(wxSPINCTRL_GETVALUE_FIX) const { return wxRound( DoGetValue() ); } + int GetMin() const { return wxRound( m_min ); } + int GetMax() const { return wxRound( m_max ); } + int GetIncrement() const { return wxRound( m_increment ); } // operations void SetValue(const wxString& value) { wxSpinCtrlGenericBase::SetValue(value); } // visibility problem w/ gcc