From 192a6c88dc8bd372481fa1cb80fc4e8dbc4b7f21 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 4 Jul 2003 23:49:58 +0000 Subject: [PATCH] bring base class AddFile()s in scope manually, without using 'using' git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/fs_mem.h | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h index 8b377103f1..34531d96ca 100644 --- a/include/wx/fs_mem.h +++ b/include/wx/fs_mem.h @@ -69,15 +69,26 @@ class WXDLLIMPEXP_CORE wxMemoryFSHandler : public wxMemoryFSHandlerBase public: // bring the base class versions into the scope, otherwise they would be // inaccessible in wxMemoryFSHandler -#if !defined(__GNUG__) || (__GNUG__ > 2) - using wxMemoryFSHandlerBase::AddFile; -#endif + // (unfortunately "using" can't be used as gcc 2.95 doesn't have it...) + static void AddFile(const wxString& filename, const wxString& textdata) + { + wxMemoryFSHandlerBase::AddFile(filename, textdata); + } + + static void AddFile(const wxString& filename, + const void *binarydata, + size_t size) + { + wxMemoryFSHandlerBase::AddFile(filename, binarydata, size); + } #if wxUSE_IMAGE static void AddFile(const wxString& filename, wxImage& image, long type); #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 -- 2.45.2