Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use (or create on-the-fly) pixbuf representation

Browse Source 
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:
Robert Roebling
2007-06-22 12:25:11 +00:00
parent 7887fa4046
commit 35d1efe657
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gtk/bmpbuttn.cpp
View File

@@ -208,19 +208,12 @@ void wxBitmapButton::OnSetBitmap()
if (!the_one.Ok()) the_one = m_bmpNormal; if (!the_one.Ok()) the_one = m_bmpNormal;
if (!the_one.Ok()) return; 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; GtkWidget *child = GTK_BIN(m_widget)->child;
if (child == NULL) if (child == NULL)
{ {
// initial bitmap // initial bitmap
GtkWidget *pixmap; GtkWidget *pixmap =
gtk_image_new_from_pixbuf(the_one.GetPixbuf());
if (the_one.HasPixbuf())
pixmap = gtk_image_new_from_pixbuf(the_one.GetPixbuf());
else
pixmap = gtk_image_new_from_pixmap(the_one.GetPixmap(), mask);
gtk_widget_show(pixmap); gtk_widget_show(pixmap);
gtk_container_add(GTK_CONTAINER(m_widget), pixmap); gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
@@ -228,10 +221,7 @@ void wxBitmapButton::OnSetBitmap()
else else
{ // subsequent bitmaps { // subsequent bitmaps
GtkImage *pixmap = GTK_IMAGE(child); GtkImage *pixmap = GTK_IMAGE(child);
if (the_one.HasPixbuf()) gtk_image_set_from_pixbuf(pixmap, the_one.GetPixbuf());
gtk_image_set_from_pixbuf(pixmap, the_one.GetPixbuf());
else
gtk_image_set_from_pixmap(pixmap, the_one.GetPixmap(), mask);
} }
} }