X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/gtk1/statbmp.cpp?ds=sidebyside diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp index afd002c187..c92e00c40c 100644 --- a/src/gtk1/statbmp.cpp +++ b/src/gtk1/statbmp.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.cpp +// Name: src/gtk1/statbmp.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -21,8 +21,6 @@ // wxStaticBitmap //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl) - wxStaticBitmap::wxStaticBitmap(void) { } @@ -37,7 +35,7 @@ wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap // empty bitmap, so that we can create GtkPixmap widget: static char * bogus_xpm[] = { "2 2 1 1", -" c None", +" c None", " ", " "}; @@ -56,10 +54,10 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi m_bitmap = bitmap; - wxBitmap bmp(bitmap.Ok() ? bitmap : wxBitmap(bogus_xpm)); + wxBitmap bmp(bitmap.IsOk() ? bitmap : wxBitmap(bogus_xpm)); m_widget = gtk_pixmap_new(bmp.GetPixmap(), NULL); - if (bitmap.Ok()) + if (bitmap.IsOk()) SetBitmap(bitmap); PostCreation(size); @@ -72,7 +70,7 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) { m_bitmap = bitmap; - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { GdkBitmap *mask = NULL; if (m_bitmap.GetMask())