use wxDIB object instead of static ConvertFromBitmap() in CF_DIB case

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

diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index 524bfe575b0b9219e5031a01d8f7a204ee54dedf..e069dbfbf22ac9659e099c53b602184ee06c3aa3 100644 (file)
--- a/src/gtk/statbmp.cpp
+++ b/src/gtk/statbmp.cpp
@@ -4,15 +4,23 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #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 "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
@@ -23,55 +31,97 @@ 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 )
+void wxStaticBitmap::CreatePixmapWidget()
 {
-  m_needParent = TRUE;
-  
-  wxSize newSize = size;
-  
-  PreCreation( parent, id, pos, size, style, name );
-
-  m_bitmap = bitmap;
-    
-  if (m_bitmap.Ok())
-  {
+    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();
+    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;
+
+    // insert GTK representation
+    (*m_parent->m_insertCallback)(m_parent, this);
+
+    gtk_widget_show( m_widget );
+
+    m_focusWidget = m_widget;
+
+    PostCreation();
 }
 
-void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) 
+bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
+                             const wxPoint &pos, const wxSize &size,
+                             long style, const wxString &name )
 {
-  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 );
-  }
+    m_needParent = TRUE;
+
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxXX 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 );
+
+        SetBestSize( size );
+    }
+    else
+    {
+        m_widget = gtk_label_new( "Bitmap" );
+        
+        m_focusWidget = m_widget;
+
+        PostCreation();
+    }
+
+    m_parent->DoAddChild( this );
+
+    Show( 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 );
+        }
+
+        SetBestSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight()));
+    }
+}
+
+#endif // wxUSE_STATBMP
+