Realize remap code cleanup

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 1849d21f5d3375ae3b032ef85ffc5325f476d609..812a9839b2fcef9678431c0ae4dc07f431a0d0a8 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -7,10 +7,6 @@
 // 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"
 
 // 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);
 
     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 );
 
 
     m_parent->DoAddChild( this );
 


@@ -132,26 +127,26 @@ void wxStaticText::SetLabel( const wxString &label )
 #ifdef __WXGTK20__
     // Build the colorized version of the label (markup only allowed
     // under GTK2):
 #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 (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(),
         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
 #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))
     {
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
     {

+        InvalidateBestSize();

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

-        SetSizeHints(GetSize());

     }
 }
 
     }
 }
 


@@ -162,16 +157,17 @@ 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))
     {

+        InvalidateBestSize();

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

-        SetSizeHints(GetSize());

     }
     return ret;
 }
 
     }
     return ret;
 }
 

-void wxStaticText::ApplyWidgetStyle()
+void wxStaticText::DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags )

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    wxControl::DoSetSize( x, y, width, height, sizeFlags );

 }
 
 wxSize wxStaticText::DoGetBestSize() const
 }
 
 wxSize wxStaticText::DoGetBestSize() const


@@ -179,17 +175,24 @@ 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") );
 

-    // 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;
     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 );
 
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
         (m_widget, &req );
 

-    return wxSize(req.width, req.height);
+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
+    
+    return wxSize (req.width, req.height);

 }
 
 bool wxStaticText::SetForegroundColour(const wxColour& colour)
 }
 
 bool wxStaticText::SetForegroundColour(const wxColour& colour)