Correct a print format specifier mismatch in wxFileConfig::Parse().

[wxWidgets.git] / src / gtk1 / stattext.cpp

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index 36d2e64fd5b9d775729f0601e192274bbe14804e..e1f4fb53e1c9d1f12826df64ed261cacecb4bbdc 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -61,13 +61,8 @@ bool wxStaticText::Create(wxWindow *parent,
         return FALSE;
     }
 
         return FALSE;
     }
 

-    // the base class version which
-    // will not set the label's text to it
-    // because the label is not yet created and because SetLabel() has a side
-    // effect of changing the control size which might not be desirable
-    wxString label1(wxStripMenuCodes(label));
-    wxControl::SetLabel(label);
-    m_widget = gtk_label_new( wxGTK_CONV( label1 ) );
+    m_label = label;
+    m_widget = gtk_label_new( wxGTK_CONV( GTKRemoveMnemonics(label)) );

 
     GtkJustification justify;
     if ( style & wxALIGN_CENTER )
 
     GtkJustification justify;
     if ( style & wxALIGN_CENTER )


@@ -100,18 +95,13 @@ wxString wxStaticText::GetLabel() const
 
 void wxStaticText::SetLabel( const wxString &label )
 {
 
 void wxStaticText::SetLabel( const wxString &label )
 {

-    wxControl::SetLabel(label);
+    wxCHECK_RET( m_widget != NULL, wxT("invalid static text") );

 
 

-    wxString label1(wxStripMenuCodes(label));
-
-    gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( label1 ) );
+    GTKSetLabelForLabel(GTK_LABEL(m_widget), label);

 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))

-    {
-        InvalidateBestSize();

         SetSize( GetBestSize() );
         SetSize( GetBestSize() );

-    }

 }
 
 bool wxStaticText::SetFont( const wxFont &font )
 }
 
 bool wxStaticText::SetFont( const wxFont &font )