X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a56f55c02d718e9da7574807cb01e4d2cf6a1fa..3201a1046ba71ba8e5ef2ed694fde34d12f743f3:/src/gtk/statbmp.cpp diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp index 9b8d050d61..6d6f82649c 100644 --- a/src/gtk/statbmp.cpp +++ b/src/gtk/statbmp.cpp @@ -2,18 +2,21 @@ // Name: statbmp.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling +// 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 "gdk/gdk.h" +#include "gtk/gtk.h" + //----------------------------------------------------------------------------- // wxStaticBitmap //----------------------------------------------------------------------------- @@ -22,58 +25,70 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl) wxStaticBitmap::wxStaticBitmap(void) { -}; +} + +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 ); +} -wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, - const wxPoint &pos, const wxSize &size, - const 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 ) { - Create( parent, id, bitmap, 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; + + m_widget = gtk_image_new(); + + if (bitmap.Ok()) + SetBitmap(bitmap); -bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, - const wxPoint &pos, const wxSize &size, - const long style, const wxString &name ) + PostCreation(size); + m_parent->DoAddChild( this ); + + return true; +} + +void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) { - m_needParent = TRUE; - - wxSize newSize = size; - - PreCreation( parent, id, pos, size, style, name ); - - m_bitmap = bitmap; - - if (m_bitmap.Ok()) - { - GdkBitmap *mask = 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 ); - } - else - { - m_widget = gtk_label_new( "Bitmap" ); - } - - PostCreation(); - - Show( TRUE ); - - return TRUE; -}; - -void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) + m_bitmap = bitmap; + + if (m_bitmap.Ok()) + { + GdkBitmap *mask = (GdkBitmap *) NULL; + if (m_bitmap.GetMask()) + mask = m_bitmap.GetMask()->GetBitmap(); + + if (m_bitmap.HasPixbuf()) + { + 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); + + InvalidateBestSize(); + SetSize(GetBestSize()); + } +} + +// static +wxVisualAttributes +wxStaticBitmap::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - m_bitmap = bitmap; - - if (m_bitmap.Ok()) - { - GdkBitmap *mask = NULL; - if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap(); - gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask ); - } -}; + // TODO: overload to allow using gtk_pixmap_new? + return GetDefaultAttributesFromGTKWidget(gtk_label_new); +} + +#endif // wxUSE_STATBMP