{
if (g_isIdle) wxapp_install_idle_handler();
- if (!button->HasVMT()) return;
+ if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
- if (!button->HasVMT()) return;
+ if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
button->HasFocus();
static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
- if (!button->HasVMT()) return;
+ if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
button->NotFocus();
static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
- if (!button->HasVMT()) return;
+ if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
button->StartSelect();
static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
- if (!button->HasVMT()) return;
+ if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
button->EndSelect();
gtk_signal_connect( GTK_OBJECT(m_widget), "released",
GTK_SIGNAL_FUNC(gtk_bmpbutton_release_callback), (gpointer*)this );
- m_parent->AddChild( this );
-
- (m_parent->m_insertCallback)( m_parent, this );
+ m_parent->DoAddChild( this );
PostCreation();
SetBitmap();
}
-void wxBitmapButton::Enable( const bool enable )
+bool wxBitmapButton::Enable( bool enable )
{
- wxWindow::Enable(enable);
+ if ( !wxWindow::Enable(enable) )
+ return FALSE;
+
+ SetBitmap();
- SetBitmap();
+ return TRUE;
}
void wxBitmapButton::HasFocus()