1. fixed Maximise() mismatch between wxFrame and wxMDIFrame

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

diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp
index 786bdac7b0e0555fd669a5e2765e07d32ec71596..e176cbe194d8a5bbffe1a02c1c63c44a426f847a 100644 (file)
--- a/src/gtk1/gauge.cpp
+++ b/src/gtk1/gauge.cpp
@@ -2,9 +2,8 @@
 // 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
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -14,6 +13,11 @@
 
 #include "wx/gauge.h"
 
 
 #include "wx/gauge.h"
 

+#if wxUSE_GAUGE
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+

 //-----------------------------------------------------------------------------
 // wxGauge
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxGauge
 //-----------------------------------------------------------------------------


@@ -22,50 +26,61 @@ IMPLEMENT_DYNAMIC_CLASS(wxGauge,wxControl)
 
 bool wxGauge::Create( wxWindow *parent, wxWindowID id,  int range,
     const wxPoint& pos, const wxSize& size,
 
 bool wxGauge::Create( wxWindow *parent, wxWindowID id,  int range,
     const wxPoint& pos, const wxSize& size,

-    long style, const wxString& name )
+    long style, const wxValidator& validator, const wxString& name )

 {
   m_needParent = TRUE;
   
 {
   m_needParent = TRUE;
   

-  wxSize newSize = size;
-  

   PreCreation( parent, id, pos, size, style, name );
   
   PreCreation( parent, id, pos, size, style, name );
   

+#if wxUSE_VALIDATORS
+    SetValidator( validator );
+#endif
+

   m_rangeMax = range;
   m_gaugePos = 0;
   m_useProgressBar = TRUE;
   
   m_widget = gtk_progress_bar_new();
   
   m_rangeMax = range;
   m_gaugePos = 0;
   m_useProgressBar = TRUE;
   
   m_widget = gtk_progress_bar_new();
   

+  m_parent->DoAddChild( this );
+  

   PostCreation();
   
   Show( TRUE );
     
   return TRUE;
   PostCreation();
   
   Show( TRUE );
     
   return TRUE;

-};
+}

 
 void wxGauge::SetRange( int r )
 {
   m_rangeMax = r;
   if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
   
 
 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) );
-};
+  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;
   
 
 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) );
-};
+  gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax );
+}

 
 int wxGauge::GetRange(void) const
 {
   return m_rangeMax;
 
 int wxGauge::GetRange(void) const
 {
   return m_rangeMax;

-};
+}

 
 int wxGauge::GetValue(void) const
 {
   return m_gaugePos;
 
 int wxGauge::GetValue(void) const
 {
   return m_gaugePos;

-};
+}
+
+void wxGauge::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+}

 
 

+#endif