X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abdeb9e7006488bf917d90048fcd0cbe22f44a71..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/gtk1/gauge.cpp diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp index 54360ce314..985c42bcc3 100644 --- a/src/gtk1/gauge.cpp +++ b/src/gtk1/gauge.cpp @@ -72,10 +72,13 @@ void wxGauge::DoSetGauge() 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,10 +109,21 @@ int wxGauge::GetValue() const return m_gaugePos; } -void wxGauge::ApplyWidgetStyle() +wxVisualAttributes wxGauge::GetDefaultAttributes() const { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + // 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