AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bug that showed a small gap on the wxStaticBox when the label

Browse Source 
string was empty.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2002-06-07 15:40:49 +00:00
parent 8f2a41e964
commit 0154a29737
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtk/statbox.cpp
View File

@ -58,7 +58,7 @@ bool wxStaticBox::Create( wxWindow *parent,
return FALSE; return FALSE;
} }
m_widget = gtk_frame_new(m_label.empty() ? (char *)NULL : m_label.mbc_str()); m_widget = gtk_frame_new(label.empty() ? (char *)NULL : label.mbc_str());
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );
@ -79,7 +79,7 @@ bool wxStaticBox::Create( wxWindow *parent,
if ( xalign ) if ( xalign )
gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0); gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0);
Show( TRUE ); Show( TRUE );
return TRUE; return TRUE;
@ -89,7 +89,8 @@ void wxStaticBox::SetLabel( const wxString &label )
{ {
wxControl::SetLabel( label ); wxControl::SetLabel( label );
gtk_frame_set_label( GTK_FRAME( m_widget ), GetLabel().mbc_str() ); gtk_frame_set_label( GTK_FRAME( m_widget ),
label.empty() ? (char *)NULL : label.mbc_str() );
} }
void wxStaticBox::ApplyWidgetStyle() void wxStaticBox::ApplyWidgetStyle()

7
src/gtk1/statbox.cpp
View File

@ -58,7 +58,7 @@ bool wxStaticBox::Create( wxWindow *parent,
return FALSE; return FALSE;
} }
m_widget = gtk_frame_new(m_label.empty() ? (char *)NULL : m_label.mbc_str()); m_widget = gtk_frame_new(label.empty() ? (char *)NULL : label.mbc_str());
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );
@ -79,7 +79,7 @@ bool wxStaticBox::Create( wxWindow *parent,
if ( xalign ) if ( xalign )
gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0); gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0);
Show( TRUE ); Show( TRUE );
return TRUE; return TRUE;
@ -89,7 +89,8 @@ void wxStaticBox::SetLabel( const wxString &label )
{ {
wxControl::SetLabel( label ); wxControl::SetLabel( label );
gtk_frame_set_label( GTK_FRAME( m_widget ), GetLabel().mbc_str() ); gtk_frame_set_label( GTK_FRAME( m_widget ),
label.empty() ? (char *)NULL : label.mbc_str() );
} }
void wxStaticBox::ApplyWidgetStyle() void wxStaticBox::ApplyWidgetStyle()