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

removed a couple of useless #if wxUSE_UNICODE tests

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-12-04 23:05:04 +00:00
parent 72a3ac9b55
commit 09dfa6a009
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gtk/dataview.cpp
View File

@@ -1209,11 +1209,9 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
GValue gvalue = { 0, }; GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_STRING ); g_value_init( &gvalue, G_TYPE_STRING );
#if wxUSE_UNICODE
g_value_set_string( &gvalue, wxGTK_CONV(m_label) ); // FIXME: font encoding support
#else
g_value_set_string( &gvalue, wxGTK_CONV_SYS(m_label) ); g_value_set_string( &gvalue, wxGTK_CONV_SYS(m_label) );
#endif
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 );
} }
@@ -1529,10 +1527,7 @@ void wxDataViewColumn::SetOwner( wxDataViewCtrl *owner )
GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column; GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
#if wxUSE_UNICODE
#else
gtk_tree_view_column_set_title( column, wxGTK_CONV_FONT(GetTitle(), GetOwner()->GetFont() ) ); gtk_tree_view_column_set_title( column, wxGTK_CONV_FONT(GetTitle(), GetOwner()->GetFont() ) );
#endif
} }
void wxDataViewColumn::SetTitle( const wxString &title ) void wxDataViewColumn::SetTitle( const wxString &title )
@@ -1550,14 +1545,10 @@ void wxDataViewColumn::SetTitle( const wxString &title )
m_isConnected = false; m_isConnected = false;
} }
#if wxUSE_UNICODE // FIXME: can it really happen that we don't have the owner here??
gtk_tree_view_column_set_title( column, wxGTK_CONV(title) ); wxDataViewCtrl *ctrl = GetOwner();
#else gtk_tree_view_column_set_title( column, ctrl ? wxGTK_CONV_FONT(title, ctrl->GetFont())
if (GetOwner()) : wxGTK_CONV_SYS(title) );
gtk_tree_view_column_set_title( column, wxGTK_CONV_FONT(title, GetOwner()->GetFont() ) );
else
gtk_tree_view_column_set_title( column, "" );
#endif
gtk_tree_view_column_set_widget( column, NULL ); gtk_tree_view_column_set_widget( column, NULL );
} }