WinCE build fixes.

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index c245fd315c96c06415602ad9195a9dd8d63754fc..812a9839b2fcef9678431c0ae4dc07f431a0d0a8 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -7,10 +7,6 @@
 // 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"
 
@@ -85,8 +81,7 @@ 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);
 
-    // do not move this call elsewhere
-    gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
+        gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
 
     m_parent->DoAddChild( this );
 
@@ -132,20 +127,20 @@ void wxStaticText::SetLabel( const wxString &label )
 #ifdef __WXGTK20__
     // Build the colorized version of the label (markup only allowed
     // under GTK2):
-    wxString colorlabel = label;
-    // If the color has been set, create a markup string to pass to
-    // the label setter
     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(), label.c_str());
+                          m_foregroundColour.Blue(),
+                          wxEscapeStringForPangoMarkup(label).c_str());
+        gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
     }
-        
-    gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
-#else
-    gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
+    else
 #endif
+        gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
@@ -168,24 +163,36 @@ bool wxStaticText::SetFont( const wxFont &font )
     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") );
 
-    // this invalidates the size request
-    gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
-    gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
+#ifndef __WXGTK20__
+    // This resets the internal GTK1 size calculation, which
+    // otherwise would be cashed (incorrectly)
+    gtk_label_set_pattern( GTK_LABEL(m_widget), NULL );
+#endif
 
+    // GetBestSize is supposed to return unwrapped size
+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
+    
     GtkRequisition req;
-    req.width = 2;
-    req.height = 2;
+    req.width = -1;
+    req.height = -1;
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
         (m_widget, &req );
 
-    wxSize best(req.width, req.height);
-    CacheBestSize(best);
-    return best;
+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
+    
+    return wxSize (req.width, req.height);
 }
 
 bool wxStaticText::SetForegroundColour(const wxColour& colour)