X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31528cd3cac75558beef4bce0ba21fd182a808ab..8b260fbe33b67311ab69043e8fb1bc4c4d7ac1f2:/src/gtk1/statbmp.cpp diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp index e46ae8134d..e86af74122 100644 --- a/src/gtk1/statbmp.cpp +++ b/src/gtk1/statbmp.cpp @@ -37,7 +37,7 @@ 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() ) @@ -58,9 +58,12 @@ 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; @@ -71,9 +74,7 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi 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 ); + SetSizeOrDefault( size ); } else { @@ -111,8 +112,16 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask ); } - SetSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() ); + SetSizeOrDefault(); } } +wxSize wxStaticBitmap::DoGetBestSize() const +{ + if ( m_bitmap.Ok() ) + return wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight()); + else + return wxSize(16, 16); // completely arbitrary +} + #endif