/////////////////////////////////////////////////////////////////////////////
-// Name: gauge.cpp
+// Name: src/gtk/gauge.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "gauge.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#include "wx/gauge.h"
-
#if wxUSE_GAUGE
+#include "wx/gauge.h"
+
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
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_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_update( GTK_PROGRESS_BAR(m_widget),
- m_rangeMax ? ((float)m_gaugePos)/m_rangeMax : 0.);
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (m_widget),
+ m_rangeMax ? ((double)m_gaugePos)/m_rangeMax : 0.0);
}
wxSize wxGauge::DoGetBestSize() const
{
- return wxSize(100, 28);
+ wxSize best;
+ if (HasFlag(wxGA_VERTICAL))
+ best = wxSize(28, 100);
+ else
+ best = wxSize(100, 28);
+ CacheBestSize(best);
+ return best;
}
void wxGauge::SetRange( int range )
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