X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..38aa6e420c1dde8dc8c2a6512a314328bcf8a28f:/src/gtk/statbmp.cpp?ds=inline diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp index 6312440917..7bc4035a18 100644 --- a/src/gtk/statbmp.cpp +++ b/src/gtk/statbmp.cpp @@ -4,13 +4,9 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "statbmp.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -38,25 +34,6 @@ wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap Create( parent, id, bitmap, pos, size, style, name ); } -void wxStaticBitmap::CreatePixmapWidget() -{ - 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(wxDefaultSize); -} - bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, const wxPoint &pos, const wxSize &size, long style, const wxString &name ) @@ -66,54 +43,44 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { - wxFAIL_MSG( wxT("wxXX creation failed") ); - return FALSE; + 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 ); - } - else - { - m_widget = gtk_label_new( "Bitmap" ); - m_focusWidget = m_widget; - } + m_widget = gtk_image_new(); + + if (bitmap.Ok()) + SetBitmap(bitmap); PostCreation(size); m_parent->DoAddChild( this ); - return TRUE; + return true; } void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) { - bool hasWidget = m_bitmap.Ok(); m_bitmap = bitmap; if (m_bitmap.Ok()) { - if (!hasWidget) - { - gtk_widget_destroy( m_widget ); + GdkBitmap *mask = (GdkBitmap *) NULL; + if (m_bitmap.GetMask()) + mask = m_bitmap.GetMask()->GetBitmap(); - /* recreate m_widget because we've created a label - and not a bitmap above */ - CreatePixmapWidget(); - } - else + if (m_bitmap.HasPixbuf()) { - GdkBitmap *mask = (GdkBitmap *) NULL; - if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap(); - gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask ); + gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget), + m_bitmap.GetPixbuf()); } + else + gtk_image_set_from_pixmap(GTK_IMAGE(m_widget), + m_bitmap.GetPixmap(), mask); - SetBestSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight())); + InvalidateBestSize(); + SetSize(GetBestSize()); } }