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 f2340eaa85ec243e989dd27c0b50cd6b6986fbed..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$
@@ -7,22 +7,26 @@
 // 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/gtk1/private.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
+extern "C"
+void wxgtk_window_size_request_callback(GtkWidget *widget,
+                                        GtkRequisition *requisition,
+                                        wxWindow *win);
+
 //-----------------------------------------------------------------------------
 // wxStaticText
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl)
-
 wxStaticText::wxStaticText()
 {
 }
@@ -51,16 +55,12 @@ bool wxStaticText::Create(wxWindow *parent,
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
-        wxFAIL_MSG( wxT("wxXX creation failed") );
-       return FALSE;
+        wxFAIL_MSG( wxT("wxStaticText creation failed") );
+        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( m_label.mbc_str() );
+    m_label = label;
+    m_widget = gtk_label_new( wxGTK_CONV( GTKRemoveMnemonics(label)) );
 
     GtkJustification justify;
     if ( style & wxALIGN_CENTER )
@@ -74,55 +74,91 @@ bool wxStaticText::Create(wxWindow *parent,
     // 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);
-    
-    GtkRequisition req;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
 
-    wxSize newSize = size;
-    if (newSize.x == -1) newSize.x = req.width;
-    if (newSize.y == -1) newSize.y = req.height;
-    SetSize( newSize.x, newSize.y );
+        gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
 
     m_parent->DoAddChild( this );
 
-    PostCreation();
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
-    SetFont( parent->GetFont() );
-
-    Show( TRUE );
+    PostCreation(size);
 
     return TRUE;
 }
 
 wxString wxStaticText::GetLabel() const
 {
-    char *str = (char *) NULL;
-    gtk_label_get( GTK_LABEL(m_widget), &str );
-
+    GtkLabel *label = GTK_LABEL(m_widget);
+    wxString str = wxString( label->label );
     return wxString(str);
 }
 
 void wxStaticText::SetLabel( const wxString &label )
 {
-    wxControl::SetLabel(label);
+    wxCHECK_RET( m_widget != NULL, wxT("invalid static text") );
+
+    GTKSetLabelForLabel(GTK_LABEL(m_widget), label);
+
+    // adjust the label size to the new label unless disabled
+    if (!HasFlag(wxST_NO_AUTORESIZE))
+        SetSize( GetBestSize() );
+}
+
+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") );
 
-    gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() );
+    // This resets the internal GTK1 size calculation, which
+    // otherwise would be cashed (incorrectly)
+    gtk_label_set_pattern( GTK_LABEL(m_widget), NULL );
 
-    // adjust the label size to the new label
+    // GetBestSize is supposed to return unwrapped size
+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
 
-    // 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 );
+    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 );
 
-    SetSize( req.width, req.height );
+    return wxSize (req.width, 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;
 }
 
-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