X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a12cb0a94ad8d6f0bfeb05af77977f2644b650a..35bbb0c66bef7bfc43f28ceeac04be41d1ac9efe:/src/gtk/gauge.cpp diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp index 45f1d7b869..985c42bcc3 100644 --- a/src/gtk/gauge.cpp +++ b/src/gtk/gauge.cpp @@ -55,11 +55,9 @@ bool wxGauge::Create( wxWindow *parent, m_parent->DoAddChild( this ); - PostCreation(); + PostCreation(size); SetBestSize(size); - Show( TRUE ); - return TRUE; } @@ -74,7 +72,13 @@ void wxGauge::DoSetGauge() wxSize wxGauge::DoGetBestSize() const { - return wxSize(100, 28); + wxSize best; + if (HasFlag(wxGA_VERTICAL)) + best = wxSize(28, 100); + else + best = wxSize(100, 28); + CacheBestSize(best); + return best; } void wxGauge::SetRange( int range ) @@ -105,10 +109,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