Fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 11e51fbe9d2f4576ef7df4e7081d6679ce9e5998..3717de96b0c07742969d905a2edb951d5e21d9d6 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -17,6 +17,7 @@
 
 #include "wx/defs.h"
 #include "wx/list.h"
 
 #include "wx/defs.h"
 #include "wx/list.h"

+#include "wx/icon.h"

 
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxBitmap;
 
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxBitmap;

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index f1ab5376d5d9ce265de2aabba8e80823ca72830c..51b6970d5ffbbc71f7ed23c3ae195cff4f6bc032 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -117,7 +117,7 @@ const wxBitmap *wxGenericImageList::GetBitmapPtr( int index ) const
 }
 
 // Get the bitmap
 }
 
 // Get the bitmap

-wxBitmap wxImageList::GetBitmap(int index) const
+wxBitmap wxGenericImageList::GetBitmap(int index) const

 {
     const wxBitmap* bmp = GetBitmapPtr(index);
     if (bmp)
 {
     const wxBitmap* bmp = GetBitmapPtr(index);
     if (bmp)


@@ -127,7 +127,7 @@ wxBitmap wxImageList::GetBitmap(int index) const
 }
 
 // Get the icon
 }
 
 // Get the icon

-wxIcon wxImageList::GetIcon(int index) const
+wxIcon wxGenericImageList::GetIcon(int index) const

 {
     const wxBitmap* bmp = GetBitmapPtr(index);
     if (bmp)
 {
     const wxBitmap* bmp = GetBitmapPtr(index);
     if (bmp)