X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..70687b638d5860a91a53aecec2a43d838d925372:/src/gtk1/statbmp.cpp?ds=sidebyside

diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp
index 186947afb2..91b5df6215 100644
--- a/src/gtk1/statbmp.cpp
+++ b/src/gtk1/statbmp.cpp
@@ -11,10 +11,12 @@
 #pragma implementation "statbmp.h"
 #endif
 
-#include "wx/statbmp.h"
+#include "wx/defs.h"
 
 #if wxUSE_STATBMP
 
+#include "wx/statbmp.h"
+
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
@@ -37,18 +39,20 @@ 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() )
         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 );
 
+    m_focusWidget = m_widget;
+
     PostCreation();
 }
 
@@ -61,28 +65,26 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
-        wxFAIL_MSG( T("wxXX creation failed") );
-	return FALSE;
+        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();
         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 );
+        SetBestSize( size );
     }
     else
     {
         m_widget = gtk_label_new( "Bitmap" );
+        
+        m_focusWidget = m_widget;
 
         PostCreation();
     }
@@ -116,8 +118,9 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
             gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask );
         }
 
-        SetSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() );
+        SetBestSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight()));
     }
 }
 
-#endif
+#endif // wxUSE_STATBMP
+