X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97149f189837c4a5e3220e9d979386ae3a264881..7d7baa9b3dc030fccf45e915f59789a1bd41ba2f:/src/gtk1/button.cpp

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index 177356a071..4638f0a6b1 100644
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -135,19 +135,7 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
 
     m_parent->DoAddChild( this );
 
-    PostCreation();
-    InheritAttributes();
-
-    wxSize best_size( DoGetBestSize() );
-    wxSize new_size( size );
-    if (new_size.x == -1)
-        new_size.x = best_size.x;
-    if (new_size.y == -1)
-        new_size.y = best_size.y;
-    if ((new_size.x != size.x) || (new_size.y != size.y))
-        SetSize( new_size.x, new_size.y );
-
-    SetSize( new_size );
+    PostCreation(size);
 
     return TRUE;
 }
@@ -157,7 +145,7 @@ void wxButton::SetDefault()
     wxWindow *parent = GetParent();
     wxCHECK_RET( parent, _T("button without parent?") );
 
-    wxWindow *winOldDefault = parent->SetDefaultItem(this);
+    parent->SetDefaultItem(this);
     
     GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
     gtk_widget_grab_default( m_widget );
@@ -244,5 +232,12 @@ wxSize wxButton::DoGetBestSize() const
     return ret;
 }
 
+// static
+wxVisualAttributes
+wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_button_new);
+}
+
 #endif // wxUSE_BUTTON