X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f92722960b2a15f813cc62a23ecb321bc0555099..5d5da6f610400c6a6a7886b154adeb8a69772f98:/src/gtk/statbmp.cpp diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp index 8027044d5a..91b5df6215 100644 --- a/src/gtk/statbmp.cpp +++ b/src/gtk/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,13 +39,20 @@ wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap void wxStaticBitmap::CreatePixmapWidget() { - wxCHECK_RET( m_bitmap.Ok(), "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 + (*m_parent->m_insertCallback)(m_parent, this); + + gtk_widget_show( m_widget ); + + m_focusWidget = m_widget; + PostCreation(); } @@ -53,27 +62,33 @@ 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; if (m_bitmap.Ok()) { - CreatePixmapWidget(); + 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(); } - PostCreation(); - m_parent->DoAddChild( this ); Show( TRUE ); @@ -88,19 +103,24 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) if (m_bitmap.Ok()) { - if ( !hasWidget ) + if (!hasWidget) { gtk_widget_destroy( m_widget ); - // recreate m_widget because we'd created a label and not a bitmap - // above + /* recreate m_widget because we've created a label + and not a bitmap above */ CreatePixmapWidget(); } + 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 ); + } - GdkBitmap *mask = (GdkBitmap *) NULL; - if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap(); - gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask ); + SetBestSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight())); } } -#endif +#endif // wxUSE_STATBMP +