Remove apparently erroneous -1 from DrawBitmap() in wxMSW wxGC code.

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

diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index e86af74122a1580f3c71253da6927f55e997bfee..dc9b6397118c733ae85257194384254ac0c0dca9 100644 (file)
--- 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$
@@ -7,23 +7,19 @@
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "statbmp.h"
-#endif
-
-#include "wx/statbmp.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_STATBMP
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/statbmp.h"
+
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl)
-
 wxStaticBitmap::wxStaticBitmap(void)
 {
 }
@@ -35,93 +31,53 @@ wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap
     Create( parent, id, bitmap, pos, size, style, name );
 }
 
-void wxStaticBitmap::CreatePixmapWidget()
-{
-    wxCHECK_RET( m_bitmap.Ok(), wxT("should only be called if we have a bitmap") );
-
-    GdkBitmap *mask = (GdkBitmap *) NULL;
-    if ( m_bitmap.GetMask() )
-        mask = m_bitmap.GetMask()->GetBitmap();
-    m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
-
-    /* insert GTK representation */
-    (*m_parent->m_insertCallback)(m_parent, this);
-
-    gtk_widget_show( m_widget );
-
-    PostCreation();
-}
-
 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 ))
     {
-        wxFAIL_MSG( wxT("wxXX creation failed") );
-       return FALSE;
+        wxFAIL_MSG( wxT("wxStaticBitmap creation failed") );
+        return false;
     }
 
     m_bitmap = bitmap;
 
-    if (m_bitmap.Ok())
-    {
-        GdkBitmap *mask = (GdkBitmap *) NULL;
-        if ( m_bitmap.GetMask() )
-            mask = m_bitmap.GetMask()->GetBitmap();
-        m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
+    m_widget = gtk_image_new();
+    g_object_ref(m_widget);
 
-        SetSizeOrDefault( size );
-    }
-    else
-    {
-        m_widget = gtk_label_new( "Bitmap" );
-
-        PostCreation();
-    }
+    if (bitmap.Ok())
+        SetBitmap(bitmap);
 
+    PostCreation(size);
     m_parent->DoAddChild( this );
 
-    Show( TRUE );
-
-    return TRUE;
+    return true;
 }
 
 void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
 {
-    bool hasWidget = m_bitmap.Ok();
     m_bitmap = bitmap;
 
     if (m_bitmap.Ok())
     {
-        if (!hasWidget)
-        {
-            gtk_widget_destroy( m_widget );
-
-            /* recreate m_widget because we've created a label
-               and not a bitmap above */
-            CreatePixmapWidget();
-        }
-        else
-        {
-            GdkBitmap *mask = (GdkBitmap *) NULL;
-            if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
-            gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask );
-        }
-
-        SetSizeOrDefault();
+        // 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());
     }
 }
 
-wxSize wxStaticBitmap::DoGetBestSize() const
+// static
+wxVisualAttributes
+wxStaticBitmap::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    if ( m_bitmap.Ok() )
-        return wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight());
-    else
-        return wxSize(16, 16);  // completely arbitrary
+    // TODO: overload to allow using gtk_pixmap_new?
+    return GetDefaultAttributesFromGTKWidget(gtk_label_new);
 }
 
-#endif
+#endif // wxUSE_STATBMP
+