don't call SelectObject() twice in SetBrush() nor SetFont() neither

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

diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp
index 392fa2fa4c6e39422112d0cd5b4fe7b15b6f1a0b..e069dbfbf22ac9659e099c53b602184ee06c3aa3 100644 (file)
--- a/src/gtk1/statbmp.cpp
+++ b/src/gtk1/statbmp.cpp
@@ -7,11 +7,12 @@
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "statbmp.h"
 #endif
 
 #pragma implementation "statbmp.h"
 #endif
 

-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_STATBMP
 
 
 #if wxUSE_STATBMP
 


@@ -46,11 +47,13 @@ void wxStaticBitmap::CreatePixmapWidget()
         mask = m_bitmap.GetMask()->GetBitmap();
     m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
 
         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_parent->m_insertCallback)(m_parent, this);
 
     gtk_widget_show( m_widget );
 

+    m_focusWidget = m_widget;
+

     PostCreation();
 }
 
     PostCreation();
 }
 


@@ -64,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") );
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxXX creation failed") );

-       return FALSE;
+    return FALSE;

     }
 
     m_bitmap = bitmap;
     }
 
     m_bitmap = bitmap;


@@ -81,6 +84,8 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
     else
     {
         m_widget = gtk_label_new( "Bitmap" );
     else
     {
         m_widget = gtk_label_new( "Bitmap" );

+        
+        m_focusWidget = m_widget;

 
         PostCreation();
     }
 
         PostCreation();
     }