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

New colour, font, theme and size code..

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-01-04 13:02:27 +00:00
parent bf9b671186
commit db434467a1
35 changed files with 581 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gtk/stattext.cpp
View File

@@ -62,8 +62,6 @@ bool wxStaticText::Create(wxWindow *parent,
wxControl::SetLabel(label);
m_widget = gtk_label_new( m_label.mbc_str() );
wxControl::SetFont( parent->GetFont() );
GtkJustification justify;
if ( style & wxALIGN_CENTER )
justify = GTK_JUSTIFY_CENTER;
@@ -80,12 +78,23 @@ bool wxStaticText::Create(wxWindow *parent,
// do not move this call elsewhere
gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
SetSizeOrDefault( size );
m_parent->DoAddChild( this );
PostCreation();
ApplyWidgetStyle();
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 );