implemented wxMBConv::IsUTF8() helper for more classes so that all uses of UTF-8...

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index f896644ff664d4e324b2b13440996510e0afcad4..a10e98f85bce2f78c4b6b83d4c17298d1fb6a2ff 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -41,7 +41,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,


@@ -52,23 +52,14 @@ 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;

     }
 
     }
 

-    // 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( label1 ) );
+    m_widget = gtk_label_new(NULL);

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


@@ -77,13 +68,40 @@ bool wxStaticText::Create(wxWindow *parent,
       justify = GTK_JUSTIFY_RIGHT;
     else // wxALIGN_LEFT is 0
       justify = GTK_JUSTIFY_LEFT;
       justify = GTK_JUSTIFY_RIGHT;
     else // wxALIGN_LEFT is 0
       justify = GTK_JUSTIFY_LEFT;

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

     gtk_label_set_justify(GTK_LABEL(m_widget), justify);
 
     // 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_justify(GTK_LABEL(m_widget), justify);
 
     // 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_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 );
 
 
     m_parent->DoAddChild( this );
 


@@ -106,46 +124,72 @@ bool wxStaticText::Create(wxWindow *parent,
 
 wxString wxStaticText::GetLabel() const
 {
 
 wxString wxStaticText::GetLabel() const
 {

-    GtkLabel *label = GTK_LABEL(m_widget);
-    wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
-
-    return wxString(str);
+    // 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();

 }
 
 }
 

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

 {
 {

-    wxControl::SetLabel(label);
-    wxString label1(wxStripMenuCodes(label));
+    wxCHECK_RET( m_widget != NULL, wxT("invalid static text") );
+
+    // save the label inside m_labelOrig in case user calls GetLabel() later
+    m_labelOrig = str;

 
 

-    // Build the colorized version of the label (markup only allowed
-    // under GTK2):
-    // FIXME: Does this handle background correct? I recall bug reports - MR
-    if (m_foregroundColour.Ok())
+    wxString label(str);
+    if (gtk_check_version(2,6,0) &&
+        IsEllipsized())

     {
     {

-        // 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(),
-                          m_foregroundColour.Blue(),
-                          wxEscapeStringForPangoMarkup(label1).c_str());
-        gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
+        // 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.
+
+        label = GetEllipsizedLabelWithoutMarkup();

     }
     }

+
+    if ( HasFlag(wxST_MARKUP) )
+        GTKSetLabelWithMarkupForLabel(GTK_LABEL(m_widget), label);

     else
     else

-        gtk_label_set_text( GTK_LABEL(m_widget), wxGTK_CONV( label1 ) );
+        GTKSetLabelForLabel(GTK_LABEL(m_widget), label);

 
     // adjust the label size to the new label unless disabled
 
     // adjust the label size to the new label unless disabled

-    if (!HasFlag(wxST_NO_AUTORESIZE))
-    {
-        InvalidateBestSize();
+    if ( !HasFlag(wxST_NO_AUTORESIZE) && 
+         !IsEllipsized() )  // if ellipsize is ON, then we don't want to get resized!

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

-    }

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

+    const bool wasUnderlined = GetFont().GetUnderlined();
+

     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);
+
+        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
+        {
+            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);
+            gtk_label_set_attributes(GTK_LABEL(m_widget), attrs);
+            pango_attr_list_unref(attrs);
+        }
+    }
+

     // 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))
     {


@@ -160,6 +204,13 @@ void wxStaticText::DoSetSize(int x, int y,
                            int sizeFlags )
 {
     wxControl::DoSetSize( x, y, width, height, sizeFlags );
                            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
 }
 
 wxSize wxStaticText::DoGetBestSize() const


@@ -167,8 +218,11 @@ wxSize wxStaticText::DoGetBestSize() const
     // Do not return any arbitrary default value...
     wxASSERT_MSG( m_widget, wxT("wxStaticText::DoGetBestSize called before creation") );
 
     // Do not return any arbitrary default value...
     wxASSERT_MSG( m_widget, wxT("wxStaticText::DoGetBestSize called before creation") );
 

-    // GetBestSize is supposed to return unwrapped size
-    gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
+    // 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)
+    GTK_LABEL(m_widget)->wrap = FALSE;

 
     GtkRequisition req;
     req.width = -1;
 
     GtkRequisition req;
     req.width = -1;


@@ -176,9 +230,10 @@ wxSize wxStaticText::DoGetBestSize() const
     (* 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 );
 

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

 
 

-    return wxSize (req.width, req.height);
+    // 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)
 }
 
 bool wxStaticText::SetForegroundColour(const wxColour& colour)


@@ -190,6 +245,30 @@ bool wxStaticText::SetForegroundColour(const wxColour& colour)
     return true;
 }
 
     return true;
 }
 

+bool wxStaticText::GTKWidgetNeedsMnemonic() const
+{
+    return true;
+}
+
+void wxStaticText::GTKWidgetDoSetMnemonic(GtkWidget* w)
+{
+    gtk_label_set_mnemonic_widget(GTK_LABEL(m_widget), w);
+}
+
+
+// These functions should be used only when GTK+ < 2.6 by wxStaticTextBase::UpdateLabel()
+
+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);
+}
+

 // static
 wxVisualAttributes
 wxStaticText::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 // static
 wxVisualAttributes
 wxStaticText::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))