From 5baee1f4bf16307c3ed9fa2779f974dfd57d72d1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 28 Feb 2009 15:54:04 +0000 Subject: [PATCH] compilation fixes for ANSI mode build (closes #10518) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/dataview.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 6119d49234..4e7fc719a4 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -2048,9 +2048,12 @@ wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString &choices m_renderer = (GtkCellRenderer*) gtk_cell_renderer_combo_new(); GtkListStore *store = gtk_list_store_new( 1, G_TYPE_STRING ); - size_t n; - for (n = 0; n < m_choices.GetCount(); n++) - gtk_list_store_insert_with_values( store, NULL, n, 0, m_choices[n].utf8_str(), -1 ); + for (size_t n = 0; n < m_choices.GetCount(); n++) + { + gtk_list_store_insert_with_values( + store, NULL, n, 0, + static_cast(m_choices[n].utf8_str()), -1 ); + } g_object_set (m_renderer, "model", store, @@ -2113,7 +2116,8 @@ bool wxDataViewChoiceRenderer::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 temp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), const_cast(this)->GetOwner()->GetOwner()->GetFont() ); + wxString temp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ), + const_cast(this)->GetOwner()->GetOwner()->GetFont() ); g_value_unset( &gvalue ); value = temp; wxPrintf( "temp %s\n", temp ); -- 2.45.2