Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation errors in wxGTK wxDataViewCtrl in ANSI mode.

Browse Source 
wxGTK_CONV() macro can only be used in classes which have m_font member,
otherwise the font needs to be specified explicitly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-06-06 12:41:43 +00:00
parent 0dbe4363e4
commit d636e0437c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtk/dataview.cpp
View File

@@ -2407,7 +2407,9 @@ bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value )
{ {
GValue gvalue = { 0, }; GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_STRING ); g_value_init( &gvalue, G_TYPE_STRING );
g_value_set_string( &gvalue, wxGTK_CONV( value.GetString() ) ); g_value_set_string(&gvalue,
wxGTK_CONV_FONT(value.GetString(),
GetOwner()->GetOwner()->GetFont()));
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 );
} }
@@ -2426,7 +2428,8 @@ bool wxDataViewChoiceRenderer::GetValue( wxVariant &value ) const
GValue gvalue = { 0, }; GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_STRING ); g_value_init( &gvalue, G_TYPE_STRING );
g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue ); g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
wxString temp = wxGTK_CONV_BACK( g_value_get_string( &gvalue ) ); wxString temp = wxGTK_CONV_BACK_FONT(g_value_get_string(&gvalue),
GetOwner()->GetOwner()->GetFont());
g_value_unset( &gvalue ); g_value_unset( &gvalue );
value = temp; value = temp;