1. minor fixes in wxDynLib

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

diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp
index 7d752190cd6d68dae5477aabdd4bbf9bc55636dd..ac1b7529b83ea6b1bd96a296a3884582ee221cc3 100644 (file)
--- a/src/gtk1/statbmp.cpp
+++ b/src/gtk1/statbmp.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -13,6 +13,8 @@
 
 #include "wx/statbmp.h"
 
+#if wxUSE_STATBMP
+
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
@@ -26,31 +28,41 @@ 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 )
+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 )
 {
     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 );
-    
+        CreatePixmapWidget();
+
         if (newSize.x == -1) newSize.x = m_bitmap.GetWidth();
         if (newSize.y == -1) newSize.y = m_bitmap.GetHeight();
         SetSize( newSize.x, newSize.y );
@@ -58,27 +70,37 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
     else
     {
         m_widget = gtk_label_new( "Bitmap" );
+
+        PostCreation();
     }
-  
-    m_parent->AddChild( this );
 
-    (m_parent->m_insertCallback)( m_parent, this );
-  
-    PostCreation();
-  
+    m_parent->DoAddChild( this );
+
     Show( TRUE );
-    
+
     return TRUE;
 }
 
-void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) 
+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'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 );
     }
 }
+
+#endif