Applied colspan corrections, #15274 and #15275 (dghart)

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

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index da7039c8edec6fee3a1d34a99d51ef44d039d535..d3b0f138f0c36fb7c22f37168fa9de39103aec96 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -7,17 +7,13 @@
 // 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"
 
 #if wxUSE_STATTEXT
 
 #include "wx/stattext.h"
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #if wxUSE_STATTEXT
 
 #include "wx/stattext.h"

-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"

 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"


@@ -31,8 +27,6 @@ void wxgtk_window_size_request_callback(GtkWidget *widget,
 // wxStaticText
 //-----------------------------------------------------------------------------
 
 // wxStaticText
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl)
-

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


@@ -65,13 +59,9 @@ 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
-    // effect of changing the control size which might not be desirable
-    wxControl::SetLabel(label);
-    m_widget = gtk_label_new( wxGTK_CONV( m_label ) );
-    
+    m_label = label;
+    m_widget = gtk_label_new( wxGTK_CONV( GTKRemoveMnemonics(label)) );
+

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


@@ -85,31 +75,11 @@ 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);
 

-    if (size.x == -1)
-        gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
-    else

         gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
 
     m_parent->DoAddChild( this );
 
     PostCreation(size);
         gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
 
     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
-        );
-    }
-#endif // __WXGTK20__

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -117,44 +87,19 @@ 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 ) );
-#else

     wxString str = wxString( label->label );
     wxString str = wxString( label->label );

-#endif
-

     return wxString(str);
 }
 
 void wxStaticText::SetLabel( const wxString &label )
 {
     return wxString(str);
 }
 
 void wxStaticText::SetLabel( const wxString &label )
 {

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

 
 

-#ifdef __WXGTK20__
-    // Build the colorized version of the label (markup only allowed
-    // under GTK2):
-    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(),
-                          m_foregroundColour.Blue(),
-                          wxEscapeStringForPangoMarkup(label).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 ) );
+    GTKSetLabelForLabel(GTK_LABEL(m_widget), label);

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

-    }

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


@@ -182,19 +127,21 @@ 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") );
 

-    int width = m_width;
-#ifndef __WXGTK20__
+    // This resets the internal GTK1 size calculation, which
+    // otherwise would be cashed (incorrectly)

     gtk_label_set_pattern( GTK_LABEL(m_widget), NULL );
     gtk_label_set_pattern( GTK_LABEL(m_widget), NULL );

-    if (width < 3) width = -1;
-#endif
-    gtk_widget_set_usize( m_widget, width, -1 );
-    
+
+    // 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;
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
         (m_widget, &req );
 
     GtkRequisition req;
     req.width = -1;
     req.height = -1;
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
         (m_widget, &req );
 

+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
+

     return wxSize (req.width, req.height);
 }
 
     return wxSize (req.width, req.height);
 }