X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1f448eeefd90163fedd9134f35203afe51200c6..5c250a10332dc17263c66deb629b5fa8c4320f8a:/src/gtk1/stattext.cpp diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp index 53fe9f98e5..228cac559f 100644 --- a/src/gtk1/stattext.cpp +++ b/src/gtk1/stattext.cpp @@ -7,12 +7,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "stattext.h" #endif -#include "wx/defs.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_STATTEXT @@ -111,7 +111,8 @@ bool wxStaticText::Create(wxWindow *parent, ApplyWidgetStyle(); - wxControl::SetFont( parent->GetFont() ); + InheritAttributes(); +// wxControl::SetFont( parent->GetFont() ); wxSize size_best( DoGetBestSize() ); wxSize new_size( size ); @@ -122,8 +123,11 @@ bool wxStaticText::Create(wxWindow *parent, if ((new_size.x != size.x) || (new_size.y != size.y)) SetSize( new_size.x, new_size.y ); - SetBackgroundColour( parent->GetBackgroundColour() ); - SetForegroundColour( parent->GetForegroundColour() ); +// if (ShouldInheritColours()) +// { +// SetBackgroundColour( parent->GetBackgroundColour() ); +// SetForegroundColour( parent->GetForegroundColour() ); +// } Show( TRUE ); return TRUE;