Fixed some compile errors (MSVC++ 6) and some very strange link errors when

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

diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index 524bfe575b0b9219e5031a01d8f7a204ee54dedf..f9e6700b8fead69f0477515021ff53e7f8b186c6 100644 (file)
--- a/src/gtk/statbmp.cpp
+++ b/src/gtk/statbmp.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:           wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -13,6 +13,11 @@
 
 #include "wx/statbmp.h"
 
 
 #include "wx/statbmp.h"
 

+#if wxUSE_STATBMP
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+

 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------


@@ -23,55 +28,96 @@ 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 )
 {
       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(), _T("should only be called if we have a bitmap") );
+

     GdkBitmap *mask = (GdkBitmap *) NULL;
     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 );
     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 );
+
+    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( _T("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();
+        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();
+    }
+
+    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 );
+        }
+
+        SetSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() );
+    }

 }
 }

+
+#endif