gtk_signal_connect -> g_signal_connect in unix/mediactrl.cpp

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index f3c40c1226586bec271e23f85e1f4b3af3d1269c..f896644ff664d4e324b2b13440996510e0afcad4 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -65,13 +61,15 @@ bool wxStaticText::Create(wxWindow *parent,
         return FALSE;
     }
 
         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
     // 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);
     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;
     GtkJustification justify;
     if ( style & wxALIGN_CENTER )
       justify = GTK_JUSTIFY_CENTER;


@@ -85,29 +83,23 @@ bool wxStaticText::Create(wxWindow *parent,
     static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
     gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0);
 
     static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
     gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0);
 

-    // do not move this call elsewhere
-    gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
+        gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );

 
     m_parent->DoAddChild( this );
 
     PostCreation(size);
 
     m_parent->DoAddChild( this );
 
     PostCreation(size);

-    
+

     // the bug below only happens with GTK 2
     // 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)
     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;
 }
 
     return TRUE;
 }


@@ -115,12 +107,7 @@ bool wxStaticText::Create(wxWindow *parent,
 wxString wxStaticText::GetLabel() const
 {
     GtkLabel *label = GTK_LABEL(m_widget);
 wxString wxStaticText::GetLabel() const
 {
     GtkLabel *label = GTK_LABEL(m_widget);

-
-#ifdef __WXGTK20__

     wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
     wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );

-#else
-    wxString str = wxString( label->label );
-#endif

 
     return wxString(str);
 }
 
     return wxString(str);
 }


@@ -128,45 +115,70 @@ wxString wxStaticText::GetLabel() const
 void wxStaticText::SetLabel( const wxString &label )
 {
     wxControl::SetLabel(label);
 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):
     // Build the colorized version of the label (markup only allowed
     // under GTK2):

-    wxString colorlabel = label;
-    // If the color has been set, create a markup string to pass to
-    // the label setter
+    // FIXME: Does this handle background correct? I recall bug reports - MR

     if (m_foregroundColour.Ok())
     {
     if (m_foregroundColour.Ok())
     {

+        // If the color has been set, create a markup string to pass to
+        // the label setter
+        wxString colorlabel;

         colorlabel.Printf(_T("<span foreground=\"#%02x%02x%02x\">%s</span>"),
                           m_foregroundColour.Red(), m_foregroundColour.Green(),
         colorlabel.Printf(_T("<span foreground=\"#%02x%02x%02x\">%s</span>"),
                           m_foregroundColour.Red(), m_foregroundColour.Green(),

-                          m_foregroundColour.Blue(), label.c_str());
+                          m_foregroundColour.Blue(),
+                          wxEscapeStringForPangoMarkup(label1).c_str());
+        gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
+    }
+    else
+        gtk_label_set_text( GTK_LABEL(m_widget), wxGTK_CONV( label1 ) );
+
+    // adjust the label size to the new label unless disabled
+    if (!HasFlag(wxST_NO_AUTORESIZE))
+    {
+        InvalidateBestSize();
+        SetSize( GetBestSize() );

     }
     }

-        
-    gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
-#else
-    gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
-#endif
-    
-    PostSetLabel();

 }
 
 }
 

+bool wxStaticText::SetFont( const wxFont &font )
+{
+    bool ret = wxControl::SetFont(font);
+
+    // adjust the label size to the new label unless disabled
+    if (!HasFlag(wxST_NO_AUTORESIZE))
+    {
+        InvalidateBestSize();
+        SetSize( GetBestSize() );
+    }
+    return ret;
+}
+
+void wxStaticText::DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags )
+{
+    wxControl::DoSetSize( x, y, width, height, sizeFlags );
+}

 
 wxSize wxStaticText::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...
     wxASSERT_MSG( m_widget, wxT("wxStaticText::DoGetBestSize called before creation") );
 
 
 wxSize wxStaticText::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...
     wxASSERT_MSG( m_widget, wxT("wxStaticText::DoGetBestSize called before creation") );
 

-    // this invalidates the size request
-    gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
+    // GetBestSize is supposed to return unwrapped size

     gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
 
     GtkRequisition req;
     gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
 
     GtkRequisition req;

-    req.width = 2;
-    req.height = 2;
+    req.width = -1;
+    req.height = -1;

     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
         (m_widget, &req );
 
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
         (m_widget, &req );
 

-    return wxSize(req.width, req.height);
+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
+
+    return wxSize (req.width, req.height);

 }
 
 bool wxStaticText::SetForegroundColour(const wxColour& colour)
 }
 
 bool wxStaticText::SetForegroundColour(const wxColour& colour)