X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f68586e51b20dccee3fd5645aeaca7cc8ff298c2..2f35f36bbcde256c802a4e0871c3d74e39ee476c:/src/gtk1/statbmp.cpp

diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp
index e86af74122..48a8dafe73 100644
--- a/src/gtk1/statbmp.cpp
+++ b/src/gtk1/statbmp.cpp
@@ -7,14 +7,17 @@
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "statbmp.h"
 #endif
 
-#include "wx/statbmp.h"
+// 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"
 
@@ -44,12 +47,14 @@ void wxStaticBitmap::CreatePixmapWidget()
         mask = m_bitmap.GetMask()->GetBitmap();
     m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
 
-    /* insert GTK representation */
+    // insert GTK representation
     (*m_parent->m_insertCallback)(m_parent, this);
 
     gtk_widget_show( m_widget );
 
-    PostCreation();
+    m_focusWidget = m_widget;
+
+    PostCreation(wxDefaultSize);
 }
 
 bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
@@ -62,7 +67,7 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxXX creation failed") );
-	return FALSE;
+    return FALSE;
     }
 
     m_bitmap = bitmap;
@@ -73,20 +78,16 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
         if ( m_bitmap.GetMask() )
             mask = m_bitmap.GetMask()->GetBitmap();
         m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
-
-        SetSizeOrDefault( size );
     }
     else
     {
         m_widget = gtk_label_new( "Bitmap" );
-
-        PostCreation();
+        m_focusWidget = m_widget;
     }
 
+    PostCreation(size);
     m_parent->DoAddChild( this );
 
-    Show( TRUE );
-
     return TRUE;
 }
 
@@ -112,16 +113,17 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
             gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask );
         }
 
-        SetSizeOrDefault();
+        SetBestSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight()));
     }
 }
 
-wxSize wxStaticBitmap::DoGetBestSize() const
+// static
+wxVisualAttributes
+wxStaticBitmap::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    if ( m_bitmap.Ok() )
-        return wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight());
-    else
-        return wxSize(16, 16);  // completely arbitrary
+    // TODO: overload to allow using gtk_pixmap_new?
+    return GetDefaultAttributesFromGTKWidget(gtk_label_new);
 }
 
-#endif
+#endif // wxUSE_STATBMP
+