Fix the off-by-one a little differently, and correct a refresh problem

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

diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp
index 917ab60307f40f5fa29652abd23ba6ae9680f2bd..693dbce205f07d3c81194bc29f78c59ff081ec52 100644 (file)
--- a/src/gtk1/gauge.cpp
+++ b/src/gtk1/gauge.cpp
@@ -7,26 +7,33 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#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 <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // wxGauge
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGauge,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 
-bool wxGauge::Create( wxWindow *parent, wxWindowID id,  int range,
-    const wxPoint& pos, const wxSize& size,
-    long style, const wxValidator& validator, const wxString& name )
+bool wxGauge::Create( wxWindow *parent,
+                      wxWindowID id,
+                      int range,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      long style,
+                      const wxValidator& validator,
+                      const wxString& name )
 {
     m_needParent = TRUE;
 
@@ -38,12 +45,13 @@ bool wxGauge::Create( wxWindow *parent, wxWindowID id,  int range,
     }
 
     m_rangeMax = range;
-    m_gaugePos = 0;
-    m_useProgressBar = TRUE;
 
     m_widget = gtk_progress_bar_new();
-    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 );
+    }
 
     m_parent->DoAddChild( this );
 
@@ -54,20 +62,31 @@ bool wxGauge::Create( wxWindow *parent, wxWindowID id,  int range,
     return TRUE;
 }
 
-void wxGauge::SetRange( int r )
+void wxGauge::DoSetGauge()
 {
-    m_rangeMax = r;
-    if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
+    wxASSERT_MSG( 0 <= m_gaugePos && m_gaugePos <= m_rangeMax,
+                  _T("invalid gauge position in DoSetGauge()") );
 
-    gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax );
+    gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget),
+                             m_rangeMax ? ((float)m_gaugePos)/m_rangeMax : 0.);
+}
+
+void wxGauge::SetRange( int range )
+{
+    m_rangeMax = range;
+    if (m_gaugePos > m_rangeMax)
+        m_gaugePos = m_rangeMax;
+
+    DoSetGauge();
 }
 
 void wxGauge::SetValue( int pos )
 {
+    wxCHECK_RET( pos <= m_rangeMax, _T("invalid value in wxGauge::SetValue()") );
+
     m_gaugePos = pos;
-    if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
 
-    gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax );
+    DoSetGauge();
 }
 
 int wxGauge::GetRange() const