X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b5933bcbc58f62ba5e3423cbf56a7064c00b62e..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/common/iconbndl.cpp

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 961eb7f4a3..11b113004f 100644
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -51,10 +51,12 @@ class WXDLLEXPORT wxIconBundleRefData : public wxGDIRefData
 public:
     // default and copy ctors and assignment operators are ok
 
+    virtual bool IsOk() const { return !m_icons.empty(); }
+
 protected:
     wxIconArray m_icons;
 
-    friend class WXDLLEXPORT wxIconBundle;
+    friend class wxIconBundle;
 };
 
 // ============================================================================
@@ -84,12 +86,12 @@ wxIconBundle::wxIconBundle(const wxIcon& icon)
     AddIcon(icon);
 }
 
-wxObjectRefData *wxIconBundle::CreateRefData() const
+wxGDIRefData *wxIconBundle::CreateGDIRefData() const
 {
     return new wxIconBundleRefData;
 }
 
-wxObjectRefData *wxIconBundle::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxIconBundle::CloneGDIRefData(const wxGDIRefData *data) const
 {
     return new wxIconBundleRefData(*wx_static_cast(const wxIconBundleRefData *, data));
 }
@@ -99,11 +101,6 @@ void wxIconBundle::DeleteIcons()
     UnRef();
 }
 
-bool wxIconBundle::IsOk() const
-{
-    return M_ICONBUNDLEDATA && !M_ICONBUNDLEDATA->m_icons.IsEmpty();
-}
-
 void wxIconBundle::AddIcon(const wxString& file, long type)
 {
 #ifdef __WXMAC__