The Unicode handling fixes my app seemed to need.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-06-14 14:51:25 +00:00
parent 627fe5e8ab
commit 002f42185d
8 changed files with 26 additions and 22 deletions

View File

@@ -251,7 +251,7 @@ int wxChoice::FindString( const wxString &string ) const
wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
if (string == label->label)
if (string == wxString(label->label,*wxConv_current))
return count;
child = child->next;
@@ -304,7 +304,7 @@ wxString wxChoice::GetString( int n ) const
wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
return label->label;
return wxString(label->label,*wxConv_current);
}
child = child->next;
count++;
@@ -312,7 +312,7 @@ wxString wxChoice::GetString( int n ) const
wxFAIL_MSG( _T("wxChoice: invalid index in GetString()") );
return "";
return _T("");
}
wxString wxChoice::GetStringSelection() const
@@ -323,7 +323,7 @@ wxString wxChoice::GetStringSelection() const
wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
return label->label;
return wxString(label->label,*wxConv_current);
}
int wxChoice::Number() const