X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c51a665c649f7579fb39e62070cef4f66b3210d..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/generic/imaglist.cpp?ds=sidebyside diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp index ee1c9d7bdd..4ca54a6e75 100644 --- a/src/generic/imaglist.cpp +++ b/src/generic/imaglist.cpp @@ -16,8 +16,6 @@ #if wxUSE_IMAGLIST && !defined(wxHAS_NATIVE_IMAGELIST) -#ifndef __WXPALMOS__ - #include "wx/imaglist.h" #ifndef WX_PRECOMP @@ -70,7 +68,7 @@ int wxGenericImageList::Add( const wxBitmap &bitmap ) const int index = int(m_images.GetCount()); - if (bitmap.IsKindOf(CLASSINFO(wxIcon))) + if (bitmap.IsKindOf(wxCLASSINFO(wxIcon))) { m_images.Append( new wxIcon( (const wxIcon&) bitmap ) ); } @@ -106,7 +104,7 @@ int wxGenericImageList::Add( const wxBitmap &bitmap ) int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask ) { wxBitmap bmp(bitmap); - if (mask.Ok()) + if (mask.IsOk()) bmp.SetMask(new wxMask(mask)); return Add(bmp); } @@ -157,7 +155,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap ) wxCHECK_MSG( node, false, wxT("wrong index in image list") ); - wxBitmap* newBitmap = (bitmap.IsKindOf(CLASSINFO(wxIcon))) ? + wxBitmap* newBitmap = (bitmap.IsKindOf(wxCLASSINFO(wxIcon))) ? #if defined(__VISAGECPP__) //just can't do this in VisualAge now, with all this new Bitmap-Icon stuff //so construct it from a bitmap object until I can figure this nonsense out. (DW) @@ -190,7 +188,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBit wxCHECK_MSG( node, false, wxT("wrong index in image list") ); - wxBitmap* newBitmap = (bitmap.IsKindOf(CLASSINFO(wxIcon))) ? + wxBitmap* newBitmap = (bitmap.IsKindOf(wxCLASSINFO(wxIcon))) ? #if defined(__VISAGECPP__) //just can't do this in VisualAge now, with all this new Bitmap-Icon stuff //so construct it from a bitmap object until I can figure this nonsense out. (DW) @@ -214,7 +212,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBit m_images.Insert( next, newBitmap ); } - if (mask.Ok()) + if (mask.IsOk()) newBitmap->SetMask(new wxMask(mask)); return true; @@ -265,7 +263,7 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y, wxBitmap *bm = (wxBitmap*)node->GetData(); - if (bm->IsKindOf(CLASSINFO(wxIcon))) + if (bm->IsKindOf(wxCLASSINFO(wxIcon))) dc.DrawIcon( * ((wxIcon*) bm), x, y); else dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 ); @@ -273,6 +271,4 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y, return true; } -#endif // __WXPALMOS__ - #endif // wxUSE_IMAGLIST