X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a93109d5926130130a73cb77272887dad4814521..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/gtk/statbmp.cpp?ds=sidebyside diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp index 69b6b571d6..19391bbb7e 100644 --- a/src/gtk/statbmp.cpp +++ b/src/gtk/statbmp.cpp @@ -1,81 +1,82 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.cpp +// Name: src/gtk/statbmp.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "statbmp.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if wxUSE_STATBMP #include "wx/statbmp.h" +#include + //----------------------------------------------------------------------------- // wxStaticBitmap //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl) - wxStaticBitmap::wxStaticBitmap(void) { } -wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, - const wxPoint &pos, const wxSize &size, +wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, + const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { Create( parent, id, bitmap, pos, size, style, name ); } -bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, - const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) +bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, + const wxPoint &pos, const wxSize &size, + long style, const wxString &name ) { - m_needParent = TRUE; - - wxSize newSize = size; - - PreCreation( parent, id, pos, size, style, name ); - - m_bitmap = bitmap; - - if (m_bitmap.Ok()) + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { - 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 ); + wxFAIL_MSG( wxT("wxStaticBitmap creation failed") ); + return false; } - else - { - m_widget = gtk_label_new( "Bitmap" ); - } - - m_parent->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); - - PostCreation(); - - Show( TRUE ); - - return TRUE; + + m_bitmap = bitmap; + + m_widget = gtk_image_new(); + g_object_ref(m_widget); + + if (bitmap.IsOk()) + SetBitmap(bitmap); + + PostCreation(size); + m_parent->DoAddChild( this ); + + return true; } -void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) +void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) { m_bitmap = bitmap; - - if (m_bitmap.Ok()) + + if (m_bitmap.IsOk()) { - GdkBitmap *mask = (GdkBitmap *) NULL; - if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap(); - gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask ); + // always use pixbuf, because pixmap mask does not + // work with disabled images in some themes + gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget), m_bitmap.GetPixbuf()); + + InvalidateBestSize(); + SetSize(GetBestSize()); } } + +// static +wxVisualAttributes +wxStaticBitmap::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_image_new()); +} + +#endif // wxUSE_STATBMP +