X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d522606d0a1dfd22bcdc1a386b3dca01fa985e3..01c54165d1182cc74d8e5d43cdb1985902af0b2f:/src/gtk/gauge.cpp diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp index b6cd78c4c5..dcff39dc23 100644 --- a/src/gtk/gauge.cpp +++ b/src/gtk/gauge.cpp @@ -7,10 +7,6 @@ // 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" @@ -57,7 +53,7 @@ bool wxGauge::Create( wxWindow *parent, PostCreation(size); SetBestSize(size); - + return TRUE; } @@ -66,16 +62,19 @@ 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 ? ((float)m_gaugePos)/m_rangeMax : 0.); } wxSize wxGauge::DoGetBestSize() const { - if (HasFlag(wxGA_HORIZONTAL)) - return wxSize(100, 28); + wxSize best; + if (HasFlag(wxGA_VERTICAL)) + best = wxSize(28, 100); else - return wxSize(28, 100); + best = wxSize(100, 28); + CacheBestSize(best); + return best; } void wxGauge::SetRange( int range ) @@ -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