Fix deprecating warning introduced in r72446.

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index c60fcf3f114b77b8553f0d5cd515e87d3697bb6f..4bffc1fa0481c4957b26a1bb1273febaea7206ed 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        stattext.cpp
+// Name:        src/gtk/stattext.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -13,22 +13,14 @@
 #if wxUSE_STATTEXT
 
 #include "wx/stattext.h"
 #if wxUSE_STATTEXT
 
 #include "wx/stattext.h"

-#include "wx/gtk/private.h"
-
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"

 
 

-extern "C"
-void wxgtk_window_size_request_callback(GtkWidget *widget,
-                                        GtkRequisition *requisition,
-                                        wxWindow *win);
+#include <gtk/gtk.h>
+#include "wx/gtk/private.h"

 
 //-----------------------------------------------------------------------------
 // wxStaticText
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxStaticText
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl)
-

 wxStaticText::wxStaticText()
 {
 }
 wxStaticText::wxStaticText()
 {
 }


@@ -52,169 +44,153 @@ bool wxStaticText::Create(wxWindow *parent,
                           long style,
                           const wxString &name )
 {
                           long style,
                           const wxString &name )
 {

-    m_needParent = TRUE;
-

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxStaticText creation failed") );
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxStaticText creation failed") );

-        return FALSE;
+        return false;

     }
 
     m_widget = gtk_label_new(NULL);
     }
 
     m_widget = gtk_label_new(NULL);

+    g_object_ref(m_widget);

 
     GtkJustification justify;
 
     GtkJustification justify;

-    if ( style & wxALIGN_CENTER )
+    if ( style & wxALIGN_CENTER_HORIZONTAL )

       justify = GTK_JUSTIFY_CENTER;
     else if ( style & wxALIGN_RIGHT )
       justify = GTK_JUSTIFY_RIGHT;
       justify = GTK_JUSTIFY_CENTER;
     else if ( style & wxALIGN_RIGHT )
       justify = GTK_JUSTIFY_RIGHT;

-    else // wxALIGN_LEFT is 0
+    else

       justify = GTK_JUSTIFY_LEFT;
 
     if (GetLayoutDirection() == wxLayout_RightToLeft)
     {
       justify = GTK_JUSTIFY_LEFT;
 
     if (GetLayoutDirection() == wxLayout_RightToLeft)
     {

-         if (justify == GTK_JUSTIFY_RIGHT)
+        if (justify == GTK_JUSTIFY_RIGHT)

             justify = GTK_JUSTIFY_LEFT;
             justify = GTK_JUSTIFY_LEFT;

-         if (justify == GTK_JUSTIFY_LEFT)
+        else if (justify == GTK_JUSTIFY_LEFT)

             justify = GTK_JUSTIFY_RIGHT;
     }
 
     gtk_label_set_justify(GTK_LABEL(m_widget), justify);
 
             justify = GTK_JUSTIFY_RIGHT;
     }
 
     gtk_label_set_justify(GTK_LABEL(m_widget), justify);
 

+    // set ellipsize mode
+    PangoEllipsizeMode ellipsizeMode = PANGO_ELLIPSIZE_NONE;
+    if ( style & wxST_ELLIPSIZE_START )
+        ellipsizeMode = PANGO_ELLIPSIZE_START;
+    else if ( style & wxST_ELLIPSIZE_MIDDLE )
+        ellipsizeMode = PANGO_ELLIPSIZE_MIDDLE;
+    else if ( style & wxST_ELLIPSIZE_END )
+        ellipsizeMode = PANGO_ELLIPSIZE_END;
+
+    gtk_label_set_ellipsize( GTK_LABEL(m_widget), ellipsizeMode );
+

     // GTK_JUSTIFY_LEFT is 0, RIGHT 1 and CENTER 2
     static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
     gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0);
 
     gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
 
     // GTK_JUSTIFY_LEFT is 0, RIGHT 1 and CENTER 2
     static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
     gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0);
 
     gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
 

-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
-    {
-        // set ellipsize mode
-        PangoEllipsizeMode ellipsizeMode = PANGO_ELLIPSIZE_NONE;
-        if ( style & wxST_ELLIPSIZE_START )
-            ellipsizeMode = PANGO_ELLIPSIZE_START;
-        else if ( style & wxST_ELLIPSIZE_MIDDLE )
-            ellipsizeMode = PANGO_ELLIPSIZE_MIDDLE;
-        else if ( style & wxST_ELLIPSIZE_END )
-            ellipsizeMode = PANGO_ELLIPSIZE_END;
-
-        gtk_label_set_ellipsize( GTK_LABEL(m_widget), ellipsizeMode );
-    }
-#endif // __WXGTK26__
-

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

-    // the bug below only happens with GTK 2
-    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)
-        g_signal_handlers_disconnect_by_func (m_widget,
-                                              (gpointer) wxgtk_window_size_request_callback,
-                                              this);
-    }
-
-    return TRUE;
+    return true;

 }
 
 }
 

-wxString wxStaticText::GetLabel() const
+void wxStaticText::GTKDoSetLabel(GTKLabelSetter setter, const wxString& label)

 {
 {

-    // we need to return the label just like it was passed to the last call
-    // to SetLabel(): i.e. with wx-style mnemonics and with markup
-    return wxControl::GetLabel();
+    wxCHECK_RET( m_widget != NULL, wxT("invalid static text") );
+
+    InvalidateBestSize();
+
+    (this->*setter)(GTK_LABEL(m_widget), label);
+
+    // adjust the label size to the new label unless disabled
+    if ( !HasFlag(wxST_NO_AUTORESIZE) &&
+         !IsEllipsized() )  // if ellipsization is ON, then we don't want to get resized!
+        SetSize( GetBestSize() );

 }
 
 }
 

-void wxStaticText::SetLabel( const wxString& str )
+void wxStaticText::SetLabel(const wxString& label)

 {
 {

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

 
 

-    // save the label inside m_labelOrig in case user calls GetLabel() later
-    m_labelOrig = str;
+    GTKDoSetLabel(&wxStaticText::GTKSetLabelForLabel, label);
+}

 
 

-    wxString label(str);
-    if (gtk_check_version(2,6,0) &&
-        IsEllipsized())
-    {
-        // GTK+ < 2.6 does not support ellipsization:
-        // since we need to use our generic code for ellipsization (which does not
-        // behaves well in conjunction with markup; i.e. it may break the markup
-        // validity erasing portions of the string), we also need to strip out
-        // the markup (if present) from the label.
+#if wxUSE_MARKUP

 
 

-        label = GetEllipsizedLabelWithoutMarkup();
-    }
+bool wxStaticText::DoSetLabelMarkup(const wxString& markup)
+{
+    const wxString stripped = RemoveMarkup(markup);
+    if ( stripped.empty() && !markup.empty() )
+        return false;

 
 

-    if ( HasFlag(wxST_MARKUP) )
-        GTKSetLabelWithMarkupForLabel(GTK_LABEL(m_widget), label);
-    else
-        GTKSetLabelForLabel(GTK_LABEL(m_widget), label);
+    m_labelOrig = stripped;

 
 

-    // adjust the label size to the new label unless disabled
-    if ( !HasFlag(wxST_NO_AUTORESIZE) && 
-         !IsEllipsized() )  // if ellipsize is ON, then we don't want to get resized!
-        SetSize( GetBestSize() );
+    GTKDoSetLabel(&wxStaticText::GTKSetLabelWithMarkupForLabel, markup);
+
+    return true;

 }
 
 }
 

+#endif // wxUSE_MARKUP
+

 bool wxStaticText::SetFont( const wxFont &font )
 {
     const bool wasUnderlined = GetFont().GetUnderlined();
 bool wxStaticText::SetFont( const wxFont &font )
 {
     const bool wasUnderlined = GetFont().GetUnderlined();

+    const bool wasStrickenThrough = GetFont().GetStrikethrough();

 
     bool ret = wxControl::SetFont(font);
 
 
     bool ret = wxControl::SetFont(font);
 

-    if ( font.GetUnderlined() != wasUnderlined )
-    {
-        // the underlines for mnemonics are incompatible with using attributes
-        // so turn them off when setting underlined font and restore them when
-        // unsetting it
-        gtk_label_set_use_underline(GTK_LABEL(m_widget), wasUnderlined);
+    const bool isUnderlined = GetFont().GetUnderlined();
+    const bool isStrickenThrough = GetFont().GetStrikethrough();

 
 

-        if ( wasUnderlined )
-        {
-            // it's not underlined any more, remove the attributes we set
-            gtk_label_set_attributes(GTK_LABEL(m_widget), NULL);
-        }
-        else // the text is underlined now
+    if ( (isUnderlined != wasUnderlined) ||
+            (isStrickenThrough != wasStrickenThrough) )
+    {
+        // We need to update the Pango attributes used for the text.
+        if ( isUnderlined || isStrickenThrough )

         {
         {

-            PangoAttrList *attrs = pango_attr_list_new();
-            PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
-            a->start_index = 0;
-            a->end_index = (guint)-1;
-            pango_attr_list_insert(attrs, a);
+            PangoAttrList* const attrs = pango_attr_list_new();
+            if ( isUnderlined )
+            {
+                PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
+                a->start_index = 0;
+                a->end_index = (guint)-1;
+                pango_attr_list_insert(attrs, a);
+            }
+
+            if ( isStrickenThrough )
+            {
+                PangoAttribute *a = pango_attr_strikethrough_new( TRUE );
+                a->start_index = 0;
+                a->end_index = (guint) -1;
+                pango_attr_list_insert(attrs, a);
+            }
+

             gtk_label_set_attributes(GTK_LABEL(m_widget), attrs);
             pango_attr_list_unref(attrs);
         }
             gtk_label_set_attributes(GTK_LABEL(m_widget), attrs);
             pango_attr_list_unref(attrs);
         }

+        else // No special attributes any more.
+        {
+            // Just remove any attributes we had set.
+            gtk_label_set_attributes(GTK_LABEL(m_widget), NULL);
+        }
+
+        // The underlines for mnemonics are incompatible with using attributes
+        // so turn them off when setting underlined font.
+        gtk_label_set_use_underline(GTK_LABEL(m_widget), !isUnderlined);

     }
 
     // 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() );
     }
     return ret;
 }
 
         SetSize( GetBestSize() );
     }
     return ret;
 }
 

-void wxStaticText::DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags )
-{
-    wxControl::DoSetSize( x, y, width, height, sizeFlags );
-
-    if (gtk_check_version(2,6,0))
-    {
-        // GTK+ < 2.6 does not support ellipsization - we need to run our
-        // generic code (actually it will be run only if IsEllipsized() == true)
-        UpdateLabel();
-    }
-}
-

 wxSize wxStaticText::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...
 wxSize wxStaticText::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...


@@ -224,27 +200,24 @@ wxSize wxStaticText::DoGetBestSize() const
     // gtk_label_set_line_wrap() from here is a bad idea as it queues another
     // size request by calling gtk_widget_queue_resize() and we end up in
     // infinite loop sometimes (notably when the control is in a toolbar)
     // gtk_label_set_line_wrap() from here is a bad idea as it queues another
     // size request by calling gtk_widget_queue_resize() and we end up in
     // infinite loop sometimes (notably when the control is in a toolbar)

+    // With GTK3 however, there is no simple alternative, and the sizing loop
+    // no longer seems to occur.
+#ifdef __WXGTK3__
+    gtk_label_set_line_wrap(GTK_LABEL(m_widget), false);
+#else

     GTK_LABEL(m_widget)->wrap = FALSE;
     GTK_LABEL(m_widget)->wrap = FALSE;

-
-    GtkRequisition req;
-    req.width = -1;
-    req.height = -1;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
-        (m_widget, &req );
-
+#endif
+    wxSize size = wxStaticTextBase::DoGetBestSize();
+#ifdef __WXGTK3__
+    gtk_label_set_line_wrap(GTK_LABEL(m_widget), true);
+#else

     GTK_LABEL(m_widget)->wrap = TRUE; // restore old value
     GTK_LABEL(m_widget)->wrap = TRUE; // restore old value

+#endif

 
     // Adding 1 to width to workaround GTK sometimes wrapping the text needlessly
 
     // Adding 1 to width to workaround GTK sometimes wrapping the text needlessly

-    return wxSize (req.width+1, req.height);
-}
-
-bool wxStaticText::SetForegroundColour(const wxColour& colour)
-{
-    // First, we call the base class member
-    wxControl::SetForegroundColour(colour);
-    // Then, to force the color change, we set the label with the current label
-    SetLabel(GetLabel());
-    return true;
+    size.x++;
+    CacheBestSize(size);
+    return size;

 }
 
 bool wxStaticText::GTKWidgetNeedsMnemonic() const
 }
 
 bool wxStaticText::GTKWidgetNeedsMnemonic() const