Allow user code to override key events in generic wxListCtrl.

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

diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp
index dcff39dc237f42ec63d100ae5982359fc622e18b..91ab64a35170686a6754dd664194b1ab4654e2f6 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$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,10 +10,10 @@
 // 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>
 
 //-----------------------------------------------------------------------------


@@ -31,39 +31,41 @@ 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_widget = gtk_progress_bar_new();
     }
 
     m_rangeMax = range;
 
     m_widget = gtk_progress_bar_new();

+    g_object_ref(m_widget);

     if ( style & wxGA_VERTICAL )
     {
         gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget),
                                           GTK_PROGRESS_BOTTOM_TO_TOP );
     }
 
     if ( style & wxGA_VERTICAL )
     {
         gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget),
                                           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);
+    SetInitialSize(size);

 
 

-    return TRUE;
+    return true;

 }
 
 void wxGauge::DoSetGauge()
 {
     wxASSERT_MSG( 0 <= m_gaugePos && m_gaugePos <= m_rangeMax,
 }
 
 void wxGauge::DoSetGauge()
 {
     wxASSERT_MSG( 0 <= m_gaugePos && m_gaugePos <= m_rangeMax,

-                  _T("invalid gauge position in DoSetGauge()") );
+                  wxT("invalid gauge position in DoSetGauge()") );

 
     gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (m_widget),
 
     gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (m_widget),

-                                   m_rangeMax ? ((float)m_gaugePos)/m_rangeMax : 0.);
+                                   m_rangeMax ? ((double)m_gaugePos)/m_rangeMax : 0.0);

 }
 
 wxSize wxGauge::DoGetBestSize() const
 }
 
 wxSize wxGauge::DoGetBestSize() const


@@ -88,7 +90,7 @@ void wxGauge::SetRange( int range )
 
 void wxGauge::SetValue( int pos )
 {
 
 void wxGauge::SetValue( int pos )
 {

-    wxCHECK_RET( pos <= m_rangeMax, _T("invalid value in wxGauge::SetValue()") );
+    wxCHECK_RET( pos <= m_rangeMax, wxT("invalid value in wxGauge::SetValue()") );

 
     m_gaugePos = pos;
 
 
     m_gaugePos = pos;
 


@@ -105,6 +107,11 @@ int wxGauge::GetValue() const
     return m_gaugePos;
 }
 
     return m_gaugePos;
 }
 

+void wxGauge::Pulse()
+{
+    gtk_progress_bar_pulse(GTK_PROGRESS_BAR (m_widget));
+}
+

 wxVisualAttributes wxGauge::GetDefaultAttributes() const
 {
     // Visible gauge colours use a different colour state
 wxVisualAttributes wxGauge::GetDefaultAttributes() const
 {
     // Visible gauge colours use a different colour state


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

-