let's not forget that \& has lower priority than == in C

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

diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp
index d27737a420a5ea35c956fe17474d62e202f6a2a7..74f494f6e9c13314376c0d5f588b80b46f611071 100644 (file)
--- a/src/gtk1/statbmp.cpp
+++ b/src/gtk1/statbmp.cpp
@@ -35,22 +35,45 @@ wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap
     Create( parent, id, bitmap, pos, size, style, name );
 }
 
+void wxStaticBitmap::CreatePixmapWidget()
+{
+    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();
+    m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
+
+    /* insert GTK representation */
+    (*m_parent->m_insertCallback)(m_parent, this);
+
+    gtk_widget_show( m_widget );
+
+    PostCreation();
+}
+
 bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
+                             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("wxXX creation failed") );
+       return FALSE;
+    }
 
     m_bitmap = bitmap;
 
     if (m_bitmap.Ok())
     {
+       wxSize newSize = size;
+
         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();
@@ -60,12 +83,12 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
     else
     {
         m_widget = gtk_label_new( "Bitmap" );
+
+        PostCreation();
     }
 
     m_parent->DoAddChild( this );
 
-    PostCreation();
-
     Show( TRUE );
 
     return TRUE;
@@ -73,13 +96,27 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
 
 void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
 {
+    bool hasWidget = m_bitmap.Ok();
     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 (!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 );
+        }
+
+        SetSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() );
     }
 }