document On{Open,Save}Document()

[wxWidgets.git] / src / common / iconbndl.cpp

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 961eb7f4a32e3f82735d5d95ad1590b62a12b9de..11b113004febe500cf47d35057e2c92b4ba7522e 100644 (file)
--- 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
 
 public:
     // default and copy ctors and assignment operators are ok
 

+    virtual bool IsOk() const { return !m_icons.empty(); }
+

 protected:
     wxIconArray m_icons;
 
 protected:
     wxIconArray m_icons;
 

-    friend class WXDLLEXPORT wxIconBundle;
+    friend class wxIconBundle;

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -84,12 +86,12 @@ wxIconBundle::wxIconBundle(const wxIcon& icon)
     AddIcon(icon);
 }
 
     AddIcon(icon);
 }
 

-wxObjectRefData *wxIconBundle::CreateRefData() const
+wxGDIRefData *wxIconBundle::CreateGDIRefData() const

 {
     return new wxIconBundleRefData;
 }
 
 {
     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));
 }
 {
     return new wxIconBundleRefData(*wx_static_cast(const wxIconBundleRefData *, data));
 }


@@ -99,11 +101,6 @@ void wxIconBundle::DeleteIcons()
     UnRef();
 }
 
     UnRef();
 }
 

-bool wxIconBundle::IsOk() const
-{
-    return M_ICONBUNDLEDATA && !M_ICONBUNDLEDATA->m_icons.IsEmpty();
-}
-

 void wxIconBundle::AddIcon(const wxString& file, long type)
 {
 #ifdef __WXMAC__
 void wxIconBundle::AddIcon(const wxString& file, long type)
 {
 #ifdef __WXMAC__