Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Ok/IsOk() mess in wxGDIObject-derived classes; also added

Browse Source 
wxGDIObject::Create/CloneGDIRefData() and implemented them for (almost) all
ports


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-12-15 17:54:20 +00:00
parent d6906a06a2
commit 8f884a0dcc
161 changed files with 1244 additions and 1139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/iconbndl.cpp
View File

@@ -51,6 +51,8 @@ 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;
@@ -84,12 +86,12 @@ wxIconBundle::wxIconBundle(const wxIcon& icon)
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));
}
@@ -99,11 +101,6 @@ void wxIconBundle::DeleteIcons()
UnRef();
}
bool wxIconBundle::IsOk() const
{
return M_ICONBUNDLEDATA && !M_ICONBUNDLEDATA->m_icons.IsEmpty();
}
void wxIconBundle::AddIcon(const wxString& file, long type)
{
#ifdef __WXMAC__