X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..b58197f24a87e0dc81ba0bdd4fc1370470a5ae2f:/src/gtk/statbmp.cpp diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp index 5a35eb6156..7d752190cd 100644 --- a/src/gtk/statbmp.cpp +++ b/src/gtk/statbmp.cpp @@ -2,9 +2,8 @@ // Name: statbmp.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -14,6 +13,9 @@ #include "wx/statbmp.h" +#include "gdk/gdk.h" +#include "gtk/gtk.h" + //----------------------------------------------------------------------------- // wxStaticBitmap //----------------------------------------------------------------------------- @@ -22,58 +24,61 @@ 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 ); -}; + 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 ) { - m_needParent = TRUE; + m_needParent = TRUE; - wxSize newSize = size; + wxSize newSize = size; - PreCreation( parent, id, pos, size, style, name ); + PreCreation( parent, id, pos, size, style, name ); - m_bitmap = bitmap; + 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 (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 ); - 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 (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" ); + } + + m_parent->AddChild( this ); + + (m_parent->m_insertCallback)( m_parent, this ); - PostCreation(); + PostCreation(); - Show( TRUE ); + Show( TRUE ); - return TRUE; -}; + return TRUE; +} void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) { - m_bitmap = bitmap; + 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 ); - } -}; - + if (m_bitmap.Ok()) + { + GdkBitmap *mask = (GdkBitmap *) NULL; + if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap(); + gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask ); + } +}