compilation fix for PCH-less compilation after the last change

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

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index cedfb1bdee1eb18de6bdbd380df5cd07ae71d642..509044fadd07793d96358f95297c4f7903383081 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
 
+    virtual bool IsOk() const { return !m_icons.empty(); }
+
 protected:
     wxIconArray m_icons;
 
-    friend class WXDLLEXPORT wxIconBundle;
+    friend class wxIconBundle;
 };
 
 // ============================================================================
@@ -64,13 +66,11 @@ protected:
 wxIconBundle::wxIconBundle()
             : wxGDIObject()
 {
-    m_refData = new wxIconBundleRefData;
 }
 
-wxIconBundle::wxIconBundle(const wxString& file, long type)
+wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type)
             : wxGDIObject()
 {
-    m_refData = new wxIconBundleRefData;
     AddIcon(file, type);
 }
 
@@ -83,33 +83,25 @@ wxIconBundle::wxIconBundle(const wxIconBundle& icon)
 wxIconBundle::wxIconBundle(const wxIcon& icon)
             : wxGDIObject()
 {
-    m_refData = new wxIconBundleRefData;
     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));
 }
 
 void wxIconBundle::DeleteIcons()
 {
-    wxIconBundleRefData* ref = new wxIconBundleRefData();
     UnRef();
-    m_refData = ref;
-}
-
-bool wxIconBundle::IsOk() const
-{
-    return M_ICONBUNDLEDATA && !M_ICONBUNDLEDATA->m_icons.IsEmpty();
 }
 
-void wxIconBundle::AddIcon(const wxString& file, long type)
+void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
 {
 #ifdef __WXMAC__
     // Deal with standard icons
@@ -184,7 +176,7 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const
 
                 // the best icon is by default (arbitrarily) the first one but
                 // if we find a system-sized icon, take it instead
-                if ( sx == sysX && sy == sysY || !iconBest.IsOk() )
+                if ((sx == sysX && sy == sysY) || !iconBest.IsOk())
                     iconBest = icon;
             }
     }
@@ -196,6 +188,18 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const
 #endif
 }
 
+wxIcon wxIconBundle::GetIconOfExactSize(const wxSize& size) const
+{
+    wxIcon icon = GetIcon(size);
+    if ( icon.Ok() &&
+            (icon.GetWidth() != size.x || icon.GetHeight() != size.y) )
+    {
+        icon = wxNullIcon;
+    }
+
+    return icon;
+}
+
 void wxIconBundle::AddIcon(const wxIcon& icon)
 {
     wxCHECK_RET( icon.IsOk(), _T("invalid icon") );
@@ -234,3 +238,4 @@ wxIcon wxIconBundle::GetIconByIndex(size_t n) const
     return M_ICONBUNDLEDATA->m_icons[n];
 }
 
+