fixed loop deleting the old filters in SetWildcard() after last commit

[wxWidgets.git] / src / gtk1 / bmpbuttn.cpp

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index 55b275d0bbd14640befda1a0dce737788130797f..ed67afffaf51eb9bf06a57dd4ff418d4575027ba 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -149,7 +149,7 @@ bool wxBitmapButton::Create( wxWindow *parent,
         OnSetBitmap();
     }
 
-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
+    gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked",
       GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "enter",
@@ -265,16 +265,7 @@ void wxBitmapButton::OnSetBitmap()
 
 wxSize wxBitmapButton::DoGetBestSize() const
 {
-    wxSize best;
-    
-    if (m_bmpNormal.Ok())
-    {
-        int border = HasFlag(wxNO_BORDER) ? 4 : 10;
-        best.x = m_bmpNormal.GetWidth()+border;
-        best.y = m_bmpNormal.GetHeight()+border;
-    }
-    CacheBestSize(best);
-    return best;
+    return wxControl::DoGetBestSize();
 }
 
 bool wxBitmapButton::Enable( bool enable )