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

compilation fixes for ANSI mode build (closes #10518)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-02-28 15:54:04 +00:00
parent 4e916e61ea
commit 5baee1f4bf
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/dataview.cpp
View File

@@ -2048,9 +2048,12 @@ wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString &choices
m_renderer = (GtkCellRenderer*) gtk_cell_renderer_combo_new(); m_renderer = (GtkCellRenderer*) gtk_cell_renderer_combo_new();
GtkListStore *store = gtk_list_store_new( 1, G_TYPE_STRING ); GtkListStore *store = gtk_list_store_new( 1, G_TYPE_STRING );
size_t n; for (size_t n = 0; n < m_choices.GetCount(); 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 ); gtk_list_store_insert_with_values(
store, NULL, n, 0,
static_cast<const char *>(m_choices[n].utf8_str()), -1 );
}
g_object_set (m_renderer, g_object_set (m_renderer,
"model", store, "model", store,
@@ -2113,7 +2116,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_FONT( g_value_get_string( &gvalue ), const_cast<wxDataViewTextRenderer*>(this)->GetOwner()->GetOwner()->GetFont() ); wxString temp = wxGTK_CONV_BACK_FONT( g_value_get_string( &gvalue ),
const_cast<wxDataViewChoiceRenderer*>(this)->GetOwner()->GetOwner()->GetFont() );
g_value_unset( &gvalue ); g_value_unset( &gvalue );
value = temp; value = temp;
wxPrintf( "temp %s\n", temp ); wxPrintf( "temp %s\n", temp );