X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b2e67f6724e14638eedf6c790b6ba9a42b36979..c156411a0886a4b49a0c30c36153fb3c1edd4b51:/src/gtk/stattext.cpp

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 255ecb25f8..bfca9d9409 100644
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -7,12 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "stattext.h"
 #endif
 
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_STATTEXT
 
@@ -22,6 +22,11 @@
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
+extern "C"
+void wxgtk_window_size_request_callback(GtkWidget *widget,
+                                        GtkRequisition *requisition,
+                                        wxWindow *win);
+
 //-----------------------------------------------------------------------------
 // wxStaticText
 //-----------------------------------------------------------------------------
@@ -85,24 +90,24 @@ bool wxStaticText::Create(wxWindow *parent,
 
     m_parent->DoAddChild( this );
 
-    PostCreation();
-    
-    ApplyWidgetStyle();
-
-    wxControl::SetFont( parent->GetFont() );
+    PostCreation(size);
     
-    wxSize size_best( DoGetBestSize() );
-    wxSize new_size( size );
-    if (new_size.x == -1)
-        new_size.x = size_best.x;
-    if (new_size.y == -1)
-        new_size.y = size_best.y;
-    if ((new_size.x != size.x) || (new_size.y != size.y))
-        SetSize( new_size.x, new_size.y );
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
-    Show( TRUE );
+    // 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;
 }
@@ -122,13 +127,38 @@ wxString wxStaticText::GetLabel() const
 
 void wxStaticText::SetLabel( const wxString &label )
 {
+#if 0
+    // Build the colorized version of the label
+    wxString colorlabel = label;
+    // If the color has been set, create a markup string to pass to the label setter
+    if (m_foregroundColour.Ok())
+    {
+        colorlabel.Printf(_T("<span foreground=\"#%02x%02x%02x\">%s</span>"), m_foregroundColour.Red(),
+        m_foregroundColour.Green(), m_foregroundColour.Blue(), label.c_str());
+    }
+        
     wxControl::SetLabel(label);
 
+    // markup only allowed under GTK2
+#ifdef __WXGTK20__
+    gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
+#else
+    gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
+#endif
+
+#else
+
+    wxControl::SetLabel(label);
     gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
+#endif
+
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
+    {
         SetSize( GetBestSize() );
+        SetSizeHints(GetSize());
+    }
 }
 
 bool wxStaticText::SetFont( const wxFont &font )
@@ -137,8 +167,10 @@ bool wxStaticText::SetFont( const wxFont &font )
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
+    {
         SetSize( GetBestSize() );
-    
+        SetSizeHints(GetSize());
+    }
     return ret;
 }
 
@@ -166,4 +198,20 @@ wxSize wxStaticText::DoGetBestSize() const
     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;
+}
+
+// static
+wxVisualAttributes
+wxStaticText::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_label_new);
+}
+
 #endif // wxUSE_STATTEXT