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

fix compilation without wxUSE_STREAMS (closes #10900)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-16 21:57:23 +00:00
parent 5dd0965333
commit b85b06e13d
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/iconbndl.h
View File

@@ -13,8 +13,7 @@
#define _WX_ICONBNDL_H_ #define _WX_ICONBNDL_H_
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
// for wxSize #include "wx/gdicmn.h" // for wxSize
#include "wx/gdicmn.h"
#include "wx/icon.h" #include "wx/icon.h"
#include "wx/dynarray.h" #include "wx/dynarray.h"
@@ -33,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
wxIconBundle(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);
#if wxUSE_STREAMS #if wxUSE_STREAMS
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 #endif // wxUSE_STREAMS
// initializes the bundle with a single icon // initializes the bundle with a single icon
wxIconBundle(const wxIcon& icon); wxIconBundle(const wxIcon& icon);
@@ -46,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
void AddIcon(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);
#if wxUSE_STREAMS #if wxUSE_STREAMS
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 #endif // wxUSE_STREAMS
// 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

6
src/common/iconbndl.cpp
View File

@@ -57,13 +57,13 @@ wxIconBundle::wxIconBundle()
{ {
} }
#if wxUSE_STREAMS
wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type) wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type)
: wxGDIObject() : wxGDIObject()
{ {
AddIcon(file, type); AddIcon(file, type);
} }
#if wxUSE_STREAMS
wxIconBundle::wxIconBundle(wxInputStream& stream, wxBitmapType type) wxIconBundle::wxIconBundle(wxInputStream& stream, wxBitmapType type)
: wxGDIObject() : wxGDIObject()
{ {
@@ -92,6 +92,8 @@ void wxIconBundle::DeleteIcons()
UnRef(); UnRef();
} }
#if wxUSE_STREAMS
namespace namespace
{ {
@@ -163,11 +165,11 @@ void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
); );
} }
#if wxUSE_STREAMS
void wxIconBundle::AddIcon(wxInputStream& stream, wxBitmapType type) 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
wxIcon wxIconBundle::GetIcon(const wxSize& size) const wxIcon wxIconBundle::GetIcon(const wxSize& size) const