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

compilation fix for wxUSE_IMAGE=0 case

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

8
include/wx/iconbndl.h
View File

@@ -32,10 +32,10 @@ public:
wxIconBundle(); wxIconBundle();
// initializes the bundle with the icon(s) found in the file // initializes the bundle with the icon(s) found in the file
#if wxUSE_STREAMS #if wxUSE_STREAMS && wxUSE_IMAGE
wxIconBundle(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY); wxIconBundle(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);
wxIconBundle(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY); wxIconBundle(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS && wxUSE_IMAGE
// initializes the bundle with a single icon // initializes the bundle with a single icon
wxIconBundle(const wxIcon& icon); wxIconBundle(const wxIcon& icon);
@@ -45,10 +45,10 @@ public:
// adds all the icons contained in the file to the collection, // adds all the icons contained in the file to the collection,
// if the collection already contains icons with the same // if the collection already contains icons with the same
// width and height, they are replaced // width and height, they are replaced
#if wxUSE_STREAMS #if wxUSE_STREAMS && wxUSE_IMAGE
void AddIcon(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY); void AddIcon(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);
void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY); void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS && wxUSE_IMAGE
// adds the icon to the collection, if the collection already // adds the icon to the collection, if the collection already
// contains an icon with the same width and height, it is // contains an icon with the same width and height, it is