X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f8845289521c7f53e95b6dfd8275daab8b05639..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/gtk/gauge.cpp diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp index 985c42bcc3..aaa124506c 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,17 +7,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "gauge.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/gauge.h" - #if wxUSE_GAUGE +#include "wx/gauge.h" + #include //----------------------------------------------------------------------------- @@ -35,13 +31,11 @@ bool wxGauge::Create( wxWindow *parent, 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; @@ -53,12 +47,15 @@ bool wxGauge::Create( wxWindow *parent, 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(size); - SetBestSize(size); - - return TRUE; + SetInitialSize(size); + + return true; } void wxGauge::DoSetGauge() @@ -66,8 +63,8 @@ void wxGauge::DoSetGauge() wxASSERT_MSG( 0 <= m_gaugePos && m_gaugePos <= m_rangeMax, _T("invalid gauge position in DoSetGauge()") ); - gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), - m_rangeMax ? ((float)m_gaugePos)/m_rangeMax : 0.); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (m_widget), + m_rangeMax ? ((double)m_gaugePos)/m_rangeMax : 0.0); } wxSize wxGauge::DoGetBestSize() const @@ -109,6 +106,11 @@ int wxGauge::GetValue() const return m_gaugePos; } +void wxGauge::Pulse() +{ + gtk_progress_bar_pulse(GTK_PROGRESS_BAR (m_widget)); +} + wxVisualAttributes wxGauge::GetDefaultAttributes() const { // Visible gauge colours use a different colour state @@ -127,4 +129,3 @@ wxGauge::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) } #endif // wxUSE_GAUGE -