compilation fixes after wxGTK_CONV_BACK changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
538a0c0de2
commit
1a74f5615b
@ -1017,7 +1017,7 @@ static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
|
||||
{
|
||||
wxDataViewTextRenderer *cell = (wxDataViewTextRenderer*) user_data;
|
||||
|
||||
wxString tmp = wxGTK_CONV_BACK( arg2 );
|
||||
wxString tmp = wxGTK_CONV_BACK_FONT(arg2, cell->GetOwner()->GetOwner()->GetFont());
|
||||
wxVariant value = tmp;
|
||||
if (!cell->Validate( value ))
|
||||
return;
|
||||
@ -1075,7 +1075,8 @@ bool wxDataViewTextRenderer::GetValue( wxVariant &value ) const
|
||||
GValue gvalue = { 0, };
|
||||
g_value_init( &gvalue, G_TYPE_STRING );
|
||||
g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
|
||||
wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &gvalue ) );
|
||||
wxString tmp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ),
|
||||
wx_const_cast(wxDataViewTextRenderer*, this)->GetOwner()->GetOwner()->GetFont() );
|
||||
g_value_unset( &gvalue );
|
||||
|
||||
value = tmp;
|
||||
|
Loading…
Reference in New Issue
Block a user