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 194fb3da086e2044c8c1b2dbd270160426efd3d6..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$


@@ -7,22 +7,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#ifdef __GNUG__
-    #pragma implementation "stattext.h"
-#endif
+#if wxUSE_STATTEXT

 
 #include "wx/stattext.h"
 
 
 #include "wx/stattext.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
+#include "wx/gtk/private.h"

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

-IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl)
-

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


@@ -35,7 +33,7 @@ wxStaticText::wxStaticText(wxWindow *parent,
                            long style,
                            const wxString &name)
 {
                            long style,
                            const wxString &name)
 {

-  Create( parent, id, label, pos, size, style, name );
+    Create( parent, id, label, pos, size, style, name );

 }
 
 bool wxStaticText::Create(wxWindow *parent,
 }
 
 bool wxStaticText::Create(wxWindow *parent,


@@ -46,82 +44,211 @@ bool wxStaticText::Create(wxWindow *parent,
                           long style,
                           const wxString &name )
 {
                           long style,
                           const wxString &name )
 {

-    m_needParent = TRUE;
-
-    wxSize newSize = size;
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxStaticText creation failed") );
+        return false;
+    }

 
 

-    PreCreation( parent, id, pos, size, style, name );
-
-    // 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
-    // effect of changing the control size which might not be desirable
-    wxControl::SetLabel(label);
-    m_widget = gtk_label_new( m_label.mbc_str() );
+    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;
       justify = GTK_JUSTIFY_LEFT;

+
+    if (GetLayoutDirection() == wxLayout_RightToLeft)
+    {
+        if (justify == GTK_JUSTIFY_RIGHT)
+            justify = GTK_JUSTIFY_LEFT;
+        else if (justify == GTK_JUSTIFY_LEFT)
+            justify = GTK_JUSTIFY_RIGHT;
+    }
+

     gtk_label_set_justify(GTK_LABEL(m_widget), justify);
 
     gtk_label_set_justify(GTK_LABEL(m_widget), justify);
 

-#if GTK_MINOR_VERSION == 2
+    // 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_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);

-#endif // GTK 1.2.x
-    
-    GtkRequisition req;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );

 
 

-    if (newSize.x == -1) newSize.x = req.width;
-    if (newSize.y == -1) newSize.y = req.height;
+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );

 
 

-    SetSize( newSize.x, newSize.y );
+    SetLabel(label);

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

-    PostCreation();
+    PostCreation(size);
+
+    return true;
+}
+
+void wxStaticText::GTKDoSetLabel(GTKLabelSetter setter, const wxString& label)
+{
+    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& label)
+{
+    m_labelOrig = label;
+
+    GTKDoSetLabel(&wxStaticText::GTKSetLabelForLabel, label);
+}
+
+#if wxUSE_MARKUP
+
+bool wxStaticText::DoSetLabelMarkup(const wxString& markup)
+{
+    const wxString stripped = RemoveMarkup(markup);
+    if ( stripped.empty() && !markup.empty() )
+        return false;

 
 

-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
-    SetFont( parent->GetFont() );
+    m_labelOrig = stripped;

 
 

-    Show( TRUE );
+    GTKDoSetLabel(&wxStaticText::GTKSetLabelWithMarkupForLabel, markup);

 
 

-    return TRUE;
+    return true;
+}
+
+#endif // wxUSE_MARKUP
+
+bool wxStaticText::SetFont( const wxFont &font )
+{
+    const bool wasUnderlined = GetFont().GetUnderlined();
+    const bool wasStrickenThrough = GetFont().GetStrikethrough();
+
+    bool ret = wxControl::SetFont(font);
+
+    const bool isUnderlined = GetFont().GetUnderlined();
+    const bool isStrickenThrough = GetFont().GetStrikethrough();
+
+    if ( (isUnderlined != wasUnderlined) ||
+            (isStrickenThrough != wasStrickenThrough) )
+    {
+        // We need to update the Pango attributes used for the text.
+        if ( isUnderlined || isStrickenThrough )
+        {
+            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);
+        }
+        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))
+    {
+        SetSize( GetBestSize() );
+    }
+    return ret;

 }
 
 }
 

-wxString wxStaticText::GetLabel(void) const
+wxSize wxStaticText::DoGetBestSize() const

 {
 {

-    char *str = (char *) NULL;
-    gtk_label_get( GTK_LABEL(m_widget), &str );
+    // Do not return any arbitrary default value...
+    wxASSERT_MSG( m_widget, wxT("wxStaticText::DoGetBestSize called before creation") );
+
+    // GetBestSize is supposed to return unwrapped size but calling
+    // 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;
+#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
+#endif

 
 

-    return wxString(str);
+    // Adding 1 to width to workaround GTK sometimes wrapping the text needlessly
+    size.x++;
+    CacheBestSize(size);
+    return size;

 }
 
 }
 

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

 {
 {

-    wxControl::SetLabel(label);
+    return true;
+}

 
 

-    gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() );
+void wxStaticText::GTKWidgetDoSetMnemonic(GtkWidget* w)
+{
+    gtk_label_set_mnemonic_widget(GTK_LABEL(m_widget), w);
+}

 
 

-    // adjust the label size to the new label

 
 

-    // TODO there should be a way to prevent SetLabel() from doing it (an
-    //      additional parameter?)
-    GtkRequisition req;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+// These functions should be used only when GTK+ < 2.6 by wxStaticTextBase::UpdateLabel()

 
 

-    SetSize( req.width, req.height );
+wxString wxStaticText::DoGetLabel() const
+{
+    GtkLabel *label = GTK_LABEL(m_widget);
+    return wxGTK_CONV_BACK( gtk_label_get_text( label ) );
+}
+
+void wxStaticText::DoSetLabel(const wxString& str)
+{
+    GTKSetLabelForLabel(GTK_LABEL(m_widget), str);

 }
 
 }
 

-void wxStaticText::ApplyWidgetStyle()
+// static
+wxVisualAttributes
+wxStaticText::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    return GetDefaultAttributesFromGTKWidget(gtk_label_new);

 }
 
 }
 

+#endif // wxUSE_STATTEXT