Fix for the irksome, 'Details' sizing bug. Or at least a patch on a hornet's

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

diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp
index bd679ff044bde253b19036988670a650baefd7d4..917ab60307f40f5fa29652abd23ba6ae9680f2bd 100644 (file)
--- a/src/gtk/gauge.cpp
+++ b/src/gtk/gauge.cpp
@@ -2,10 +2,9 @@
 // Name:        gauge.cpp
 // Purpose:
 // Author:      Robert Roebling
 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -14,58 +13,78 @@
 
 #include "wx/gauge.h"
 
 
 #include "wx/gauge.h"
 

+#if wxUSE_GAUGE
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+

 //-----------------------------------------------------------------------------
 // wxGauge
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxGauge,wxControl)
 
 //-----------------------------------------------------------------------------
 // wxGauge
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxGauge,wxControl)
 

-bool wxGauge::Create( wxWindow *parent, const wxWindowID id,  const int range,
+bool wxGauge::Create( wxWindow *parent, wxWindowID id,  int range,

     const wxPoint& pos, const wxSize& size,
     const wxPoint& pos, const wxSize& size,

-    const long style, const wxString& name )
+    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 );
-    
-  return TRUE;
-};
-
-void wxGauge::SetRange( const int r )
+    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_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 )

 {
 {

-  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) );
-};
+    m_rangeMax = r;
+    if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;

 
 

-void wxGauge::SetValue( const int pos )
+    gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax );
+}
+
+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) );
-};
+    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 );
+}

 
 

-int wxGauge::GetRange(void) const
+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