From 6f9921e15a3e2ef350b37adf6bc954632d9c148b Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Thu, 17 Nov 2011 03:20:25 +0000
Subject: [PATCH] fix missing and broken interface items for Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 interface/wx/icon.h     |  2 +-
 interface/wx/iconbndl.h | 19 ++++++++++---------
 interface/wx/iconloc.h  |  4 ++++
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/interface/wx/icon.h b/interface/wx/icon.h
index b574ce34f8..2c53691c00 100644
--- a/interface/wx/icon.h
+++ b/interface/wx/icon.h
@@ -50,7 +50,7 @@
     @see @ref overview_bitmap, @ref overview_bitmap_supportedformats,
          wxDC::DrawIcon, wxCursor
 */
-class wxIcon : public wxBitmap
+class wxIcon : public wxGDIObject
 {
 public:
     /**
diff --git a/interface/wx/iconbndl.h b/interface/wx/iconbndl.h
index e242d695c4..28c54ee38c 100644
--- a/interface/wx/iconbndl.h
+++ b/interface/wx/iconbndl.h
@@ -105,6 +105,16 @@ public:
     */
     wxIcon GetIconOfExactSize(const wxSize& size) const;
 
+    /**
+       return the number of available icons
+    */
+    size_t GetIconCount() const;
+
+    /**
+       return the icon at index (must be < GetIconCount())
+    */
+    wxIcon GetIconByIndex(size_t n) const;
+
     /**
         Returns @true if the bundle doesn't contain any icons, @false otherwise
         (in which case a call to GetIcon() with default parameter should return
@@ -117,15 +127,6 @@ public:
     */
     wxIconBundle& operator=(const wxIconBundle& ic);
 
-    /**
-        Equality operator. This returns @true if two icon bundles are equal.
-    */
-    bool operator ==(const wxIconBundle& ic);
-
-    /**
-        Inequality operator. This returns true if two icon bundles are not equal.
-    */
-    bool operator !=(const wxIconBundle& ic);
 };
 
 
diff --git a/interface/wx/iconloc.h b/interface/wx/iconloc.h
index 0c63350e23..3e9c9cbe47 100644
--- a/interface/wx/iconloc.h
+++ b/interface/wx/iconloc.h
@@ -34,5 +34,9 @@ public:
         @false otherwise.
     */
     bool IsOk() const;
+
+    void SetFileName(const wxString& filename);
+    const wxString& GetFileName() const;
+
 };