X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d257b8db10b5f464d896ff0d4249237d8f587a1..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/gtk/statbmp.cpp?ds=sidebyside diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp index 64d3931648..19391bbb7e 100644 --- a/src/gtk/statbmp.cpp +++ b/src/gtk/statbmp.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.cpp +// Name: src/gtk/statbmp.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -14,15 +14,12 @@ #include "wx/statbmp.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include //----------------------------------------------------------------------------- // wxStaticBitmap //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl) - wxStaticBitmap::wxStaticBitmap(void) { } @@ -34,21 +31,10 @@ wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap Create( parent, id, bitmap, pos, size, style, name ); } -#ifndef __WXGTK20__ -// empty bitmap, so that we can create GtkPixmap widget: -static char * bogus_xpm[] = { -"2 2 1 1", -" c None", -" ", -" "}; -#endif - bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { - m_needParent = TRUE; - if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { @@ -58,14 +44,10 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi m_bitmap = bitmap; -#ifdef __WXGTK20__ m_widget = gtk_image_new(); -#else - wxBitmap bmp(bitmap.Ok() ? bitmap : wxBitmap(bogus_xpm)); - m_widget = gtk_pixmap_new(bmp.GetPixmap(), NULL); -#endif + g_object_ref(m_widget); - if (bitmap.Ok()) + if (bitmap.IsOk()) SetBitmap(bitmap); PostCreation(size); @@ -78,24 +60,11 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) { m_bitmap = bitmap; - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { - GdkBitmap *mask = (GdkBitmap *) NULL; - if (m_bitmap.GetMask()) - mask = m_bitmap.GetMask()->GetBitmap(); - -#ifdef __WXGTK20__ - 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); -#else - gtk_pixmap_set(GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask); -#endif + // always use pixbuf, because pixmap mask does not + // work with disabled images in some themes + gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget), m_bitmap.GetPixbuf()); InvalidateBestSize(); SetSize(GetBestSize()); @@ -106,8 +75,7 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) wxVisualAttributes wxStaticBitmap::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - // TODO: overload to allow using gtk_pixmap_new? - return GetDefaultAttributesFromGTKWidget(gtk_label_new); + return GetDefaultAttributesFromGTKWidget(gtk_image_new()); } #endif // wxUSE_STATBMP