From 02c0348e97d36f9907cc59bf9c75e04ffd93f889 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Tue, 13 Aug 2002 20:37:00 +0000 Subject: [PATCH] Forgot Unicode conversion in wxStaticText. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/stattext.cpp | 4 ++-- src/gtk1/stattext.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index e574807714..6afa92e419 100644 --- a/src/gtk/stattext.cpp +++ b/src/gtk/stattext.cpp @@ -65,7 +65,7 @@ bool wxStaticText::Create(wxWindow *parent, // because the label is not yet created and because SetLabel() has a side // effect of changing the control size which might not be desirable wxControl::SetLabel(label); - m_widget = gtk_label_new( m_label.mbc_str() ); + m_widget = gtk_label_new( wxGTK_CONV( m_label ) ); GtkJustification justify; if ( style & wxALIGN_CENTER ) @@ -119,7 +119,7 @@ void wxStaticText::SetLabel( const wxString &label ) { wxControl::SetLabel(label); - gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() ); + gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) ); // adjust the label size to the new label unless disabled if (!HasFlag(wxST_NO_AUTORESIZE)) diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp index e574807714..6afa92e419 100644 --- a/src/gtk1/stattext.cpp +++ b/src/gtk1/stattext.cpp @@ -65,7 +65,7 @@ bool wxStaticText::Create(wxWindow *parent, // because the label is not yet created and because SetLabel() has a side // effect of changing the control size which might not be desirable wxControl::SetLabel(label); - m_widget = gtk_label_new( m_label.mbc_str() ); + m_widget = gtk_label_new( wxGTK_CONV( m_label ) ); GtkJustification justify; if ( style & wxALIGN_CENTER ) @@ -119,7 +119,7 @@ void wxStaticText::SetLabel( const wxString &label ) { wxControl::SetLabel(label); - gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() ); + gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) ); // adjust the label size to the new label unless disabled if (!HasFlag(wxST_NO_AUTORESIZE)) -- 2.47.2