X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8375af8ff97a3649361b988a40b991a8cdaab09..d07f2e19181bc5caf29eb2338ce513be6fa42405:/src/gtk/gauge.cpp?ds=sidebyside diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp index aaa124506c..50b6758c9f 100644 --- a/src/gtk/gauge.cpp +++ b/src/gtk/gauge.cpp @@ -20,8 +20,6 @@ // wxGauge //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) - bool wxGauge::Create( wxWindow *parent, wxWindowID id, int range, @@ -41,10 +39,16 @@ bool wxGauge::Create( wxWindow *parent, 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 } // when using the gauge in indeterminate mode, we need this: @@ -61,7 +65,7 @@ bool wxGauge::Create( wxWindow *parent, 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); @@ -89,7 +93,7 @@ void wxGauge::SetRange( int range ) 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;