Fix compile errors when using gtk 1.2

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 53fe9f98e51c13b3dc644c3e178e07e108e92f2c..bfca9d94098307711b5d5af34b21e81cdbd2f816 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -7,12 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "stattext.h"
 #endif
 
     #pragma implementation "stattext.h"
 #endif
 

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

 
 #if wxUSE_STATTEXT
 
 
 #if wxUSE_STATTEXT
 


@@ -90,7 +90,7 @@ bool wxStaticText::Create(wxWindow *parent,
 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 

-    PostCreation();
+    PostCreation(size);

     
     // the bug below only happens with GTK 2
 #ifdef __WXGTK20__
     
     // the bug below only happens with GTK 2
 #ifdef __WXGTK20__


@@ -109,23 +109,6 @@ bool wxStaticText::Create(wxWindow *parent,
     }
 #endif // __WXGTK20__
 
     }
 #endif // __WXGTK20__
 

-    ApplyWidgetStyle();
-
-    wxControl::SetFont( parent->GetFont() );
-    
-    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 );
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -144,13 +127,38 @@ wxString wxStaticText::GetLabel() const
 
 void wxStaticText::SetLabel( const wxString &label )
 {
 
 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);
 
     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 ) );
     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))
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))

+    {

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

+        SetSizeHints(GetSize());
+    }

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


@@ -159,8 +167,10 @@ bool wxStaticText::SetFont( const wxFont &font )
 
     // 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))

+    {

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

-    
+        SetSizeHints(GetSize());
+    }

     return ret;
 }
 
     return ret;
 }
 


@@ -188,4 +198,20 @@ wxSize wxStaticText::DoGetBestSize() const
     return wxSize(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;
+}
+
+// static
+wxVisualAttributes
+wxStaticText::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_label_new);
+}
+

 #endif // wxUSE_STATTEXT
 #endif // wxUSE_STATTEXT