Always use (or create on-the-fly) pixbuf representation
in wxBitmapButtom, fixes [ 1739413 ] Transparency, wxBitmapButton, GTK, disabled git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -208,19 +208,12 @@ void wxBitmapButton::OnSetBitmap()
|
||||
if (!the_one.Ok()) the_one = m_bmpNormal;
|
||||
if (!the_one.Ok()) return;
|
||||
|
||||
GdkBitmap *mask = (GdkBitmap *) NULL;
|
||||
if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();
|
||||
|
||||
GtkWidget *child = GTK_BIN(m_widget)->child;
|
||||
if (child == NULL)
|
||||
{
|
||||
// initial bitmap
|
||||
GtkWidget *pixmap;
|
||||
|
||||
if (the_one.HasPixbuf())
|
||||
pixmap = gtk_image_new_from_pixbuf(the_one.GetPixbuf());
|
||||
else
|
||||
pixmap = gtk_image_new_from_pixmap(the_one.GetPixmap(), mask);
|
||||
GtkWidget *pixmap =
|
||||
gtk_image_new_from_pixbuf(the_one.GetPixbuf());
|
||||
|
||||
gtk_widget_show(pixmap);
|
||||
gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
|
||||
@@ -228,10 +221,7 @@ void wxBitmapButton::OnSetBitmap()
|
||||
else
|
||||
{ // subsequent bitmaps
|
||||
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);
|
||||
gtk_image_set_from_pixbuf(pixmap, the_one.GetPixbuf());
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user