Misc validity fixes to samples/xrc/rc/*.xrc.

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

diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp
index e176cbe194d8a5bbffe1a02c1c63c44a426f847a..7c8c1c9cd4d41f4afd84cabdc60804bacf2c7f50 100644 (file)
--- a/src/gtk/gauge.cpp
+++ b/src/gtk/gauge.cpp
@@ -1,86 +1,134 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gauge.cpp
+// Name:        src/gtk/gauge.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "gauge.h"
-#endif
-
-#include "wx/gauge.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_GAUGE
 
 
 #if wxUSE_GAUGE
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/gauge.h"
+
+#include <gtk/gtk.h>

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

-IMPLEMENT_DYNAMIC_CLASS(wxGauge,wxControl)
-
-bool wxGauge::Create( wxWindow *parent, wxWindowID id,  int range,
-    const wxPoint& pos, const wxSize& size,
-    long style, const wxValidator& validator, const wxString& name )
+bool wxGauge::Create( wxWindow *parent,
+                      wxWindowID id,
+                      int range,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      long style,
+                      const wxValidator& validator,
+                      const wxString& name )

 {
 {

-  m_needParent = TRUE;
-  
-  PreCreation( parent, id, pos, size, style, name );
-  
-#if wxUSE_VALIDATORS
-    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_widget = gtk_progress_bar_new();
+    g_object_ref(m_widget);
+    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 );

 #endif
 #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);
+    SetInitialSize(size);
+
+    return true;
+}
+
+void wxGauge::DoSetGauge()
+{
+    wxASSERT_MSG( 0 <= m_gaugePos && m_gaugePos <= m_rangeMax,
+                  wxT("invalid gauge position in DoSetGauge()") );

 
 

-  m_rangeMax = range;
-  m_gaugePos = 0;
-  m_useProgressBar = TRUE;
-  
-  m_widget = gtk_progress_bar_new();
-  
-  m_parent->DoAddChild( this );
-  
-  PostCreation();
-  
-  Show( TRUE );
-    
-  return TRUE;
+    gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (m_widget),
+                                   m_rangeMax ? ((double)m_gaugePos)/m_rangeMax : 0.0);

 }
 
 }
 

-void wxGauge::SetRange( int r )
+wxSize wxGauge::DoGetBestSize() const

 {
 {

-  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 );
+    wxSize best;
+    if (HasFlag(wxGA_VERTICAL))
+        best = wxSize(28, 100);
+    else
+        best = wxSize(100, 28);
+    CacheBestSize(best);
+    return best;
+}
+
+void wxGauge::SetRange( int range )
+{
+    m_rangeMax = range;
+    if (m_gaugePos > m_rangeMax)
+        m_gaugePos = m_rangeMax;
+
+    DoSetGauge();

 }
 
 void wxGauge::SetValue( int pos )
 {
 }
 
 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_gaugePos)/m_rangeMax );
+    wxCHECK_RET( pos <= m_rangeMax, wxT("invalid value in wxGauge::SetValue()") );
+
+    m_gaugePos = pos;
+
+    DoSetGauge();

 }
 
 }
 

-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::Pulse()

 {
 {

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

 }
 
 }
 

-#endif
+wxVisualAttributes wxGauge::GetDefaultAttributes() const
+{
+    // Visible gauge colours use a different colour state
+    return GetDefaultAttributesFromGTKWidget(m_widget,
+                                             UseGTKStyleBase(),
+                                             GTK_STATE_ACTIVE);
+
+}
+
+// static
+wxVisualAttributes
+wxGauge::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_progress_bar_new(),
+                                             false, GTK_STATE_ACTIVE);
+}
+
+#endif // wxUSE_GAUGE