X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..d89b7c194d77ae14dcdb113ac4ffe79f5515b4ca:/src/gtk1/gauge.cpp diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp index 7fe754a52e..4c6fcb5278 100644 --- a/src/gtk1/gauge.cpp +++ b/src/gtk1/gauge.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gauge.cpp +// Name: src/gtk1/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,13 @@ bool wxGauge::Create( wxWindow *parent, const wxValidator& validator, const wxString& name ) { - m_needParent = TRUE; + 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; @@ -56,15 +52,15 @@ bool wxGauge::Create( wxWindow *parent, m_parent->DoAddChild( this ); PostCreation(size); - SetBestSize(size); - - return TRUE; + SetInitialSize(size); + + return true; } void wxGauge::DoSetGauge() { wxASSERT_MSG( 0 <= m_gaugePos && m_gaugePos <= m_rangeMax, - _T("invalid gauge position in DoSetGauge()") ); + wxT("invalid gauge position in DoSetGauge()") ); gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), m_rangeMax ? ((float)m_gaugePos)/m_rangeMax : 0.); @@ -72,10 +68,13 @@ void wxGauge::DoSetGauge() wxSize wxGauge::DoGetBestSize() const { + wxSize best; if (HasFlag(wxGA_VERTICAL)) - return wxSize(28, 100); + best = wxSize(28, 100); else - return wxSize(100, 28); + best = wxSize(100, 28); + CacheBestSize(best); + return best; } void wxGauge::SetRange( int range ) @@ -89,7 +88,7 @@ void wxGauge::SetRange( int range ) void wxGauge::SetValue( int pos ) { - wxCHECK_RET( pos <= m_rangeMax, _T("invalid value in wxGauge::SetValue()") ); + wxCHECK_RET( pos <= m_rangeMax, wxT("invalid value in wxGauge::SetValue()") ); m_gaugePos = pos; @@ -106,12 +105,6 @@ int wxGauge::GetValue() const return m_gaugePos; } -void wxGauge::ApplyWidgetStyle() -{ - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); -} - wxVisualAttributes wxGauge::GetDefaultAttributes() const { // Visible gauge colours use a different colour state @@ -130,4 +123,3 @@ wxGauge::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) } #endif // wxUSE_GAUGE -