simplify code to return from the end of the function

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

diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp
index 25beb33bbe0b6ad440d334e1eca7a09208e73120..108a96e67bcb6c4c83a871ee34a310239987a80c 100644 (file)
--- a/src/gtk/gauge.cpp
+++ b/src/gtk/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,


@@ -31,8 +29,6 @@ bool wxGauge::Create( wxWindow *parent,
                       const wxValidator& validator,
                       const wxString& name )
 {
                       const wxValidator& validator,
                       const wxString& name )
 {

-    m_needParent = true;
-

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {


@@ -43,16 +39,25 @@ bool wxGauge::Create( wxWindow *parent,
     m_rangeMax = range;
 
     m_widget = gtk_progress_bar_new();
     m_rangeMax = range;
 
     m_widget = gtk_progress_bar_new();

+    g_object_ref(m_widget);

     if ( style & wxGA_VERTICAL )
     {
     if ( style & wxGA_VERTICAL )
     {

+#ifdef __WXGTK3__
+        gtk_orientable_set_orientation(GTK_ORIENTABLE(m_widget), GTK_ORIENTATION_VERTICAL);
+        gtk_progress_bar_set_inverted(GTK_PROGRESS_BAR(m_widget), true);
+#else

         gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget),
                                           GTK_PROGRESS_BOTTOM_TO_TOP );
         gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget),
                                           GTK_PROGRESS_BOTTOM_TO_TOP );

+#endif

     }
 
     }
 

+    // when using the gauge in indeterminate mode, we need this:
+    gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR (m_widget), 0.05);
+

     m_parent->DoAddChild( this );
 
     PostCreation(size);
     m_parent->DoAddChild( this );
 
     PostCreation(size);

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

 
     return true;
 }
 
     return true;
 }


@@ -60,7 +65,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_set_fraction (GTK_PROGRESS_BAR (m_widget),
                                    m_rangeMax ? ((double)m_gaugePos)/m_rangeMax : 0.0);
 
     gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (m_widget),
                                    m_rangeMax ? ((double)m_gaugePos)/m_rangeMax : 0.0);


@@ -88,7 +93,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;
 


@@ -105,6 +110,11 @@ int wxGauge::GetValue() const
     return m_gaugePos;
 }
 
     return m_gaugePos;
 }
 

+void wxGauge::Pulse()
+{
+    gtk_progress_bar_pulse(GTK_PROGRESS_BAR (m_widget));
+}
+

 wxVisualAttributes wxGauge::GetDefaultAttributes() const
 {
     // Visible gauge colours use a different colour state
 wxVisualAttributes wxGauge::GetDefaultAttributes() const
 {
     // Visible gauge colours use a different colour state


@@ -118,7 +128,7 @@ wxVisualAttributes wxGauge::GetDefaultAttributes() const
 wxVisualAttributes
 wxGauge::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
 wxVisualAttributes
 wxGauge::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {

-    return GetDefaultAttributesFromGTKWidget(gtk_progress_bar_new,
+    return GetDefaultAttributesFromGTKWidget(gtk_progress_bar_new(),

                                              false, GTK_STATE_ACTIVE);
 }
 
                                              false, GTK_STATE_ACTIVE);
 }