X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47ca35dd35dede7deac393fb7b8ab892c4efef65..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/gtk1/stattext.cpp diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp index bfca9d9409..d3b0f138f0 100644 --- a/src/gtk1/stattext.cpp +++ b/src/gtk1/stattext.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: stattext.cpp +// Name: src/gtk1/stattext.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,17 +7,13 @@ // 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" #if wxUSE_STATTEXT #include "wx/stattext.h" -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" #include "gdk/gdk.h" #include "gtk/gtk.h" @@ -31,8 +27,6 @@ void wxgtk_window_size_request_callback(GtkWidget *widget, // wxStaticText //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl) - wxStaticText::wxStaticText() { } @@ -61,17 +55,13 @@ bool wxStaticText::Create(wxWindow *parent, if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { - wxFAIL_MSG( wxT("wxXX creation failed") ); + wxFAIL_MSG( wxT("wxStaticText creation failed") ); return FALSE; } - // notice that we call the base class version which will just remove the - // '&' characters from the string, but not set the label's text to it - // because the label is not yet created and because SetLabel() has a side - // effect of changing the control size which might not be desirable - wxControl::SetLabel(label); - m_widget = gtk_label_new( wxGTK_CONV( m_label ) ); - + m_label = label; + m_widget = gtk_label_new( wxGTK_CONV( GTKRemoveMnemonics(label)) ); + GtkJustification justify; if ( style & wxALIGN_CENTER ) justify = GTK_JUSTIFY_CENTER; @@ -85,29 +75,11 @@ 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 ); PostCreation(size); - - // 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; } @@ -115,50 +87,19 @@ bool wxStaticText::Create(wxWindow *parent, wxString wxStaticText::GetLabel() const { GtkLabel *label = GTK_LABEL(m_widget); - -#ifdef __WXGTK20__ - wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) ); -#else wxString str = wxString( label->label ); -#endif - return wxString(str); } 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("%s"), 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 + wxCHECK_RET( m_widget != NULL, wxT("invalid static text") ); + GTKSetLabelForLabel(GTK_LABEL(m_widget), label); // 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 ) @@ -168,16 +109,17 @@ bool wxStaticText::SetFont( const wxFont &font ) // adjust the label size to the new label unless disabled if (!HasFlag(wxST_NO_AUTORESIZE)) { + InvalidateBestSize(); SetSize( GetBestSize() ); - SetSizeHints(GetSize()); } 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 @@ -185,17 +127,22 @@ 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 ); + // This resets the internal GTK1 size calculation, which + // otherwise would be cashed (incorrectly) + gtk_label_set_pattern( GTK_LABEL(m_widget), NULL ); + + // 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 ); - 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)