Fix compilation for GTK >= 2.6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1221,7 +1221,7 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
|
|||||||
|
|
||||||
GValue gvalue = { 0, };
|
GValue gvalue = { 0, };
|
||||||
g_value_init( &gvalue, G_TYPE_STRING );
|
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_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
|
||||||
g_value_unset( &gvalue );
|
g_value_unset( &gvalue );
|
||||||
}
|
}
|
||||||
@@ -1242,10 +1242,10 @@ bool wxDataViewProgressRenderer::SetValue( const wxVariant &value )
|
|||||||
#ifdef __WXGTK26__
|
#ifdef __WXGTK26__
|
||||||
if (!gtk_check_version(2,6,0))
|
if (!gtk_check_version(2,6,0))
|
||||||
{
|
{
|
||||||
gint tmp = (int) value;
|
gint tmp = (long) value;
|
||||||
GValue gvalue = { 0, };
|
GValue gvalue = { 0, };
|
||||||
g_value_init( &gvalue, G_TYPE_INT );
|
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_object_set_property( G_OBJECT(m_renderer), "value", &gvalue );
|
||||||
g_value_unset( &gvalue );
|
g_value_unset( &gvalue );
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user