Added constructor to wxGCDC from wxPrinterDC

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

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 19ede4871a4845a261e7d8c79e6300e664ab3343..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
 
+    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)
             : wxGDIObject()
 {
-    m_refData = new wxIconBundleRefData;
     AddIcon(file, type);
 }
 
@@ -83,30 +83,22 @@ 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)
@@ -149,11 +141,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 +152,7 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const
             break;
 
         case 1:
-            iconBest = iconArray[0];
+            iconBest = M_ICONBUNDLEDATA->m_icons[0];
             break;
 
         default:
@@ -172,6 +160,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];
@@ -199,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") );
@@ -227,11 +228,13 @@ 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];
 }