return FALSE;
}
- m_bmpNormal =
- m_bmpDisabled =
- m_bmpFocus =
- m_bmpSelected = bitmap;
+ m_bmpNormal = bitmap;
m_widget = gtk_button_new();
{
wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") );
+ InvalidateBestSize();
+
wxBitmap the_one;
if (!m_isEnabled)
the_one = m_bmpDisabled;
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;
- }
- return best;
+ return wxControl::DoGetBestSize();
}
bool wxBitmapButton::Enable( bool enable )