Forgot Unicode conversion in wxStaticText.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -65,7 +65,7 @@ bool wxStaticText::Create(wxWindow *parent,
|
|||||||
// because the label is not yet created and because SetLabel() has a side
|
// because the label is not yet created and because SetLabel() has a side
|
||||||
// effect of changing the control size which might not be desirable
|
// effect of changing the control size which might not be desirable
|
||||||
wxControl::SetLabel(label);
|
wxControl::SetLabel(label);
|
||||||
m_widget = gtk_label_new( m_label.mbc_str() );
|
m_widget = gtk_label_new( wxGTK_CONV( m_label ) );
|
||||||
|
|
||||||
GtkJustification justify;
|
GtkJustification justify;
|
||||||
if ( style & wxALIGN_CENTER )
|
if ( style & wxALIGN_CENTER )
|
||||||
@@ -119,7 +119,7 @@ void wxStaticText::SetLabel( const wxString &label )
|
|||||||
{
|
{
|
||||||
wxControl::SetLabel(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
|
// adjust the label size to the new label unless disabled
|
||||||
if (!HasFlag(wxST_NO_AUTORESIZE))
|
if (!HasFlag(wxST_NO_AUTORESIZE))
|
||||||
|
@@ -65,7 +65,7 @@ bool wxStaticText::Create(wxWindow *parent,
|
|||||||
// because the label is not yet created and because SetLabel() has a side
|
// because the label is not yet created and because SetLabel() has a side
|
||||||
// effect of changing the control size which might not be desirable
|
// effect of changing the control size which might not be desirable
|
||||||
wxControl::SetLabel(label);
|
wxControl::SetLabel(label);
|
||||||
m_widget = gtk_label_new( m_label.mbc_str() );
|
m_widget = gtk_label_new( wxGTK_CONV( m_label ) );
|
||||||
|
|
||||||
GtkJustification justify;
|
GtkJustification justify;
|
||||||
if ( style & wxALIGN_CENTER )
|
if ( style & wxALIGN_CENTER )
|
||||||
@@ -119,7 +119,7 @@ void wxStaticText::SetLabel( const wxString &label )
|
|||||||
{
|
{
|
||||||
wxControl::SetLabel(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
|
// adjust the label size to the new label unless disabled
|
||||||
if (!HasFlag(wxST_NO_AUTORESIZE))
|
if (!HasFlag(wxST_NO_AUTORESIZE))
|
||||||
|
Reference in New Issue
Block a user