Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SetLabel() adjusts the label size

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-04-07 12:59:29 +00:00
parent 1baa5e4ab5
commit b58197f24a
2 changed files with 86 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gtk/stattext.cpp
View File

@@ -23,20 +23,28 @@
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;
@@ -44,6 +52,10 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
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 );
@@ -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,6 +104,15 @@ 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()

39
src/gtk1/stattext.cpp
View File

@@ -23,20 +23,28 @@
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;
@@ -44,6 +52,10 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
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 );
@@ -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,6 +104,15 @@ 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()