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

diff --git a/interface/wx/icon.h b/interface/wx/icon.h
index b574ce34f8854abbfb1ef06944319f3ac4e45d07..2c53691c0056fff18ee39cb4f7272f254c55aa8a 100644 (file)
--- 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 e242d695c46d67aecfb340fb2f437ece5d5202d7..28c54ee38cfdb6723ccff11794534c0f834dfdd0 100644 (file)
--- 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 0c63350e23e06776e82be7c8723673dc5b6ae737..3e9c9cbe47ac53a9d5ba24e5d3bb98b2211e12d8 100644 (file)
--- 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;
+
 };