X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abdeb9e7006488bf917d90048fcd0cbe22f44a71..8de5b24e54bd7fec2a9e2011b2402b3f33117bd7:/src/gtk1/gauge.cpp diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp index 54360ce314..90aad2ca5b 100644 --- a/src/gtk1/gauge.cpp +++ b/src/gtk1/gauge.cpp @@ -72,10 +72,10 @@ void wxGauge::DoSetGauge() wxSize wxGauge::DoGetBestSize() const { - if (HasFlag(wxGA_HORIZONTAL)) - return wxSize(100, 28); - else + if (HasFlag(wxGA_VERTICAL)) return wxSize(28, 100); + else + return wxSize(100, 28); } void wxGauge::SetRange( int range ) @@ -106,10 +106,21 @@ int wxGauge::GetValue() const return m_gaugePos; } -void wxGauge::ApplyWidgetStyle() +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)) { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + return GetDefaultAttributesFromGTKWidget(gtk_progress_bar_new, + false, GTK_STATE_ACTIVE); } #endif // wxUSE_GAUGE