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

Another UNicode conversion fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-08-17 17:35:36 +00:00
parent 94d8612744
commit 3b2e67f672
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gtk/stattext.cpp
View File

@@ -109,8 +109,13 @@ bool wxStaticText::Create(wxWindow *parent,
wxString wxStaticText::GetLabel() const wxString wxStaticText::GetLabel() const
{ {
char *str = (char *) NULL; GtkLabel *label = GTK_LABEL(m_widget);
gtk_label_get( GTK_LABEL(m_widget), &str );
#ifdef __WXGTK20__
wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
#else
wxString str = wxString( label->label );
#endif
return wxString(str); return wxString(str);
} }

9
src/gtk1/stattext.cpp
View File

@@ -109,8 +109,13 @@ bool wxStaticText::Create(wxWindow *parent,
wxString wxStaticText::GetLabel() const wxString wxStaticText::GetLabel() const
{ {
char *str = (char *) NULL; GtkLabel *label = GTK_LABEL(m_widget);
gtk_label_get( GTK_LABEL(m_widget), &str );
#ifdef __WXGTK20__
wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
#else
wxString str = wxString( label->label );
#endif
return wxString(str); return wxString(str);
} }