From b58197f24a87e0dc81ba0bdd4fc1370470a5ae2f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 7 Apr 1999 12:59:29 +0000 Subject: [PATCH] SetLabel() adjusts the label size git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/stattext.cpp | 65 ++++++++++++++++++++++++++++--------------- src/gtk1/stattext.cpp | 65 ++++++++++++++++++++++++++++--------------- 2 files changed, 86 insertions(+), 44 deletions(-) diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index 9026c416b5..721c31843d 100644 --- a/src/gtk/stattext.cpp +++ b/src/gtk/stattext.cpp @@ -4,12 +4,12 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "stattext.h" + #pragma implementation "stattext.h" #endif #include "wx/stattext.h" @@ -23,27 +23,39 @@ 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 ); - + + // 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( m_label ); @@ -58,24 +70,24 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe GtkRequisition req; (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req ); - + if (newSize.x == -1) newSize.x = req.width; if (newSize.y == -1) newSize.y = req.height; - + SetSize( newSize.x, newSize.y ); - + m_parent->AddChild( this ); (m_parent->m_insertCallback)( m_parent, this ); - + PostCreation(); - + SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); SetFont( parent->GetFont() ); Show( TRUE ); - + return TRUE; } @@ -83,8 +95,8 @@ wxString wxStaticText::GetLabel(void) const { char *str = (char *) NULL; gtk_label_get( GTK_LABEL(m_widget), &str ); - wxString tmp( str ); - return tmp; + + return wxString(str); } void wxStaticText::SetLabel( const wxString &label ) @@ -92,11 +104,20 @@ void wxStaticText::SetLabel( const wxString &label ) wxControl::SetLabel(label); gtk_label_set( GTK_LABEL(m_widget), m_label ); -} + + // adjust the label size to the new label + + // TODO there should be a way to prevent SetLabel() from doing it (an + // additional parameter?) + GtkRequisition req; + (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req ); + + SetSize( req.width, req.height ); +} void wxStaticText::ApplyWidgetStyle() { SetWidgetStyle(); gtk_widget_set_style( m_widget, m_widgetStyle ); } - + diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp index 9026c416b5..721c31843d 100644 --- a/src/gtk1/stattext.cpp +++ b/src/gtk1/stattext.cpp @@ -4,12 +4,12 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "stattext.h" + #pragma implementation "stattext.h" #endif #include "wx/stattext.h" @@ -23,27 +23,39 @@ 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 ); - + + // 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( m_label ); @@ -58,24 +70,24 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe GtkRequisition req; (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req ); - + if (newSize.x == -1) newSize.x = req.width; if (newSize.y == -1) newSize.y = req.height; - + SetSize( newSize.x, newSize.y ); - + m_parent->AddChild( this ); (m_parent->m_insertCallback)( m_parent, this ); - + PostCreation(); - + SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); SetFont( parent->GetFont() ); Show( TRUE ); - + return TRUE; } @@ -83,8 +95,8 @@ wxString wxStaticText::GetLabel(void) const { char *str = (char *) NULL; gtk_label_get( GTK_LABEL(m_widget), &str ); - wxString tmp( str ); - return tmp; + + return wxString(str); } void wxStaticText::SetLabel( const wxString &label ) @@ -92,11 +104,20 @@ void wxStaticText::SetLabel( const wxString &label ) wxControl::SetLabel(label); gtk_label_set( GTK_LABEL(m_widget), m_label ); -} + + // adjust the label size to the new label + + // TODO there should be a way to prevent SetLabel() from doing it (an + // additional parameter?) + GtkRequisition req; + (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req ); + + SetSize( req.width, req.height ); +} void wxStaticText::ApplyWidgetStyle() { SetWidgetStyle(); gtk_widget_set_style( m_widget, m_widgetStyle ); } - + -- 2.45.2