projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed an off-by-one error
[wxWidgets.git]
/
src
/
gtk1
/
button.cpp
diff --git
a/src/gtk1/button.cpp
b/src/gtk1/button.cpp
index 51caf3b9dcbc625fa09e0ebc215b8186ffcd973b..68e6eb534685c637559cf496b319803030ad3ce8 100644
(file)
--- a/
src/gtk1/button.cpp
+++ b/
src/gtk1/button.cpp
@@
-136,8
+136,7
@@
bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
m_parent->DoAddChild( this );
PostCreation();
m_parent->DoAddChild( this );
PostCreation();
-
- SetFont( parent->GetFont() );
+ InheritAttributes();
wxSize best_size( DoGetBestSize() );
wxSize new_size( size );
wxSize best_size( DoGetBestSize() );
wxSize new_size( size );
@@
-150,9
+149,6
@@
bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
SetSize( new_size );
SetSize( new_size );
- SetBackgroundColour( parent->GetBackgroundColour() );
- SetForegroundColour( parent->GetForegroundColour() );
-
Show( TRUE );
return TRUE;
Show( TRUE );
return TRUE;