X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..31ad423e4fb556ec225a63b161154d3bf3445c1b:/src/gtk/gauge.cpp diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp index 693dbce205..985c42bcc3 100644 --- a/src/gtk/gauge.cpp +++ b/src/gtk/gauge.cpp @@ -55,10 +55,9 @@ bool wxGauge::Create( wxWindow *parent, m_parent->DoAddChild( this ); - PostCreation(); - - Show( TRUE ); - + PostCreation(size); + SetBestSize(size); + return TRUE; } @@ -71,6 +70,17 @@ void wxGauge::DoSetGauge() m_rangeMax ? ((float)m_gaugePos)/m_rangeMax : 0.); } +wxSize wxGauge::DoGetBestSize() const +{ + wxSize best; + if (HasFlag(wxGA_VERTICAL)) + best = wxSize(28, 100); + else + best = wxSize(100, 28); + CacheBestSize(best); + return best; +} + void wxGauge::SetRange( int range ) { m_rangeMax = range; @@ -99,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