guard against errors like in wxStringBase::AllocBeforeWrite code (1123226)

[wxWidgets.git] / src / gtk1 / gauge.cpp

diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp
index 54360ce314f8da049eef15184831e8535c28b38b..985c42bcc3dcd148f6cb3ca79fd30fcf38773eea 100644 (file)
--- a/src/gtk1/gauge.cpp
+++ b/src/gtk1/gauge.cpp
@@ -72,10 +72,13 @@ void wxGauge::DoSetGauge()
 
 wxSize wxGauge::DoGetBestSize() const
 {
 
 wxSize wxGauge::DoGetBestSize() const
 {

-    if (HasFlag(wxGA_HORIZONTAL))
-        return wxSize(100, 28);
+    wxSize best;
+    if (HasFlag(wxGA_VERTICAL))
+        best = wxSize(28, 100);

     else
     else

-        return wxSize(28, 100);
+        best = wxSize(100, 28);
+    CacheBestSize(best);
+    return best;

 }
 
 void wxGauge::SetRange( int range )
 }
 
 void wxGauge::SetRange( int range )


@@ -106,10 +109,21 @@ int wxGauge::GetValue() const
     return m_gaugePos;
 }
 
     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
 }
 
 #endif // wxUSE_GAUGE