X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/527343602e91d60c65fb7589a6ddcf4683930c78..fad92e2f367f5c37ba4d80c9b57a4453e86c6ac2:/src/common/iconbndl.cpp

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 19ede4871a..ff0f827573 100644
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -8,14 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -27,7 +19,6 @@
 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
-    #include "wx/icon.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/bitmap.h"
@@ -35,12 +26,11 @@
 #endif
 
 #include "wx/arrimpl.cpp"
-
 WX_DEFINE_OBJARRAY(wxIconArray)
 
 IMPLEMENT_DYNAMIC_CLASS(wxIconBundle, wxGDIObject)
 
-#define M_ICONBUNDLEDATA ((wxIconBundleRefData *)m_refData)
+#define M_ICONBUNDLEDATA static_cast<wxIconBundleRefData*>(m_refData)
 
 // ----------------------------------------------------------------------------
 // wxIconBundleRefData
@@ -51,10 +41,9 @@ class WXDLLEXPORT wxIconBundleRefData : public wxGDIRefData
 public:
     // default and copy ctors and assignment operators are ok
 
-protected:
-    wxIconArray m_icons;
+    virtual bool IsOk() const { return !m_icons.empty(); }
 
-    friend class WXDLLEXPORT wxIconBundle;
+    wxIconArray m_icons;
 };
 
 // ============================================================================
@@ -62,54 +51,37 @@ 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);
 }
 
-wxIconBundle::wxIconBundle(const wxIconBundle& icon)
-            : wxGDIObject()
-{
-    Ref(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));
+    return new wxIconBundleRefData(*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
@@ -149,11 +121,7 @@ void wxIconBundle::AddIcon(const wxString& file, long type)
 
 wxIcon wxIconBundle::GetIcon(const wxSize& size) const
 {
-    wxCHECK_MSG( IsOk(), wxNullIcon, _T("invalid icon bundle") );
-
-    const wxIconArray& iconArray = M_ICONBUNDLEDATA->m_icons;
-
-    const size_t count = iconArray.size();
+    const size_t count = GetIconCount();
 
     // optimize for the common case of icon bundles containing one icon only
     wxIcon iconBest;
@@ -164,7 +132,7 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const
             break;
 
         case 1:
-            iconBest = iconArray[0];
+            iconBest = M_ICONBUNDLEDATA->m_icons[0];
             break;
 
         default:
@@ -172,6 +140,7 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const
             wxCoord sysX = wxSystemSettings::GetMetric( wxSYS_ICON_X ),
                     sysY = wxSystemSettings::GetMetric( wxSYS_ICON_Y );
 
+            const wxIconArray& iconArray = M_ICONBUNDLEDATA->m_icons;
             for ( size_t i = 0; i < count; i++ )
             {
                 const wxIcon& icon = iconArray[i];
@@ -187,18 +156,30 @@ 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;
             }
     }
 
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && wxOSX_USE_CARBON
     return wxIcon(iconBest.GetHICON(), size);
 #else
     return iconBest;
 #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") );
@@ -227,11 +208,12 @@ void wxIconBundle::AddIcon(const wxIcon& icon)
 
 size_t wxIconBundle::GetIconCount() const
 {
-    return M_ICONBUNDLEDATA->m_icons.size();
+    return IsOk() ? M_ICONBUNDLEDATA->m_icons.size() : 0;
 }
 
 wxIcon wxIconBundle::GetIconByIndex(size_t n) const
 {
+    wxCHECK_MSG( n < GetIconCount(), wxNullIcon, _T("invalid index") );
+
     return M_ICONBUNDLEDATA->m_icons[n];
 }
-