Committing in .

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

diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp
index 051b70390b35aa0c261051fa08019e0214bdaa09..6cfcc74b0eac273ff3fa1467bd029bdc57a035bf 100644 (file)
--- a/src/gtk/gauge.cpp
+++ b/src/gtk/gauge.cpp
@@ -12,8 +12,11 @@
 #endif
 
 #include "wx/gauge.h"
 #endif
 
 #include "wx/gauge.h"

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

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


@@ -25,58 +28,60 @@ bool wxGauge::Create( wxWindow *parent, wxWindowID id,  int range,
     const wxPoint& pos, const wxSize& size,
     long style, const wxValidator& validator, const wxString& name )
 {
     const wxPoint& pos, const wxSize& size,
     long style, const wxValidator& validator, const wxString& name )
 {

-  m_needParent = TRUE;
-  
-  PreCreation( parent, id, pos, size, style, name );
+    m_needParent = TRUE;

   
   

-  SetValidator( validator );
+    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_rangeMax = range;
+    m_gaugePos = 0;
+    m_useProgressBar = TRUE;

   
   

-  m_widget = gtk_progress_bar_new();
+    m_widget = gtk_progress_bar_new();

   
   

-  m_parent->AddChild( this );
-
-  (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );

   
   

-  PostCreation();
+    PostCreation();

   
   

-  Show( TRUE );
+    Show( TRUE );

     
     

-  return TRUE;
+    return TRUE;

 }
 
 void wxGauge::SetRange( int r )
 {
 }
 
 void wxGauge::SetRange( int r )
 {

-  m_rangeMax = r;
-  if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
+    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 );
+    gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax );

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

-  m_gaugePos = pos;
-  if (m_gaugePos > m_rangeMax) m_gaugePos = m_rangeMax;
+    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 );
+    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()
 {
 }
 
 void wxGauge::ApplyWidgetStyle()
 {

-  SetWidgetStyle();
-  gtk_widget_set_style( m_widget, m_widgetStyle );
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );

 }
 
 }
 

+#endif