// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/settings.h"
- #include "wx/icon.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/bitmap.h"
#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
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;
};
// ============================================================================
// ============================================================================
wxIconBundle::wxIconBundle()
- : wxGDIObject()
{
}
-wxIconBundle::wxIconBundle(const wxString& file, long type)
+wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type)
: wxGDIObject()
{
AddIcon(file, type);
}
-wxIconBundle::wxIconBundle(const wxIconBundle& icon)
- : wxGDIObject()
-{
- Ref(icon);
-}
-
wxIconBundle::wxIconBundle(const wxIcon& icon)
: wxGDIObject()
{
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));
}
UnRef();
}
-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
// 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_CARRBON
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") );
return M_ICONBUNDLEDATA->m_icons[n];
}
-