From: Robert Roebling Date: Wed, 1 Nov 2006 14:04:59 +0000 (+0000) Subject: Fix compilation for GTK >= 2.6 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7226118b6229659ecd6506932475a34f0a0de1e8 Fix compilation for GTK >= 2.6 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 7d4d4eafb0..e8d23aca10 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -1221,7 +1221,7 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label, GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_STRING ); - g_value_set_boolean( &gvalue, wxGTK_CONV(m_label) ); + g_value_set_string( &gvalue, wxGTK_CONV(m_label) ); g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); g_value_unset( &gvalue ); } @@ -1242,10 +1242,10 @@ bool wxDataViewProgressRenderer::SetValue( const wxVariant &value ) #ifdef __WXGTK26__ if (!gtk_check_version(2,6,0)) { - gint tmp = (int) value; + gint tmp = (long) value; GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_INT ); - g_value_set_boolean( &gvalue, tmp ); + g_value_set_int( &gvalue, tmp ); g_object_set_property( G_OBJECT(m_renderer), "value", &gvalue ); g_value_unset( &gvalue ); }