X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eaafd2f8b7acf211feb30c86db037fffe22ee565..b77b87881bae2e6306366d79e7fe160334b3d4a2:/src/gtk/button.cpp diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp index b61143a0ef..68e6eb5346 100644 --- a/src/gtk/button.cpp +++ b/src/gtk/button.cpp @@ -7,10 +7,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "button.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/defs.h" #if wxUSE_BUTTON @@ -133,8 +136,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, m_parent->DoAddChild( this ); PostCreation(); - - SetFont( parent->GetFont() ); + InheritAttributes(); wxSize best_size( DoGetBestSize() ); wxSize new_size( size ); @@ -147,9 +149,6 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, SetSize( new_size ); - SetBackgroundColour( parent->GetBackgroundColour() ); - SetForegroundColour( parent->GetForegroundColour() ); - Show( TRUE ); return TRUE;