X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/999836aacade840a5d9a0cbb5fad7b1d4de62c93..c0b0635cf69537ca32377bad5650b39402cb21b6:/src/generic/imaglist.cpp

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 5fa3b027cd..8c7f6898d3 100644
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -7,6 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef __PALMOS__
+
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "imaglist.h"
 #endif
@@ -29,7 +31,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject)
 
-#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
+#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
 /*
  * wxImageList has to be a real class or we have problems with
  * the run-time information.
@@ -45,6 +47,7 @@ wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int in
 
 wxGenericImageList::~wxGenericImageList()
 {
+    (void)RemoveAll();
 }
 
 int wxGenericImageList::GetImageCount() const
@@ -62,7 +65,7 @@ bool wxGenericImageList::Create( int width, int height, bool WXUNUSED(mask), int
 
 bool wxGenericImageList::Create()
 {
-    return TRUE;
+    return true;
 }
 
 int wxGenericImageList::Add( const wxBitmap &bitmap )
@@ -107,7 +110,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap )
 {
     wxList::compatibility_iterator node = m_images.Item( index );
 
-    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))) ?
                              #if defined(__VISAGECPP__)
@@ -133,19 +136,19 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap )
         m_images.Insert( next, newBitmap );
     }
 
-    return TRUE;
+    return true;
 }
 
 bool wxGenericImageList::Remove( int index )
 {
     wxList::compatibility_iterator node = m_images.Item( index );
 
-    wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+    wxCHECK_MSG( node, false, wxT("wrong index in image list") );
 
     delete node->GetData();
     m_images.Erase( node );
 
-    return TRUE;
+    return true;
 }
 
 bool wxGenericImageList::RemoveAll()
@@ -153,7 +156,7 @@ bool wxGenericImageList::RemoveAll()
     WX_CLEAR_LIST(wxList, m_images);
     m_images.Clear();
 
-    return TRUE;
+    return true;
 }
 
 bool wxGenericImageList::GetSize( int index, int &width, int &height ) const
@@ -163,13 +166,13 @@ bool wxGenericImageList::GetSize( int index, int &width, int &height ) const
 
     wxList::compatibility_iterator node = m_images.Item( index );
 
-    wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+    wxCHECK_MSG( node, false, wxT("wrong index in image list") );
 
     wxBitmap *bm = (wxBitmap*)node->GetData();
     width = bm->GetWidth();
     height = bm->GetHeight();
 
-    return TRUE;
+    return true;
 }
 
 bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
@@ -177,7 +180,7 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
 {
     wxList::compatibility_iterator node = m_images.Item( index );
 
-    wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+    wxCHECK_MSG( node, false, wxT("wrong index in image list") );
 
     wxBitmap *bm = (wxBitmap*)node->GetData();
 
@@ -186,7 +189,7 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
     else
         dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
 
-    return TRUE;
+    return true;
 }
 
-
+#endif // __PALMOS__