don't try to remove -g flag from CFLAGS, it is not necessary and doesn't work correct...

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

diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index e86af74122a1580f3c71253da6927f55e997bfee..91b5df62155b3956d524e49638ea3a6b6ba9e729 100644 (file)
--- a/src/gtk/statbmp.cpp
+++ b/src/gtk/statbmp.cpp
@@ -11,10 +11,12 @@
 #pragma implementation "statbmp.h"
 #endif
 
 #pragma implementation "statbmp.h"
 #endif
 

-#include "wx/statbmp.h"
+#include "wx/defs.h"

 
 #if wxUSE_STATBMP
 
 
 #if wxUSE_STATBMP
 

+#include "wx/statbmp.h"
+

 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 


@@ -44,11 +46,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();
 }
 


@@ -62,7 +66,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;


@@ -74,11 +78,13 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
             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 );
 

-        SetSizeOrDefault( size );
+        SetBestSize( size );

     }
     else
     {
         m_widget = gtk_label_new( "Bitmap" );
     }
     else
     {
         m_widget = gtk_label_new( "Bitmap" );

+        
+        m_focusWidget = m_widget;

 
         PostCreation();
     }
 
         PostCreation();
     }


@@ -112,16 +118,9 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
             gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask );
         }
 
             gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask );
         }
 

-        SetSizeOrDefault();
+        SetBestSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight()));

     }
 }
 
     }
 }
 

-wxSize wxStaticBitmap::DoGetBestSize() const
-{
-    if ( m_bitmap.Ok() )
-        return wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight());
-    else
-        return wxSize(16, 16);  // completely arbitrary
-}
+#endif // wxUSE_STATBMP

 
 

-#endif