X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a12cb0a94ad8d6f0bfeb05af77977f2644b650a..c4e43bea7b24f7b7f58e3f87786490cd81abf0a7:/src/gtk1/gauge.cpp

diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp
index 45f1d7b869..a68d74215f 100644
--- a/src/gtk1/gauge.cpp
+++ b/src/gtk1/gauge.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gauge.cpp
+// Name:        src/gtk1/gauge.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,17 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "gauge.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/gauge.h"
-
 #if wxUSE_GAUGE
 
+#include "wx/gauge.h"
+
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
@@ -35,13 +31,13 @@ bool wxGauge::Create( wxWindow *parent,
                       const wxValidator& validator,
                       const wxString& name )
 {
-    m_needParent = TRUE;
+    m_needParent = true;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxGauge creation failed") );
-        return FALSE;
+        return false;
     }
 
     m_rangeMax = range;
@@ -55,12 +51,10 @@ bool wxGauge::Create( wxWindow *parent,
 
     m_parent->DoAddChild( this );
 
-    PostCreation();
-    SetBestSize(size);
-    
-    Show( TRUE );
+    PostCreation(size);
+    SetInitialSize(size);
 
-    return TRUE;
+    return true;
 }
 
 void wxGauge::DoSetGauge()
@@ -74,7 +68,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,11 +105,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);
+
 }
 
-#endif // wxUSE_GAUGE
+// static
+wxVisualAttributes
+wxGauge::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_progress_bar_new,
+                                             false, GTK_STATE_ACTIVE);
+}
 
+#endif // wxUSE_GAUGE