X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcf924a345ea8ffbc1cf6b40b5f75c6005e504c0..eda61172d06869da6cb1cfc9700cd44962078e5c:/src/gtk1/statbmp.cpp diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp index 30431837bf..d27737a420 100644 --- a/src/gtk1/statbmp.cpp +++ b/src/gtk1/statbmp.cpp @@ -28,31 +28,31 @@ 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, +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()) { 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 ); @@ -61,20 +61,20 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi { m_widget = gtk_label_new( "Bitmap" ); } - + m_parent->DoAddChild( this ); - + PostCreation(); - + Show( TRUE ); - + return TRUE; } -void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) +void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) { m_bitmap = bitmap; - + if (m_bitmap.Ok()) { GdkBitmap *mask = (GdkBitmap *) NULL;