X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee6db21e41cb61c310162720bfd5f7a1ef90b01d..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/gtk1/statbmp.cpp diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp index 98c62d2447..c92e00c40c 100644 --- a/src/gtk1/statbmp.cpp +++ b/src/gtk1/statbmp.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.cpp +// Name: src/gtk1/statbmp.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,14 +7,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "statbmp.h" -#endif - -#include "wx/statbmp.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_STATBMP +#include "wx/statbmp.h" + #include "gdk/gdk.h" #include "gtk/gtk.h" @@ -22,8 +21,6 @@ // wxStaticBitmap //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl) - wxStaticBitmap::wxStaticBitmap(void) { } @@ -35,22 +32,12 @@ wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap Create( parent, id, bitmap, pos, size, style, name ); } -void wxStaticBitmap::CreatePixmapWidget() -{ - wxCHECK_RET( m_bitmap.Ok(), _T("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 ); - - PostCreation(); -} +// empty bitmap, so that we can create GtkPixmap widget: +static char * bogus_xpm[] = { +"2 2 1 1", +" c None", +" ", +" "}; bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, const wxPoint &pos, const wxSize &size, @@ -58,61 +45,51 @@ 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("wxStaticBitmap creation failed") ); + return false; + } m_bitmap = bitmap; - if (m_bitmap.Ok()) - { - GdkBitmap *mask = (GdkBitmap *) NULL; - if ( m_bitmap.GetMask() ) - mask = m_bitmap.GetMask()->GetBitmap(); - m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask ); + wxBitmap bmp(bitmap.IsOk() ? bitmap : wxBitmap(bogus_xpm)); + m_widget = gtk_pixmap_new(bmp.GetPixmap(), NULL); - if (newSize.x == -1) newSize.x = m_bitmap.GetWidth(); - if (newSize.y == -1) newSize.y = m_bitmap.GetHeight(); - SetSize( newSize.x, newSize.y ); - } - else - { - m_widget = gtk_label_new( "Bitmap" ); + if (bitmap.IsOk()) + SetBitmap(bitmap); - PostCreation(); - } - + PostCreation(size); m_parent->DoAddChild( this ); - Show( TRUE ); - - return TRUE; + return true; } void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) { - bool hasWidget = m_bitmap.Ok(); m_bitmap = bitmap; - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { - if (!hasWidget) - { - gtk_widget_destroy( m_widget ); - - /* 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 ); - } - - SetSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() ); + GdkBitmap *mask = NULL; + if (m_bitmap.GetMask()) + mask = m_bitmap.GetMask()->GetBitmap(); + + gtk_pixmap_set(GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask); + + InvalidateBestSize(); + SetSize(GetBestSize()); } } -#endif +// static +wxVisualAttributes +wxStaticBitmap::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + // TODO: overload to allow using gtk_pixmap_new? + return GetDefaultAttributesFromGTKWidget(gtk_label_new); +} + +#endif // wxUSE_STATBMP +