don't create artificial alpha channel for all bitmaps (patch 949221)

[wxWidgets.git] / src / gtk / button.cpp

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 177356a071c4a1d88103a61e117c402767492077..1fc794b7636fd7f24e84e0b957ca1611a37b7925 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/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 );