X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/151ccd11af31917b4bed26f988d4db03ba32f672..cf44735628cecb0326b953c4872260f223fc8769:/src/gtk/bmpbuttn.cpp diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp index 680b11b4e3..09722663f3 100644 --- a/src/gtk/bmpbuttn.cpp +++ b/src/gtk/bmpbuttn.cpp @@ -26,7 +26,7 @@ class wxBitmapButton; IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl) -void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), gpointer data ) +void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), gpointer data ) { wxBitmapButton *button = (wxBitmapButton*)data; wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId()); @@ -72,14 +72,12 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &b gtk_container_add( GTK_CONTAINER(m_widget), pixmap ); }; - - if (newSize.x == -1) newSize.x = m_bitmap.GetHeight()+10; if (newSize.y == -1) newSize.y = m_bitmap.GetWidth()+10; SetSize( newSize.x, newSize.y ); gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", - GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this ); + GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this ); PostCreation();