// "clicked"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (g_isIdle)
event.SetEventObject(button);
button->GetEventHandler()->ProcessEvent(event);
}
+}
//-----------------------------------------------------------------------------
// "enter"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->m_hasVMT) return;
button->HasFocus();
}
+}
//-----------------------------------------------------------------------------
// "leave"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->m_hasVMT) return;
button->NotFocus();
}
+}
//-----------------------------------------------------------------------------
// "pressed"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->m_hasVMT) return;
button->StartSelect();
}
+}
//-----------------------------------------------------------------------------
// "released"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->m_hasVMT) return;
button->EndSelect();
}
+}
//-----------------------------------------------------------------------------
// wxBitmapButton
OnSetBitmap();
}
- gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
+ gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked",
GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
gtk_signal_connect( GTK_OBJECT(m_widget), "enter",
if (child == NULL)
{
// initial bitmap
- GtkWidget *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);
+ GtkWidget *pixmap;
+#ifdef __WXGTK20__
+ if (the_one.HasPixbuf())
+ pixmap = gtk_image_new_from_pixbuf(the_one.GetPixbuf());
+ else
+ pixmap = gtk_image_new_from_pixmap(the_one.GetPixmap(), mask);
+#else
+ pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);
+#endif
gtk_widget_show(pixmap);
gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
}
else
{ // subsequent bitmaps
- GtkPixmap *g_pixmap = GTK_PIXMAP(child);
- gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask);
+#ifdef __WXGTK20__
+ GtkImage *pixmap = GTK_IMAGE(child);
+ if (the_one.HasPixbuf())
+ gtk_image_set_from_pixbuf(pixmap, the_one.GetPixbuf());
+ else
+ gtk_image_set_from_pixmap(pixmap, the_one.GetPixmap(), mask);
+#else
+ GtkPixmap *pixmap = GTK_PIXMAP(child);
+ gtk_pixmap_set(pixmap, the_one.GetPixmap(), mask);
+#endif
}
}
wxSize wxBitmapButton::DoGetBestSize() const
{
- wxSize best;
-
- if (m_bmpNormal.Ok())
- {
- int border = HasFlag(wxNO_BORDER) ? 4 : 10;
- best.x = m_bmpNormal.GetWidth()+border;
- best.y = m_bmpNormal.GetHeight()+border;
- }
- CacheBestSize(best);
- return best;
+ return wxControl::DoGetBestSize();
}
bool wxBitmapButton::Enable( bool enable )