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

bring base class AddFile()s in scope manually, without using 'using'

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-04 23:49:58 +00:00
parent 3943f86765
commit 192a6c88dc
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/fs_mem.h
View File

@@ -69,15 +69,26 @@ class WXDLLIMPEXP_CORE wxMemoryFSHandler : public wxMemoryFSHandlerBase
public: public:
// bring the base class versions into the scope, otherwise they would be // bring the base class versions into the scope, otherwise they would be
// inaccessible in wxMemoryFSHandler // inaccessible in wxMemoryFSHandler
#if !defined(__GNUG__) || (__GNUG__ > 2) // (unfortunately "using" can't be used as gcc 2.95 doesn't have it...)
using wxMemoryFSHandlerBase::AddFile; static void AddFile(const wxString& filename, const wxString& textdata)
#endif {
wxMemoryFSHandlerBase::AddFile(filename, textdata);
}
static void AddFile(const wxString& filename,
const void *binarydata,
size_t size)
{
wxMemoryFSHandlerBase::AddFile(filename, binarydata, size);
}
#if wxUSE_IMAGE #if wxUSE_IMAGE
static void AddFile(const wxString& filename, wxImage& image, long type); static void AddFile(const wxString& filename, wxImage& image, long type);
#endif // wxUSE_IMAGE #endif // wxUSE_IMAGE
static void AddFile(const wxString& filename, const wxBitmap& bitmap, long type); static void AddFile(const wxString& filename,
const wxBitmap& bitmap,
long type);
}; };
#else // !wxUSE_GUI #else // !wxUSE_GUI