X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93763ad5ba900aecb9220a36ebe7447313ea3e31..94b8ecf1cdefea63f07f9ed2b54a2ad2556ec001:/src/gtk1/bmpbuttn.cpp diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp index 1d0c7ce962..d65eaae68a 100644 --- a/src/gtk1/bmpbuttn.cpp +++ b/src/gtk1/bmpbuttn.cpp @@ -50,7 +50,7 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId()); event.SetEventObject(button); - button->GetEventHandler()->ProcessEvent(event); + button->HandleWindowEvent(event); } } @@ -172,14 +172,6 @@ bool wxBitmapButton::Create( wxWindow *parent, return true; } -void wxBitmapButton::SetDefault() -{ - GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT ); - gtk_widget_grab_default( m_widget ); - - SetSize( m_x, m_y, m_width, m_height ); -} - void wxBitmapButton::SetLabel( const wxString &label ) { wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); @@ -202,7 +194,7 @@ void wxBitmapButton::OnSetBitmap() InvalidateBestSize(); wxBitmap the_one; - if (!m_isEnabled) + if (!IsThisEnabled()) the_one = m_bmpDisabled; else if (m_isSelected) the_one = m_bmpSelected; @@ -214,7 +206,7 @@ void wxBitmapButton::OnSetBitmap() if (!the_one.Ok()) the_one = m_bmpNormal; if (!the_one.Ok()) return; - GdkBitmap *mask = (GdkBitmap *) NULL; + GdkBitmap *mask = NULL; if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap(); GtkWidget *child = BUTTON_CHILD(m_widget);