X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a0f7f3f17ebd63292117e629c01425d0c5f609f..d6a658ff0cd928953efdaf1ea56ff04b9cf281c1:/src/gtk/gauge.cpp diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp index 917ab60307..91ab64a351 100644 --- a/src/gtk/gauge.cpp +++ b/src/gtk/gauge.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gauge.cpp +// Name: src/gtk/gauge.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,67 +7,94 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "gauge.h" -#endif - -#include "wx/gauge.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_GAUGE -#include +#include "wx/gauge.h" + #include //----------------------------------------------------------------------------- // wxGauge //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxGauge,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) -bool wxGauge::Create( wxWindow *parent, wxWindowID id, int range, - const wxPoint& pos, const wxSize& size, - long style, const wxValidator& validator, const wxString& name ) +bool wxGauge::Create( wxWindow *parent, + wxWindowID id, + int range, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name ) { - m_needParent = TRUE; - if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxGauge creation failed") ); - return FALSE; + return false; } m_rangeMax = range; - m_gaugePos = 0; - m_useProgressBar = TRUE; m_widget = gtk_progress_bar_new(); - if( style & wxGA_VERTICAL) - gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget) , GTK_PROGRESS_BOTTOM_TO_TOP ); + g_object_ref(m_widget); + if ( style & wxGA_VERTICAL ) + { + gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget), + GTK_PROGRESS_BOTTOM_TO_TOP ); + } + + // when using the gauge in indeterminate mode, we need this: + gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR (m_widget), 0.05); m_parent->DoAddChild( this ); - PostCreation(); + PostCreation(size); + SetInitialSize(size); + + return true; +} + +void wxGauge::DoSetGauge() +{ + wxASSERT_MSG( 0 <= m_gaugePos && m_gaugePos <= m_rangeMax, + wxT("invalid gauge position in DoSetGauge()") ); - Show( TRUE ); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (m_widget), + m_rangeMax ? ((double)m_gaugePos)/m_rangeMax : 0.0); +} - return TRUE; +wxSize wxGauge::DoGetBestSize() const +{ + wxSize best; + if (HasFlag(wxGA_VERTICAL)) + best = wxSize(28, 100); + else + best = wxSize(100, 28); + CacheBestSize(best); + return best; } -void wxGauge::SetRange( int r ) +void wxGauge::SetRange( int range ) { - m_rangeMax = r; - if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax; + m_rangeMax = range; + if (m_gaugePos > m_rangeMax) + m_gaugePos = m_rangeMax; - gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax ); + DoSetGauge(); } void wxGauge::SetValue( int pos ) { + wxCHECK_RET( pos <= m_rangeMax, wxT("invalid value in wxGauge::SetValue()") ); + m_gaugePos = pos; - if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax; - gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax ); + DoSetGauge(); } int wxGauge::GetRange() const @@ -80,11 +107,26 @@ int wxGauge::GetValue() const return m_gaugePos; } -void wxGauge::ApplyWidgetStyle() +void wxGauge::Pulse() { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + gtk_progress_bar_pulse(GTK_PROGRESS_BAR (m_widget)); } -#endif // wxUSE_GAUGE +wxVisualAttributes wxGauge::GetDefaultAttributes() const +{ + // Visible gauge colours use a different colour state + return GetDefaultAttributesFromGTKWidget(m_widget, + UseGTKStyleBase(), + GTK_STATE_ACTIVE); +} + +// static +wxVisualAttributes +wxGauge::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_progress_bar_new, + false, GTK_STATE_ACTIVE); +} + +#endif // wxUSE_GAUGE