OS/2 fixes

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

diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp
index 98c62d24478ee1dabc1fc8af5ad1253f045860bc..e86af74122a1580f3c71253da6927f55e997bfee 100644 (file)
--- a/src/gtk1/statbmp.cpp
+++ b/src/gtk1/statbmp.cpp
@@ -37,7 +37,7 @@ wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap
 
 void wxStaticBitmap::CreatePixmapWidget()
 {
-    wxCHECK_RET( m_bitmap.Ok(), _T("should only be called if we have a bitmap") );
+    wxCHECK_RET( m_bitmap.Ok(), wxT("should only be called if we have a bitmap") );
 
     GdkBitmap *mask = (GdkBitmap *) NULL;
     if ( m_bitmap.GetMask() )
@@ -46,7 +46,7 @@ void wxStaticBitmap::CreatePixmapWidget()
 
     /* insert GTK representation */
     (*m_parent->m_insertCallback)(m_parent, this);
-    
+
     gtk_widget_show( m_widget );
 
     PostCreation();
@@ -58,9 +58,12 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
 {
     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;
 
@@ -71,9 +74,7 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
             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 );
+        SetSizeOrDefault( size );
     }
     else
     {
@@ -81,7 +82,7 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
 
         PostCreation();
     }
-    
+
     m_parent->DoAddChild( this );
 
     Show( TRUE );
@@ -100,19 +101,27 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
         {
             gtk_widget_destroy( m_widget );
 
-            /* recreate m_widget because we've created a label 
-              and not a bitmap above */
+            /* recreate m_widget because we've created a label
+               and not a bitmap above */
             CreatePixmapWidget();
         }
-       else
-       {
+        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() );
+        }
+
+        SetSizeOrDefault();
     }
 }
 
+wxSize wxStaticBitmap::DoGetBestSize() const
+{
+    if ( m_bitmap.Ok() )
+        return wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight());
+    else
+        return wxSize(16, 16);  // completely arbitrary
+}
+
 #endif