Fixed wxRichTextCtrl caret test case

[wxWidgets.git] / src / generic / imaglist.cpp

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 8dddab3540e8be9feedffea85a82035c09cc34ef..4ca54a6e75fbd1c909989f3f1dabe65a529f8f1b 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -16,8 +16,6 @@
 
 #if wxUSE_IMAGLIST && !defined(wxHAS_NATIVE_IMAGELIST)
 
 
 #if wxUSE_IMAGLIST && !defined(wxHAS_NATIVE_IMAGELIST)
 

-#ifndef __WXPALMOS__
-

 #include "wx/imaglist.h"
 
 #ifndef WX_PRECOMP
 #include "wx/imaglist.h"
 
 #ifndef WX_PRECOMP


@@ -70,13 +68,13 @@ int wxGenericImageList::Add( const wxBitmap &bitmap )
 
     const int index = int(m_images.GetCount());
 
 
     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 ) );
     }
     else
     {
     {
         m_images.Append( new wxIcon( (const wxIcon&) bitmap ) );
     }
     else
     {

-        // Mimic behavior of Windows ImageList_Add that automatically breaks up the added
+        // Mimic behaviour of Windows ImageList_Add that automatically breaks up the added

         // bitmap into sub-images of the correct size
         if (m_width > 0 && bitmap.GetWidth() > m_width && bitmap.GetHeight() >= m_height)
         {
         // bitmap into sub-images of the correct size
         if (m_width > 0 && bitmap.GetWidth() > m_width && bitmap.GetHeight() >= m_height)
         {


@@ -106,7 +104,7 @@ int wxGenericImageList::Add( const wxBitmap &bitmap )
 int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
 {
     wxBitmap bmp(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);
 }
         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") );
 
 
     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)
                              #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") );
 
 
     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)
                              #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 );
     }
 
         m_images.Insert( next, newBitmap );
     }
 

-    if (mask.Ok())
+    if (mask.IsOk())

         newBitmap->SetMask(new wxMask(mask));
 
     return true;
         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();
 
 
     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 );
         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;
 }
 
     return true;
 }
 

-#endif // __WXPALMOS__
-

 #endif // wxUSE_IMAGLIST
 #endif // wxUSE_IMAGLIST