fixed labels under GTK+ 1 after recent changes (remove underscores from them again)

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

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index da7039c8edec6fee3a1d34a99d51ef44d039d535..812a9839b2fcef9678431c0ae4dc07f431a0d0a8 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/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,9 +81,6 @@ 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);
 

-    if (size.x == -1)
-        gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
-    else

         gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
 
     m_parent->DoAddChild( this );
         gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
 
     m_parent->DoAddChild( this );


@@ -182,12 +175,14 @@ 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") );
 

-    int width = m_width;

 #ifndef __WXGTK20__
 #ifndef __WXGTK20__

+    // This resets the internal GTK1 size calculation, which
+    // otherwise would be cashed (incorrectly)

     gtk_label_set_pattern( GTK_LABEL(m_widget), NULL );
     gtk_label_set_pattern( GTK_LABEL(m_widget), NULL );

-    if (width < 3) width = -1;

 #endif
 #endif

-    gtk_widget_set_usize( m_widget, width, -1 );
+
+    // GetBestSize is supposed to return unwrapped size
+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );

     
     GtkRequisition req;
     req.width = -1;
     
     GtkRequisition req;
     req.width = -1;


@@ -195,6 +190,8 @@ wxSize wxStaticText::DoGetBestSize() const
     (* 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 );
 

+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
+    

     return wxSize (req.width, req.height);
 }
 
     return wxSize (req.width, req.height);
 }