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

fix to not show ampersands in the static box title (needed after the previous change)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-07-23 14:09:32 +00:00
parent ba0abe3c71
commit fa2540e305
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/statbox.cpp
View File

@@ -58,14 +58,14 @@ bool wxStaticBox::Create( wxWindow *parent,
return FALSE; 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 ); m_parent->DoAddChild( this );
PostCreation(); PostCreation();
SetLabel(label);
InheritAttributes(); InheritAttributes();
// need to set non default alignment? // need to set non default alignment?
@@ -90,7 +90,7 @@ void wxStaticBox::SetLabel( const wxString &label )
wxControl::SetLabel( label ); wxControl::SetLabel( label );
gtk_frame_set_label( GTK_FRAME( m_widget ), 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() void wxStaticBox::ApplyWidgetStyle()

8
src/gtk1/statbox.cpp
View File

@@ -58,14 +58,14 @@ bool wxStaticBox::Create( wxWindow *parent,
return FALSE; 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 ); m_parent->DoAddChild( this );
PostCreation(); PostCreation();
SetLabel(label);
InheritAttributes(); InheritAttributes();
// need to set non default alignment? // need to set non default alignment?
@@ -90,7 +90,7 @@ void wxStaticBox::SetLabel( const wxString &label )
wxControl::SetLabel( label ); wxControl::SetLabel( label );
gtk_frame_set_label( GTK_FRAME( m_widget ), 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() void wxStaticBox::ApplyWidgetStyle()