X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd362275b853cc0308bbde6a60bb2525d659f709..6ba718d7aee2f519d9146b90424ccec9e2243479:/src/generic/imaglist.cpp?ds=sidebyside diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp index d6d4b9bba1..ba98cc4003 100644 --- a/src/generic/imaglist.cpp +++ b/src/generic/imaglist.cpp @@ -2,7 +2,6 @@ // Name: src/generic/imaglist.cpp // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -68,7 +67,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 ) ); } @@ -155,7 +154,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) @@ -188,7 +187,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) @@ -263,7 +262,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 );