Fix scrolling bug where client size was reported wrong

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

diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index ad12ed7cf20e36f4544ee1a55c23ab656aa91903..7bc4035a1830fab6072596d42d820c8a7c7d5204 100644 (file)
--- a/src/gtk/statbmp.cpp
+++ b/src/gtk/statbmp.cpp
@@ -7,14 +7,13 @@
 // 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 "wx/statbmp.h"
+
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
@@ -28,68 +27,70 @@ 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 );
 }
 
-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 = (GdkBitmap *) 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
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
-        m_widget = gtk_label_new( "Bitmap" );
+        wxFAIL_MSG( wxT("wxStaticBitmap creation failed") );
+        return false;
     }
-  
+
+    m_bitmap = bitmap;
+
+    m_widget = gtk_image_new();
+
+    if (bitmap.Ok())
+        SetBitmap(bitmap);
+
+    PostCreation(size);
     m_parent->DoAddChild( this );
-  
-    PostCreation();
-  
-    Show( TRUE );
-    
-    return TRUE;
+
+    return true;
 }
 
-void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) 
+void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
 {
     m_bitmap = bitmap;
-  
+
     if (m_bitmap.Ok())
     {
         GdkBitmap *mask = (GdkBitmap *) NULL;
-        if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
-        gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask );
+        if (m_bitmap.GetMask())
+            mask = m_bitmap.GetMask()->GetBitmap();
+
+        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);
+
+        InvalidateBestSize();
+        SetSize(GetBestSize());
     }
 }
 
-wxIcon& wxStaticBitmap::GetIcon()
+// static
+wxVisualAttributes
+wxStaticBitmap::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    wxIcon *icon = wxDynamicCast(&m_bitmap, wxIcon);
-    
-    if (!icon) return wxNullIcon;
-    
-    return *icon;
+    // TODO: overload to allow using gtk_pixmap_new?
+    return GetDefaultAttributesFromGTKWidget(gtk_label_new);
 }
 
-#endif
+#endif // wxUSE_STATBMP
+