/////////////////////////////////////////////////////////////////////////////
-// Name: gauge.cpp
+// Name: src/gtk/gauge.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// 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
-#include <gdk/gdk.h>
+#include "wx/gauge.h"
+
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// wxGauge
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxGauge,wxControl)
+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;
+ m_needParent = true;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxGauge creation failed") );
- return FALSE;
+ return false;
}
m_rangeMax = range;
- m_gaugePos = 0;
- m_useProgressBar = TRUE;
m_widget = gtk_progress_bar_new();
- if( style & wxGA_VERTICAL)
- gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget) , GTK_PROGRESS_BOTTOM_TO_TOP );
+ if ( style & wxGA_VERTICAL )
+ {
+ gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget),
+ GTK_PROGRESS_BOTTOM_TO_TOP );
+ }
m_parent->DoAddChild( this );
- PostCreation();
+ PostCreation(size);
+ SetBestSize(size);
- Show( TRUE );
+ return true;
+}
- return TRUE;
+void wxGauge::DoSetGauge()
+{
+ wxASSERT_MSG( 0 <= m_gaugePos && m_gaugePos <= m_rangeMax,
+ _T("invalid gauge position in DoSetGauge()") );
+
+ 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;
+ wxSize best;
+ if (HasFlag(wxGA_VERTICAL))
+ best = wxSize(28, 100);
+ else
+ best = wxSize(100, 28);
+ CacheBestSize(best);
+ return best;
+}
- gtk_progress_bar_update( GTK_PROGRESS_BAR(m_widget), ((float)m_gaugePos)/m_rangeMax );
+void wxGauge::SetRange( int range )
+{
+ m_rangeMax = range;
+ if (m_gaugePos > m_rangeMax)
+ m_gaugePos = m_rangeMax;
+
+ DoSetGauge();
}
void wxGauge::SetValue( int pos )
{
+ wxCHECK_RET( pos <= m_rangeMax, _T("invalid value in wxGauge::SetValue()") );
+
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 );
+ DoSetGauge();
}
int wxGauge::GetRange() const
return m_gaugePos;
}
-void wxGauge::ApplyWidgetStyle()
+wxVisualAttributes wxGauge::GetDefaultAttributes() const
{
- SetWidgetStyle();
- gtk_widget_set_style( m_widget, m_widgetStyle );
+ // Visible gauge colours use a different colour state
+ return GetDefaultAttributesFromGTKWidget(m_widget,
+ UseGTKStyleBase(),
+ GTK_STATE_ACTIVE);
+
}
-#endif // wxUSE_GAUGE
+// static
+wxVisualAttributes
+wxGauge::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ return GetDefaultAttributesFromGTKWidget(gtk_progress_bar_new,
+ false, GTK_STATE_ACTIVE);
+}
+#endif // wxUSE_GAUGE