Added separate SetFocusOnCanvas() function so that m_editorFocused will be more relia...

[wxWidgets.git] / include / wx / iconbndl.h

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index c3f50a170fe51b8d53d1abc8ab41194e9413182b..75aa51c653a53131bf3e11159644b90d06dd3766 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -17,6 +17,8 @@
 #include "wx/gdicmn.h"
 #include "wx/icon.h"
 
+WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
+
 // this class can't load bitmaps of type wxBITMAP_TYPE_ICO_RESOURCE,
 // if you need them, you have to load them manually and call
 // wxIconCollection::AddIcon
@@ -77,8 +79,9 @@ public:
             AddIcon(file, (wxBitmapType)type);
         }
     )
-
-    wxDEPRECATED( wxIconBundle(const wxString& file, long type)
+    // explicitly specifying inline allows gcc < 3.4 to
+    // handle the deprecation attribute even in the constructor.
+    wxDEPRECATED( inline wxIconBundle (const wxString& file, long type)
         {
             AddIcon(file, (wxBitmapType)type);
         }