X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..8a31648287be0ef976f133de2786b137f1e98340:/src/gtk/statbmp.cpp

diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index 5a35eb6156..a1c66085e3 100644
--- a/src/gtk/statbmp.cpp
+++ b/src/gtk/statbmp.cpp
@@ -1,79 +1,83 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbmp.cpp
+// Name:        src/gtk/statbmp.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "statbmp.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_STATBMP
 
 #include "wx/statbmp.h"
 
+#include <gtk/gtk.h>
+
 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl)
-
 wxStaticBitmap::wxStaticBitmap(void)
 {
-};
+}
 
-wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, 
-      const wxPoint &pos, const wxSize &size, 
+wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
+      const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
-  Create( parent, id, bitmap, pos, size, style, name );
-};
+    Create( parent, id, bitmap, pos, size, style, name );
+}
 
-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 );
-
-  m_bitmap = bitmap;
-    
-  if (m_bitmap.Ok())
-  {
-    GdkBitmap *mask = NULL;
-    if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
-    m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
-    
-    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" );
-  }
-  
-  PostCreation();
-  
-  Show( TRUE );
-    
-  return TRUE;
-};
-
-void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) 
+    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_widget = gtk_image_new();
+    g_object_ref(m_widget);
+
+    if (bitmap.IsOk())
+        SetBitmap(bitmap);
+
+    PostCreation(size);
+    m_parent->DoAddChild( this );
+
+    return true;
+}
+
+void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
 {
-  m_bitmap = bitmap;
-  
-  if (m_bitmap.Ok())
-  {
-    GdkBitmap *mask = NULL;
-    if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
-    gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask );
-  }
-};
+    m_bitmap = bitmap;
+
+    if (m_bitmap.IsOk())
+    {
+        // 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());
+    }
+}
+
+// static
+wxVisualAttributes
+wxStaticBitmap::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    // TODO: overload to allow using gtk_pixmap_new?
+    return GetDefaultAttributesFromGTKWidget(gtk_label_new);
+}
+
+#endif // wxUSE_STATBMP