From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 9 Mar 2007 00:43:16 +0000 (+0000)
Subject: compilation fixes after wxGTK_CONV_BACK changes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1a74f5615bf096911fa26bd19cd879e7ed94e697

compilation fixes after wxGTK_CONV_BACK changes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index f814a661f6..9f9af8b90a 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -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;