X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02c0348e97d36f9907cc59bf9c75e04ffd93f889..4913272f9cdead94a6d1470e51d6fb14946b50e0:/src/gtk/stattext.cpp diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index 6afa92e419..8d2c1e01b4 100644 --- a/src/gtk/stattext.cpp +++ b/src/gtk/stattext.cpp @@ -7,12 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ - #pragma implementation "stattext.h" -#endif - -#include "wx/defs.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_STATTEXT @@ -22,6 +18,11 @@ #include "gdk/gdk.h" #include "gtk/gtk.h" +extern "C" +void wxgtk_window_size_request_callback(GtkWidget *widget, + GtkRequisition *requisition, + wxWindow *win); + //----------------------------------------------------------------------------- // wxStaticText //----------------------------------------------------------------------------- @@ -56,17 +57,14 @@ 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 ) ); - + const wxString labelGTK = GTKConvertMnemonics(label); + m_label = label; + m_widget = gtk_label_new_with_mnemonic(wxGTK_CONV(labelGTK)); + GtkJustification justify; if ( style & wxALIGN_CENTER ) justify = GTK_JUSTIFY_CENTER; @@ -74,55 +72,58 @@ bool wxStaticText::Create(wxWindow *parent, justify = GTK_JUSTIFY_RIGHT; else // wxALIGN_LEFT is 0 justify = GTK_JUSTIFY_LEFT; + + if (GetLayoutDirection() == wxLayout_RightToLeft) + { + if (justify == GTK_JUSTIFY_RIGHT) + justify = GTK_JUSTIFY_LEFT; + if (justify == GTK_JUSTIFY_LEFT) + justify = GTK_JUSTIFY_RIGHT; + } + gtk_label_set_justify(GTK_LABEL(m_widget), justify); // GTK_JUSTIFY_LEFT is 0, RIGHT 1 and CENTER 2 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(); - - ApplyWidgetStyle(); + PostCreation(size); - 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 ); + // the bug below only happens with GTK 2 + 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) + g_signal_handlers_disconnect_by_func (m_widget, + (gpointer) wxgtk_window_size_request_callback, + this); + } return TRUE; } wxString wxStaticText::GetLabel() const { - char *str = (char *) NULL; - gtk_label_get( GTK_LABEL(m_widget), &str ); + GtkLabel *label = GTK_LABEL(m_widget); + wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) ); return wxString(str); } void wxStaticText::SetLabel( const wxString &label ) { - wxControl::SetLabel(label); + wxCHECK_RET( m_widget != NULL, wxT("invalid static text") ); - gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) ); + GTKSetLabelForLabel(GTK_LABEL(m_widget), label); // adjust the label size to the new label unless disabled - if (!HasFlag(wxST_NO_AUTORESIZE)) + if ( !HasFlag(wxST_NO_AUTORESIZE) ) SetSize( GetBestSize() ); } @@ -132,15 +133,18 @@ bool wxStaticText::SetFont( const wxFont &font ) // adjust the label size to the new label unless disabled if (!HasFlag(wxST_NO_AUTORESIZE)) + { + InvalidateBestSize(); SetSize( GetBestSize() ); - + } 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 @@ -148,17 +152,45 @@ 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 ); + // 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 ); + + // Adding 1 to width to workaround GTK sometimes wrapping the text needlessly + return wxSize (req.width+1, 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; +} + +bool wxStaticText::GTKWidgetNeedsMnemonic() const +{ + return true; +} + +void wxStaticText::GTKWidgetDoSetMnemonic(GtkWidget* w) +{ + gtk_label_set_mnemonic_widget(GTK_LABEL(m_widget), w); +} + +// static +wxVisualAttributes +wxStaticText::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_label_new); } #endif // wxUSE_STATTEXT