class wxBitmapButton;
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
- if (!button->HasVMT()) return;
+ if (g_isIdle) wxapp_install_idle_handler();
+
+ 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();
m_label = "";
m_widget = gtk_button_new();
-
+
+#if (GTK_MINOR_VERSION > 0)
+ if (style & wxNO_BORDER)
+ gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
+#endif
+
if (m_bitmap.Ok())
{
GdkBitmap *mask = (GdkBitmap *) NULL;
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;
+ int border = 10;
+ if (style & wxNO_BORDER) border = 4;
+ if (newSize.x == -1) newSize.x = m_bitmap.GetWidth()+border;
+ if (newSize.y == -1) newSize.y = m_bitmap.GetHeight()+border;
SetSize( newSize.x, newSize.y );
gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
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();
wxBitmap the_one;
- if ( ! m_isEnabled )
+ if (!m_isEnabled)
the_one = m_disabled;
else
{
- if ( m_isSelected )
+ if (m_isSelected)
{
the_one = m_selected;
}
else
{
- if ( m_hasFocus )
+ if (m_hasFocus)
the_one = m_focus;
else
the_one = m_bitmap;
}
}
- if ( ! the_one.Ok() ) the_one = m_bitmap;
- if ( ! the_one.Ok() ) return;
+ if (!the_one.Ok()) the_one = m_bitmap;
+ if (!the_one.Ok()) return;
GtkButton *bin = GTK_BUTTON( m_widget );
GtkPixmap *g_pixmap = GTK_PIXMAP( bin->child );
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()