X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5a5362e55572bcc057d014c5bdde81d75804653..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/gtk1/bmpbuttn.cpp diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp index a0f54cd27f..908926d673 100644 --- a/src/gtk1/bmpbuttn.cpp +++ b/src/gtk1/bmpbuttn.cpp @@ -48,7 +48,7 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma if (!button->m_hasVMT) return; if (g_blockEventsOnDrag) return; - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId()); + wxCommandEvent event(wxEVT_BUTTON, button->GetId()); event.SetEventObject(button); button->HandleWindowEvent(event); } @@ -114,8 +114,6 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma // wxBitmapButton //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton) - void wxBitmapButton::Init() { m_hasFocus = @@ -203,9 +201,9 @@ void wxBitmapButton::OnSetBitmap() if (!the_one.IsOk()) { - the_one = GetBitmapLabel(); - if (!the_one.IsOk()) - return; + the_one = GetBitmapLabel(); + if (!the_one.IsOk()) + return; } GdkBitmap *mask = NULL;