removed stray return from SetFont()

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

diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp
index 54360ce314f8da049eef15184831e8535c28b38b..7fb1828e14a54fa102b8218b6332e83085d11b91 100644 (file)
--- a/src/gtk/gauge.cpp
+++ b/src/gtk/gauge.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gauge.cpp
+// Name:        src/gtk/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;
@@ -53,12 +49,15 @@ bool wxGauge::Create( wxWindow *parent,
                                           GTK_PROGRESS_BOTTOM_TO_TOP );
     }
 
+    // when using the gauge in indeterminate mode, we need this:
+    gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR (m_widget), 0.05);
+
     m_parent->DoAddChild( this );
 
     PostCreation(size);
-    SetBestSize(size);
-    
-    return TRUE;
+    SetInitialSize(size);
+
+    return true;
 }
 
 void wxGauge::DoSetGauge()
@@ -66,16 +65,19 @@ void wxGauge::DoSetGauge()
     wxASSERT_MSG( 0 <= m_gaugePos && m_gaugePos <= m_rangeMax,
                   _T("invalid gauge position in DoSetGauge()") );
 
-    gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget),
-                             m_rangeMax ? ((float)m_gaugePos)/m_rangeMax : 0.);
+    gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (m_widget),
+                                   m_rangeMax ? ((double)m_gaugePos)/m_rangeMax : 0.0);
 }
 
 wxSize wxGauge::DoGetBestSize() const
 {
-    if (HasFlag(wxGA_HORIZONTAL))
-        return wxSize(100, 28);
+    wxSize best;
+    if (HasFlag(wxGA_VERTICAL))
+        best = wxSize(28, 100);
     else
-        return wxSize(28, 100);
+        best = wxSize(100, 28);
+    CacheBestSize(best);
+    return best;
 }
 
 void wxGauge::SetRange( int range )
@@ -106,11 +108,26 @@ int wxGauge::GetValue() const
     return m_gaugePos;
 }
 
-void wxGauge::ApplyWidgetStyle()
+void wxGauge::Pulse()
 {
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    gtk_progress_bar_pulse(GTK_PROGRESS_BAR (m_widget));
 }
 
-#endif // wxUSE_GAUGE
+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))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_progress_bar_new,
+                                             false, GTK_STATE_ACTIVE);
+}
+
+#endif // wxUSE_GAUGE