X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32c77a71336262a7d7d5e79ac690a4bff78d1c92..864db5de611f630d8b64dec6b648117187381d99:/src/gtk1/stattext.cpp diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp index b125eeb11f..228cac559f 100644 --- a/src/gtk1/stattext.cpp +++ b/src/gtk1/stattext.cpp @@ -2,18 +2,30 @@ // Name: stattext.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "stattext.h" +#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 "gdk/gdk.h" +#include "gtk/gtk.h" + +extern "C" +void wxgtk_window_size_request_callback(GtkWidget *widget, + GtkRequisition *requisition, + wxWindow *win); //----------------------------------------------------------------------------- // wxStaticText @@ -21,61 +33,163 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl) -wxStaticText::wxStaticText(void) +wxStaticText::wxStaticText() { -}; +} -wxStaticText::wxStaticText( wxWindow *parent, wxWindowID id, const wxString &label, - const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) +wxStaticText::wxStaticText(wxWindow *parent, + wxWindowID id, + const wxString &label, + const wxPoint &pos, + const wxSize &size, + long style, + const wxString &name) { Create( parent, id, label, pos, size, style, name ); -}; +} -bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &label, - const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) +bool wxStaticText::Create(wxWindow *parent, + wxWindowID id, + const wxString &label, + const wxPoint &pos, + const wxSize &size, + long style, + const wxString &name ) { - m_needParent = TRUE; - - wxSize newSize = size; - - PreCreation( parent, id, pos, size, style, name ); - - wxControl::SetLabel(label); - m_widget = gtk_label_new( m_label ); - - GtkJustification justify; - if ( style & wxALIGN_CENTER ) - justify = GTK_JUSTIFY_CENTER; - else if ( style & wxALIGN_RIGHT ) - justify = GTK_JUSTIFY_RIGHT; - else // wxALIGN_LEFT is 0 - justify = GTK_JUSTIFY_LEFT; - gtk_label_set_justify(GTK_LABEL(m_widget), justify); - - if (newSize.x == -1) newSize.x = gdk_string_measure( m_widget->style->font, label ); - if (newSize.y == -1) newSize.y = 26; - SetSize( newSize.x, newSize.y ); - - PostCreation(); - - Show( TRUE ); + m_needParent = TRUE; + + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) + { + wxFAIL_MSG( wxT("wxXX 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 ) ); - return TRUE; -}; + GtkJustification justify; + if ( style & wxALIGN_CENTER ) + justify = GTK_JUSTIFY_CENTER; + else if ( style & wxALIGN_RIGHT ) + justify = GTK_JUSTIFY_RIGHT; + else // wxALIGN_LEFT is 0 + justify = GTK_JUSTIFY_LEFT; + 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 ); + + m_parent->DoAddChild( this ); + + PostCreation(); + + // 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__ + + ApplyWidgetStyle(); + + InheritAttributes(); +// 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 ); + +// if (ShouldInheritColours()) +// { +// SetBackgroundColour( parent->GetBackgroundColour() ); +// SetForegroundColour( parent->GetForegroundColour() ); +// } + Show( TRUE ); + + return TRUE; +} -wxString wxStaticText::GetLabel(void) const +wxString wxStaticText::GetLabel() const { - char *str = NULL; - gtk_label_get( GTK_LABEL(m_widget), &str ); - wxString tmp( str ); - return tmp; -}; + 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 ) { - wxControl::SetLabel(label); + wxControl::SetLabel(label); + + 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)) + SetSize( GetBestSize() ); +} + +bool wxStaticText::SetFont( const wxFont &font ) +{ + bool ret = wxControl::SetFont(font); + + // adjust the label size to the new label unless disabled + if (!HasFlag(wxST_NO_AUTORESIZE)) + SetSize( GetBestSize() ); + + return ret; +} + +void wxStaticText::ApplyWidgetStyle() +{ + SetWidgetStyle(); + gtk_widget_set_style( m_widget, m_widgetStyle ); +} + +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 ); + + GtkRequisition req; + req.width = 2; + req.height = 2; + (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) + (m_widget, &req ); + + return wxSize(req.width, req.height); +} - gtk_label_set( GTK_LABEL(m_widget), m_label ); -}; +#endif // wxUSE_STATTEXT