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

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 8b377103f11f8ecbe639d6eb84d03af58c266256..34531d96ca9c6df8174d6bda8dca24172a5c6eaf 100644 (file)
--- 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
 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
 
 
 #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
 };
 
 #else // !wxUSE_GUI