X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cbab64109b007fa1d939fe588f5e79f9105b915..2028c33ab5a39a12bd410ac953731a56ad6377ba:/src/gtk1/statbmp.cpp diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp index 59c3c7e555..e9ee469e1e 100644 --- a/src/gtk1/statbmp.cpp +++ b/src/gtk1/statbmp.cpp @@ -37,7 +37,7 @@ wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap // empty bitmap, so that we can create GtkPixmap widget: static char * bogus_xpm[] = { "2 2 1 1", -" c None", +" c None", " ", " "}; @@ -74,18 +74,11 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) if (m_bitmap.Ok()) { - GdkBitmap *mask = (GdkBitmap *) NULL; + GdkBitmap *mask = NULL; if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap(); - if (m_bitmap.HasPixbuf()) - { - gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget), - m_bitmap.GetPixbuf()); - } - else - gtk_image_set_from_pixmap(GTK_IMAGE(m_widget), - m_bitmap.GetPixmap(), mask); + gtk_pixmap_set(GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask); InvalidateBestSize(); SetSize(GetBestSize());