Applied patch [ 1196679 ] wxIMPLEMENT_CLASS_COMMON2 bad parameter count compil fix.

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index f1ab5376d5d9ce265de2aabba8e80823ca72830c..3e3f71cd4692ffc4196f8a58e6f51c620c39ffec 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -14,6 +14,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_IMAGLIST
+
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
@@ -117,7 +119,7 @@ const wxBitmap *wxGenericImageList::GetBitmapPtr( int index ) const
 }
 
 // Get the bitmap
-wxBitmap wxImageList::GetBitmap(int index) const
+wxBitmap wxGenericImageList::GetBitmap(int index) const
 {
     const wxBitmap* bmp = GetBitmapPtr(index);
     if (bmp)
@@ -127,7 +129,7 @@ wxBitmap wxImageList::GetBitmap(int index) const
 }
 
 // Get the icon
-wxIcon wxImageList::GetIcon(int index) const
+wxIcon wxGenericImageList::GetIcon(int index) const
 {
     const wxBitmap* bmp = GetBitmapPtr(index);
     if (bmp)
@@ -226,4 +228,5 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
     return true;
 }
 
+#endif // wxUSE_IMAGLIST
 #endif // __WXPALMOS__