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

19
src/gtk1/checkbox.cpp
View File

@@ -106,8 +106,6 @@ bool wxCheckBox::Create(wxWindow *parent,
m_widget = m_widgetCheckbox;
}
SetSizeOrDefault( size );
gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
"clicked",
GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback),
@@ -117,9 +115,21 @@ bool wxCheckBox::Create(wxWindow *parent,
PostCreation();
ApplyWidgetStyle();
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() );
SetFont( parent->GetFont() );
Show( TRUE );
@@ -203,8 +213,7 @@ void wxCheckBox::OnInternalIdle()
wxSize wxCheckBox::DoGetBestSize() const
{
return wxSize( 25 + gdk_string_measure( m_widgetCheckbox->style->font,
m_label.mbc_str() ), 26 );
return wxControl::DoGetBestSize();
}
#endif