X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eaafd2f8b7acf211feb30c86db037fffe22ee565..3c5487b14442ddbc6e43ee2f4475b5a6ba251fb1:/src/gtk1/checkbox.cpp?ds=sidebyside diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp index c49c46ccff..e7fe520d4d 100644 --- a/src/gtk1/checkbox.cpp +++ b/src/gtk1/checkbox.cpp @@ -8,10 +8,13 @@ ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "checkbox.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/defs.h" #if wxUSE_CHECKBOX @@ -117,23 +120,7 @@ bool wxCheckBox::Create(wxWindow *parent, m_parent->DoAddChild( this ); - PostCreation(); - - 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 ); + PostCreation(size); return TRUE; } @@ -220,7 +207,8 @@ void wxCheckBox::OnInternalIdle() } } - UpdateWindowUI(); + if (wxUpdateUIEvent::CanUpdate(this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } wxSize wxCheckBox::DoGetBestSize() const @@ -228,4 +216,11 @@ wxSize wxCheckBox::DoGetBestSize() const return wxControl::DoGetBestSize(); } +// static +wxVisualAttributes +wxCheckBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_check_button_new); +} + #endif