Disable wxUSE_ENH_METAFILE for wxGTK builds.

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

diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index 8027044d5aca6c4c4b1291e872be4f9b2c479d37..19391bbb7e69026ad3af802578b24ab0bb0aa766 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$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,23 +7,19 @@
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
 
 
 #if wxUSE_STATBMP
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/statbmp.h"
+
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl)
-

 wxStaticBitmap::wxStaticBitmap(void)
 {
 }
 wxStaticBitmap::wxStaticBitmap(void)
 {
 }


@@ -35,72 +31,52 @@ wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap
     Create( parent, id, bitmap, pos, size, style, name );
 }
 
     Create( parent, id, bitmap, pos, size, style, name );
 }
 

-void wxStaticBitmap::CreatePixmapWidget()
-{
-    wxCHECK_RET( m_bitmap.Ok(), "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 );
-
-    PostCreation();
-}
-

 bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
                              const wxPoint &pos, const wxSize &size,
                              long style, const wxString &name )
 {
 bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
                              const wxPoint &pos, const wxSize &size,
                              long style, const wxString &name )
 {

-    m_needParent = TRUE;
-
-    wxSize newSize = size;
-
-    PreCreation( parent, id, pos, size, style, name );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxStaticBitmap creation failed") );
+        return false;
+    }

 
     m_bitmap = bitmap;
 
 
     m_bitmap = bitmap;
 

-    if (m_bitmap.Ok())
-    {
-        CreatePixmapWidget();
+    m_widget = gtk_image_new();
+    g_object_ref(m_widget);

 
 

-        if (newSize.x == -1) newSize.x = m_bitmap.GetWidth();
-        if (newSize.y == -1) newSize.y = m_bitmap.GetHeight();
-        SetSize( newSize.x, newSize.y );
-    }
-    else
-    {
-        m_widget = gtk_label_new( "Bitmap" );
-    }
+    if (bitmap.IsOk())
+        SetBitmap(bitmap);

 
 

-    PostCreation();
-    
+    PostCreation(size);

     m_parent->DoAddChild( this );
 
     m_parent->DoAddChild( this );
 

-    Show( TRUE );
-
-    return TRUE;
+    return true;

 }
 
 void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
 {
 }
 
 void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
 {

-    bool hasWidget = m_bitmap.Ok();

     m_bitmap = bitmap;
 
     m_bitmap = bitmap;
 

-    if (m_bitmap.Ok())
+    if (m_bitmap.IsOk())

     {
     {

-        if ( !hasWidget )
-        {
-            gtk_widget_destroy( m_widget );
-
-            // recreate m_widget because we'd created a label and not a bitmap
-            // above
-            CreatePixmapWidget();
-        }
-
-        GdkBitmap *mask = (GdkBitmap *) NULL;
-        if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
-        gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask );
+        // 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());

     }
 }
 
     }
 }
 

-#endif
+// static
+wxVisualAttributes
+wxStaticBitmap::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_image_new());
+}
+
+#endif // wxUSE_STATBMP
+