GTK2: gtk_label_set -> gtk_label_set_text

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 316d7b2888d71537b857c62b3b85fc1085cbcedb..0d7e3dd1d8a076c86eb18ccd67d989687157966f 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "stattext.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -65,13 +61,15 @@ bool wxStaticText::Create(wxWindow *parent,
         return FALSE;
     }
 
-    // notice that we call the base class version which will just remove the
-    // '&' characters from the string, but not set the label's text to it
-    // because the label is not yet created and because SetLabel() has a side
+    // notice that we call the base class version which will
+    // not set the label's text to it because the label is no
+    // yet created and because SetLabel() has a side
     // effect of changing the control size which might not be desirable
+    // wxContro::SetLabel no longer strips menu codes, so do it here.
+    wxString label1(wxStripMenuCodes(label));
     wxControl::SetLabel(label);
-    m_widget = gtk_label_new( wxGTK_CONV( m_label ) );
-    
+    m_widget = gtk_label_new( wxGTK_CONV( label1 ) );
+
     GtkJustification justify;
     if ( style & wxALIGN_CENTER )
       justify = GTK_JUSTIFY_CENTER;
@@ -90,23 +88,18 @@ bool wxStaticText::Create(wxWindow *parent,
     m_parent->DoAddChild( this );
 
     PostCreation(size);
-    
+
     // the bug below only happens with GTK 2
-#ifdef __WXGTK20__
     if ( justify != GTK_JUSTIFY_LEFT )
     {
         // if we let GTK call wxgtk_window_size_request_callback the label
         // always shrinks to its minimal size for some reason and so no
         // alignment except the default left doesn't work (in fact it does,
         // but you don't see it)
-        gtk_signal_disconnect_by_func
-        (
-            GTK_OBJECT(m_widget),
-            GTK_SIGNAL_FUNC(wxgtk_window_size_request_callback),
-            (gpointer) this
-        );
+        g_signal_handlers_disconnect_by_func (m_widget,
+                                              (gpointer) wxgtk_window_size_request_callback,
+                                              this);
     }
-#endif // __WXGTK20__
 
     return TRUE;
 }
@@ -114,12 +107,7 @@ bool wxStaticText::Create(wxWindow *parent,
 wxString wxStaticText::GetLabel() const
 {
     GtkLabel *label = GTK_LABEL(m_widget);
-
-#ifdef __WXGTK20__
     wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
-#else
-    wxString str = wxString( label->label );
-#endif
 
     return wxString(str);
 }
@@ -127,8 +115,8 @@ wxString wxStaticText::GetLabel() const
 void wxStaticText::SetLabel( const wxString &label )
 {
     wxControl::SetLabel(label);
+    wxString label1(wxStripMenuCodes(label));
 
-#ifdef __WXGTK20__
     // Build the colorized version of the label (markup only allowed
     // under GTK2):
     if (m_foregroundColour.Ok())
@@ -139,12 +127,11 @@ void wxStaticText::SetLabel( const wxString &label )
         colorlabel.Printf(_T("<span foreground=\"#%02x%02x%02x\">%s</span>"),
                           m_foregroundColour.Red(), m_foregroundColour.Green(),
                           m_foregroundColour.Blue(),
-                          wxEscapeStringForPangoMarkup(label).c_str());
+                          wxEscapeStringForPangoMarkup(label1).c_str());
         gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
     }
     else
-#endif
-        gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
+        gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( label1 ) );
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
@@ -179,15 +166,9 @@ wxSize wxStaticText::DoGetBestSize() const
     // Do not return any arbitrary default value...
     wxASSERT_MSG( m_widget, wxT("wxStaticText::DoGetBestSize called before creation") );
 
-#ifndef __WXGTK20__
-    // This resets the internal GTK1 size calculation, which
-    // otherwise would be cashed (incorrectly)
-    gtk_label_set_pattern( GTK_LABEL(m_widget), NULL );
-#endif
-
     // GetBestSize is supposed to return unwrapped size
     gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
-    
+
     GtkRequisition req;
     req.width = -1;
     req.height = -1;
@@ -195,7 +176,7 @@ wxSize wxStaticText::DoGetBestSize() const
         (m_widget, &req );
 
     gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
-    
+
     return wxSize (req.width, req.height);
 }