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

Added wxControl::PostCreation for wxGTK. Moved calls to

Browse Source 
InheritAttributes and ApplyWidgetStyle there, and added a call to
SetInitialBestSize.   Also removed calls to Show from Create since
PostCreation already does it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-05-04 07:09:32 +00:00
parent 0886039fa7
commit abdeb9e700
46 changed files with 112 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gtk/stattext.cpp
View File

@@ -90,7 +90,7 @@ bool wxStaticText::Create(wxWindow *parent,
m_parent->DoAddChild( this );
PostCreation();
PostCreation(size);
// the bug below only happens with GTK 2
#ifdef __WXGTK20__
@@ -109,27 +109,6 @@ bool wxStaticText::Create(wxWindow *parent,
}
#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;
}
@@ -168,7 +147,10 @@ void wxStaticText::SetLabel( const wxString &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 )
@@ -177,8 +159,10 @@ bool wxStaticText::SetFont( const wxFont &font )
// adjust the label size to the new label unless disabled
if (!HasFlag(wxST_NO_AUTORESIZE))
{
SetSize( GetBestSize() );
SetSizeHints(GetSize());
}
return ret;
}