Another UNicode conversion fix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 6afa92e419906f44f5a69e3509f0eea3fcda6fe9..255ecb25f8f30cd0e4d1b14dd3b144f0eac1cc72 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -109,8 +109,13 @@ bool wxStaticText::Create(wxWindow *parent,
 
 wxString wxStaticText::GetLabel() const
 {
-    char *str = (char *) NULL;
-    gtk_label_get( GTK_LABEL(m_widget), &str );
+    GtkLabel *label = GTK_LABEL(m_widget);
+
+#ifdef __WXGTK20__
+    wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
+#else
+    wxString str = wxString( label->label );
+#endif
 
     return wxString(str);
 }

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index 6afa92e419906f44f5a69e3509f0eea3fcda6fe9..255ecb25f8f30cd0e4d1b14dd3b144f0eac1cc72 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -109,8 +109,13 @@ bool wxStaticText::Create(wxWindow *parent,
 
 wxString wxStaticText::GetLabel() const
 {
-    char *str = (char *) NULL;
-    gtk_label_get( GTK_LABEL(m_widget), &str );
+    GtkLabel *label = GTK_LABEL(m_widget);
+
+#ifdef __WXGTK20__
+    wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
+#else
+    wxString str = wxString( label->label );
+#endif
 
     return wxString(str);
 }