X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a56f55c02d718e9da7574807cb01e4d2cf6a1fa..520e470fdd0daef09c77938db642e4583933c90d:/src/gtk1/gauge.cpp diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp index bd679ff044..8499339d67 100644 --- a/src/gtk1/gauge.cpp +++ b/src/gtk1/gauge.cpp @@ -20,16 +20,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxGauge,wxControl) -bool wxGauge::Create( wxWindow *parent, const wxWindowID id, const int range, +bool wxGauge::Create( wxWindow *parent, wxWindowID id, int range, const wxPoint& pos, const wxSize& size, - const long style, const wxString& name ) + long style, const wxValidator& validator, const wxString& name ) { m_needParent = TRUE; - wxSize newSize = size; - PreCreation( parent, id, pos, size, style, name ); + SetValidator( validator ); + m_rangeMax = range; m_gaugePos = 0; m_useProgressBar = TRUE; @@ -41,31 +41,31 @@ bool wxGauge::Create( wxWindow *parent, const wxWindowID id, const int range, Show( TRUE ); return TRUE; -}; +} -void wxGauge::SetRange( const int r ) +void wxGauge::SetRange( int r ) { m_rangeMax = r; if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax; - gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), (float)(m_rangeMax/m_gaugePos) ); -}; + gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax ); +} -void wxGauge::SetValue( const int pos ) +void wxGauge::SetValue( int pos ) { m_gaugePos = pos; if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax; - gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), (float)(m_rangeMax/m_gaugePos) ); -}; + gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax ); +} int wxGauge::GetRange(void) const { return m_rangeMax; -}; +} int wxGauge::GetValue(void) const { return m_gaugePos; -}; +}