missing commit

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

diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp
index f4f5e3196ca6c532df271002efa88996a2386ffc..e8710caec0ca6e3c585617881d02e7e14d83efd1 100644 (file)
--- a/src/gtk1/gauge.cpp
+++ b/src/gtk1/gauge.cpp
@@ -20,8 +20,6 @@
 // wxGauge
 //-----------------------------------------------------------------------------
 
 // wxGauge
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
-

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


@@ -52,7 +50,7 @@ bool wxGauge::Create( wxWindow *parent,
     m_parent->DoAddChild( this );
 
     PostCreation(size);
     m_parent->DoAddChild( this );
 
     PostCreation(size);

-    SetBestSize(size);
+    SetInitialSize(size);

 
     return true;
 }
 
     return true;
 }


@@ -60,7 +58,7 @@ bool wxGauge::Create( wxWindow *parent,
 void wxGauge::DoSetGauge()
 {
     wxASSERT_MSG( 0 <= m_gaugePos && m_gaugePos <= m_rangeMax,
 void wxGauge::DoSetGauge()
 {
     wxASSERT_MSG( 0 <= m_gaugePos && m_gaugePos <= m_rangeMax,

-                  _T("invalid gauge position in DoSetGauge()") );
+                  wxT("invalid gauge position in DoSetGauge()") );

 
     gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget),
                              m_rangeMax ? ((float)m_gaugePos)/m_rangeMax : 0.);
 
     gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget),
                              m_rangeMax ? ((float)m_gaugePos)/m_rangeMax : 0.);


@@ -88,7 +86,7 @@ void wxGauge::SetRange( int range )
 
 void wxGauge::SetValue( int pos )
 {
 
 void wxGauge::SetValue( int pos )
 {

-    wxCHECK_RET( pos <= m_rangeMax, _T("invalid value in wxGauge::SetValue()") );
+    wxCHECK_RET( pos <= m_rangeMax, wxT("invalid value in wxGauge::SetValue()") );

 
     m_gaugePos = pos;
 
 
     m_gaugePos = pos;