X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b292e2f512fa9b25e2d2928604ab884b00e6c6bf..02da33e27d0eee3440a1ea83c8551ec99ab93f9f:/src/gtk1/button.cpp diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index 8980bb0301..af6d56d598 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/button.cpp @@ -13,6 +13,9 @@ #include "wx/button.h" +#include "gdk/gdk.h" +#include "gtk/gtk.h" + //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- @@ -86,6 +89,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); + SetFont( parent->GetFont() ); Show( TRUE ); @@ -94,10 +98,10 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, void wxButton::SetDefault(void) { -/* - GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT ); - gtk_widget_grab_default( m_widget ); -*/ + GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT ); + gtk_widget_grab_default( m_widget ); + + SetSize( m_x, m_y, m_width, m_height ); } void wxButton::SetLabel( const wxString &label )