don't access inexistent column in wxDataViewTreeCtrl::OnSize() (this bug also probabl...

[wxWidgets.git] / src / gtk / statbmp.cpp

diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index a33dcd4ecc1400fd69714d2339bc80c4a0286649..b12acdde77a64e2cec979b3370ea185b5b4ddfb4 100644 (file)
--- a/src/gtk/statbmp.cpp
+++ b/src/gtk/statbmp.cpp
@@ -14,8 +14,7 @@
 
 #include "wx/statbmp.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // wxStaticBitmap
@@ -34,21 +33,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,12 +46,8 @@ 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())
         SetBitmap(bitmap);
@@ -80,22 +64,9 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
 
     if (m_bitmap.Ok())
     {
-        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());