AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unicode fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven 1999-04-29 17:19:09 +00:00
parent f899db6d37
commit 53b88b545e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/combobox.cpp
View File

@ -326,7 +326,7 @@ int wxComboBox::FindString( const wxString &item )
{ {
GtkBin *bin = GTK_BIN( child->data ); GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child ); GtkLabel *label = GTK_LABEL( bin->child );
if (item == label->label) if (item == wxString(label->label,*wxConvCurrent))
return count; return count;
count++; count++;
child = child->next; child = child->next;
@ -371,7 +371,7 @@ wxString wxComboBox::GetString( int n ) const
{ {
GtkBin *bin = GTK_BIN( child->data ); GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child ); GtkLabel *label = GTK_LABEL( bin->child );
str = label->label; str = wxString(label->label,*wxConvCurrent);
} }
else else
{ {
@ -391,7 +391,7 @@ wxString wxComboBox::GetStringSelection() const
if (selection) if (selection)
{ {
GtkBin *bin = GTK_BIN( selection->data ); GtkBin *bin = GTK_BIN( selection->data );
wxString tmp = GTK_LABEL( bin->child )->label; wxString tmp = wxString(GTK_LABEL( bin->child )->label,*wxConvCurrent);
return tmp; return tmp;
} }
@ -432,7 +432,7 @@ void wxComboBox::SetStringSelection( const wxString &string )
wxString wxComboBox::GetValue() const wxString wxComboBox::GetValue() const
{ {
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
wxString tmp = gtk_entry_get_text( GTK_ENTRY(entry) ); wxString tmp = wxString(gtk_entry_get_text( GTK_ENTRY(entry) ),*wxConvCurrent);
return tmp; return tmp;
} }

8
src/gtk1/combobox.cpp
View File

@ -326,7 +326,7 @@ int wxComboBox::FindString( const wxString &item )
{ {
GtkBin *bin = GTK_BIN( child->data ); GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child ); GtkLabel *label = GTK_LABEL( bin->child );
if (item == label->label) if (item == wxString(label->label,*wxConvCurrent))
return count; return count;
count++; count++;
child = child->next; child = child->next;
@ -371,7 +371,7 @@ wxString wxComboBox::GetString( int n ) const
{ {
GtkBin *bin = GTK_BIN( child->data ); GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child ); GtkLabel *label = GTK_LABEL( bin->child );
str = label->label; str = wxString(label->label,*wxConvCurrent);
} }
else else
{ {
@ -391,7 +391,7 @@ wxString wxComboBox::GetStringSelection() const
if (selection) if (selection)
{ {
GtkBin *bin = GTK_BIN( selection->data ); GtkBin *bin = GTK_BIN( selection->data );
wxString tmp = GTK_LABEL( bin->child )->label; wxString tmp = wxString(GTK_LABEL( bin->child )->label,*wxConvCurrent);
return tmp; return tmp;
} }
@ -432,7 +432,7 @@ void wxComboBox::SetStringSelection( const wxString &string )
wxString wxComboBox::GetValue() const wxString wxComboBox::GetValue() const
{ {
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
wxString tmp = gtk_entry_get_text( GTK_ENTRY(entry) ); wxString tmp = wxString(gtk_entry_get_text( GTK_ENTRY(entry) ),*wxConvCurrent);
return tmp; return tmp;
} }