bug in menu accelerators code corrected (don't create empty accel table,

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

diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp
index 7230b92816308fb039cddc61aa59ca945b672cad..ff974edef9af2ff96b6c28b6ce8ae8a613aa4d0a 100644 (file)
--- a/src/gtk/gauge.cpp
+++ b/src/gtk/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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -13,6 +12,8 @@
 #endif
 
 #include "wx/gauge.h"
 #endif
 
 #include "wx/gauge.h"

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

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


@@ -22,24 +23,28 @@ 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;
   
   PreCreation( parent, id, pos, size, style, name );
   
 {
   m_needParent = TRUE;
   
   PreCreation( parent, id, pos, size, style, name );
   

+  SetValidator( validator );
+

   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 )
 {
 
 void wxGauge::SetRange( int r )
 {


@@ -47,7 +52,7 @@ void wxGauge::SetRange( int r )
   if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
   
   gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax );
   if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
   
   gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax );

-};
+}

 
 void wxGauge::SetValue( int pos )
 {
 
 void wxGauge::SetValue( int pos )
 {


@@ -55,15 +60,21 @@ void wxGauge::SetValue( int pos )
   if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
   
   gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax );
   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
 {
   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 );
+}