fixed Xcode 1.2 warnings; code cleanup

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

diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp
index 786bdac7b0e0555fd669a5e2765e07d32ec71596..accbf868897740be66a9be6542979a246ae99045 100644 (file)
--- a/src/gtk1/gauge.cpp
+++ b/src/gtk1/gauge.cpp
@@ -2,70 +2,117 @@
 // Name:        gauge.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// 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 <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 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;
-  
-  wxSize newSize = size;
-  
-  PreCreation( parent, id, pos, size, style, name );
-  
-  m_rangeMax = range;
-  m_gaugePos = 0;
-  m_useProgressBar = TRUE;
-  
-  m_widget = gtk_progress_bar_new();
-  
-  PostCreation();
-  
-  Show( 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;
+    }
+
+    m_rangeMax = range;
+
+    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();
+    SetBestSize(size);
     
-  return TRUE;
-};
+    Show( TRUE );
+
+    return TRUE;
+}
+
+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 r )
+wxSize wxGauge::DoGetBestSize() const
 {
-  m_rangeMax = r;
-  if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
-  
-  gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), (float)(m_rangeMax/m_gaugePos) );
-};
+    if (HasFlag(wxGA_HORIZONTAL))
+        return wxSize(100, 28);
+    else
+        return wxSize(28, 100);
+}
+
+void wxGauge::SetRange( int range )
+{
+    m_rangeMax = range;
+    if (m_gaugePos > m_rangeMax)
+        m_gaugePos = m_rangeMax;
+
+    DoSetGauge();
+}
 
 void wxGauge::SetValue( int pos )
 {
-  m_gaugePos = pos;
-  if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
-  
-  gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), (float)(m_rangeMax/m_gaugePos) );
-};
+    wxCHECK_RET( pos <= m_rangeMax, _T("invalid value in wxGauge::SetValue()") );
 
-int wxGauge::GetRange(void) const
+    m_gaugePos = pos;
+
+    DoSetGauge();
+}
+
+int wxGauge::GetRange() const
 {
-  return m_rangeMax;
-};
+    return m_rangeMax;
+}
 
-int wxGauge::GetValue(void) const
+int wxGauge::GetValue() const
 {
-  return m_gaugePos;
-};
+    return m_gaugePos;
+}
+
+void wxGauge::ApplyWidgetStyle()
+{
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );
+}
+
+#endif // wxUSE_GAUGE