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

Replaced lots of ANSI/ASCII strings with their

Browse Source 
Unicode equivalents, i.e. I put wxT() arounf
    them in lots of places.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-10-29 21:48:06 +00:00
parent 0ab495989d
commit 54b25889d2
52 changed files with 554 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gtk/combobox.cpp
View File

@@ -375,8 +375,14 @@ int wxComboBox::FindString( const wxString &item )
{
GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child );
if (item == wxString(label->label,*wxConvCurrent))
#ifdef __WXGTK20__
wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
#else
wxString str( label->label );
#endif
if (item == str)
return count;
count++;
child = child->next;
}
@@ -419,7 +425,7 @@ wxString wxComboBox::GetString( int n ) const
GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child );
#ifdef __WXGTK20__
str = wxGTK_CONV_BACK( gtk_label_get_text( label) );
str = wxGTK_CONV_BACK( gtk_label_get_text(label) );
#else
str = wxString( label->label );
#endif
@@ -442,7 +448,12 @@ wxString wxComboBox::GetStringSelection() const
if (selection)
{
GtkBin *bin = GTK_BIN( selection->data );
wxString tmp = wxString(GTK_LABEL( bin->child )->label,*wxConvCurrent);
GtkLabel *label = GTK_LABEL( bin->child );
#ifdef __WXGTK20__
wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
#else
wxString tmp( label->label );
#endif
return tmp;
}