Bring back double border

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

diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp
index 2d8ed0c4d3f49f3abd7d6dadb181a98f85b098a4..aaa124506cabbb677509cb9c73f52c164a3d83df 100644 (file)
--- a/src/gtk/gauge.cpp
+++ b/src/gtk/gauge.cpp
@@ -1,23 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gauge.cpp
+// Name:        src/gtk/gauge.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:     wxWidgets licence
+// 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/gauge.h"
-

 #if wxUSE_GAUGE
 
 #if wxUSE_GAUGE
 

+#include "wx/gauge.h"
+

 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------


@@ -35,13 +31,11 @@ bool wxGauge::Create( wxWindow *parent,
                       const wxValidator& validator,
                       const wxString& name )
 {
                       const wxValidator& validator,
                       const wxString& name )
 {

-    m_needParent = TRUE;
-

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxGauge creation failed") );
     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;
     }
 
     m_rangeMax = range;


@@ -53,12 +47,15 @@ bool wxGauge::Create( wxWindow *parent,
                                           GTK_PROGRESS_BOTTOM_TO_TOP );
     }
 
                                           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);
     m_parent->DoAddChild( this );
 
     PostCreation(size);

-    SetBestSize(size);
-    
-    return TRUE;
+    SetInitialSize(size);
+
+    return true;

 }
 
 void wxGauge::DoSetGauge()
 }
 
 void wxGauge::DoSetGauge()


@@ -66,16 +63,19 @@ void wxGauge::DoSetGauge()
     wxASSERT_MSG( 0 <= m_gaugePos && m_gaugePos <= m_rangeMax,
                   _T("invalid gauge position in 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
 {
 }
 
 wxSize wxGauge::DoGetBestSize() const
 {

+    wxSize best;

     if (HasFlag(wxGA_VERTICAL))
     if (HasFlag(wxGA_VERTICAL))

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

     else
     else

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

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


@@ -106,10 +106,9 @@ int wxGauge::GetValue() const
     return m_gaugePos;
 }
 
     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));

 }
 
 wxVisualAttributes wxGauge::GetDefaultAttributes() const
 }
 
 wxVisualAttributes wxGauge::GetDefaultAttributes() const


@@ -130,4 +129,3 @@ wxGauge::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 }
 
 #endif // wxUSE_GAUGE
 }
 
 #endif // wxUSE_GAUGE

-