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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 22c946136c3f19457f3f844811d774dcb219e9c5..3884e299b71b2f562c16932110f229e3c5207081 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -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 );
 
     PostCreation();
 
 
     m_parent->DoAddChild( this );
 
     PostCreation();
 

-    SetLabel(label);
-

     InheritAttributes();
 
     // need to set non default alignment?
     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 ),
     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()
 }
 
 void wxStaticBox::ApplyWidgetStyle()

diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp
index 22c946136c3f19457f3f844811d774dcb219e9c5..3884e299b71b2f562c16932110f229e3c5207081 100644 (file)
--- a/src/gtk1/statbox.cpp
+++ b/src/gtk1/statbox.cpp
@@ -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 );
 
     PostCreation();
 
 
     m_parent->DoAddChild( this );
 
     PostCreation();
 

-    SetLabel(label);
-

     InheritAttributes();
 
     // need to set non default alignment?
     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 ),
     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()
 }
 
 void wxStaticBox::ApplyWidgetStyle()