From fa2540e3053924525d7656fe106ee6bf4941ca41 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 23 Jul 2002 14:09:32 +0000 Subject: [PATCH] fix to not show ampersands in the static box title (needed after the previous change) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/statbox.cpp | 8 ++++---- src/gtk1/statbox.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp index 22c946136c..3884e299b7 100644 --- a/src/gtk/statbox.cpp +++ b/src/gtk/statbox.cpp @@ -58,14 +58,14 @@ bool wxStaticBox::Create( wxWindow *parent, return FALSE; } - m_widget = gtk_frame_new(label.empty() ? (char *)NULL : label.mbc_str()); + wxControl::SetLabel(label); + + m_widget = gtk_frame_new(m_label.empty() ? (char *)NULL : m_label.mbc_str()); m_parent->DoAddChild( this ); PostCreation(); - SetLabel(label); - InheritAttributes(); // need to set non default alignment? @@ -90,7 +90,7 @@ void wxStaticBox::SetLabel( const wxString &label ) wxControl::SetLabel( label ); gtk_frame_set_label( GTK_FRAME( m_widget ), - label.empty() ? (char *)NULL : label.mbc_str() ); + m_label.empty() ? (char *)NULL : m_label.mbc_str() ); } void wxStaticBox::ApplyWidgetStyle() diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp index 22c946136c..3884e299b7 100644 --- a/src/gtk1/statbox.cpp +++ b/src/gtk1/statbox.cpp @@ -58,14 +58,14 @@ bool wxStaticBox::Create( wxWindow *parent, return FALSE; } - m_widget = gtk_frame_new(label.empty() ? (char *)NULL : label.mbc_str()); + wxControl::SetLabel(label); + + m_widget = gtk_frame_new(m_label.empty() ? (char *)NULL : m_label.mbc_str()); m_parent->DoAddChild( this ); PostCreation(); - SetLabel(label); - InheritAttributes(); // need to set non default alignment? @@ -90,7 +90,7 @@ void wxStaticBox::SetLabel( const wxString &label ) wxControl::SetLabel( label ); gtk_frame_set_label( GTK_FRAME( m_widget ), - label.empty() ? (char *)NULL : label.mbc_str() ); + m_label.empty() ? (char *)NULL : m_label.mbc_str() ); } void wxStaticBox::ApplyWidgetStyle() -- 2.45.2