X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dcaf11a7b5189be78e52e1412febd7689a959f8..88594d02eb59a55ac85d3210a49d02918124617b:/src/gtk/gauge.cpp diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp index 35d9ad6f37..917ab60307 100644 --- a/src/gtk/gauge.cpp +++ b/src/gtk/gauge.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -15,8 +15,8 @@ #if wxUSE_GAUGE -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // wxGauge @@ -29,26 +29,28 @@ bool wxGauge::Create( wxWindow *parent, wxWindowID id, int range, long style, const wxValidator& validator, const wxString& name ) { m_needParent = TRUE; - + if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { - wxFAIL_MSG( _T("wxGauge creation failed") ); - return FALSE; + wxFAIL_MSG( wxT("wxGauge creation failed") ); + 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 ); + m_parent->DoAddChild( this ); - + PostCreation(); - + Show( TRUE ); - + return TRUE; } @@ -56,7 +58,7 @@ void wxGauge::SetRange( int r ) { 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 ); } @@ -64,7 +66,7 @@ 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 ); } @@ -84,4 +86,5 @@ void wxGauge::ApplyWidgetStyle() gtk_widget_set_style( m_widget, m_widgetStyle ); } -#endif +#endif // wxUSE_GAUGE +