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

compilation fix for wxUSE_IMAGE=0 caseinclude/wx/iconbndl.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2009-12-15 11:24:50 +00:00
parent bdf14bff10
commit b5c4f0dfd9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/iconbndl.cpp
View File

@@ -57,7 +57,7 @@ wxIconBundle::wxIconBundle()
{ {
} }
#if wxUSE_STREAMS #if wxUSE_STREAMS && wxUSE_IMAGE
wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type) wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type)
: wxGDIObject() : wxGDIObject()
{ {
@@ -69,7 +69,7 @@ wxIconBundle::wxIconBundle(wxInputStream& stream, wxBitmapType type)
{ {
AddIcon(stream, type); AddIcon(stream, type);
} }
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS && wxUSE_IMAGE
wxIconBundle::wxIconBundle(const wxIcon& icon) wxIconBundle::wxIconBundle(const wxIcon& icon)
: wxGDIObject() : wxGDIObject()
@@ -92,7 +92,7 @@ void wxIconBundle::DeleteIcons()
UnRef(); UnRef();
} }
#if wxUSE_STREAMS #if wxUSE_STREAMS && wxUSE_IMAGE
namespace namespace
{ {
@@ -174,7 +174,7 @@ void wxIconBundle::AddIcon(wxInputStream& stream, wxBitmapType type)
DoAddIcon(*this, stream, type, _("Failed to load image %d from stream.")); DoAddIcon(*this, stream, type, _("Failed to load image %d from stream."));
} }
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS && wxUSE_IMAGE
wxIcon wxIconBundle::GetIcon(const wxSize& size) const wxIcon wxIconBundle::GetIcon(const wxSize& size) const
{ {