multilib mode

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

diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp
index 35d9ad6f378f4afb743e0addb9c281468ae6fcc8..f180206c79e4f136fa745f4fada77190f5958dbe 100644 (file)
--- a/src/gtk/gauge.cpp
+++ b/src/gtk/gauge.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -15,57 +15,75 @@
 
 #if wxUSE_GAUGE
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.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;
-  
+
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
-        wxFAIL_MSG( _T("wxGauge creation failed") );
-       return FALSE;
+        wxFAIL_MSG( wxT("wxGauge creation failed") );
+        return FALSE;
     }
 
     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 );
+    }
+
     m_parent->DoAddChild( this );
-  
+
     PostCreation();
-  
+
     Show( TRUE );
-    
+
     return TRUE;
 }
 
-void wxGauge::SetRange( int r )
+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.);
+}
+
+void wxGauge::SetRange( int range )
 {
-    m_rangeMax = r;
-    if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
-  
-    gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax );
+    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
@@ -84,4 +102,5 @@ void wxGauge::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
-#endif
+#endif // wxUSE_GAUGE
+