X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b85b06e13d22e7fc1604ec1a49caa1227a1b3d36..29a35dd5fee0e33143a39824e71aefd66e3e4851:/src/common/iconbndl.cpp diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp index 26073476f3..4958538025 100644 --- a/src/common/iconbndl.cpp +++ b/src/common/iconbndl.cpp @@ -156,7 +156,11 @@ void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type) } #endif // __WXMAC__ +#if wxUSE_FFILE wxFFileInputStream stream(file); +#elif wxUSE_FILE + wxFileInputStream stream(file); +#endif DoAddIcon ( *this, @@ -235,7 +239,7 @@ wxIcon wxIconBundle::GetIconOfExactSize(const wxSize& size) const void wxIconBundle::AddIcon(const wxIcon& icon) { - wxCHECK_RET( icon.IsOk(), _T("invalid icon") ); + wxCHECK_RET( icon.IsOk(), wxT("invalid icon") ); AllocExclusive(); @@ -266,7 +270,7 @@ size_t wxIconBundle::GetIconCount() const wxIcon wxIconBundle::GetIconByIndex(size_t n) const { - wxCHECK_MSG( n < GetIconCount(), wxNullIcon, _T("invalid index") ); + wxCHECK_MSG( n < GetIconCount(), wxNullIcon, wxT("invalid index") ); return M_ICONBUNDLEDATA->m_icons[n]; }