AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix for base class AddFile visibility and DLL build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-07-03 13:06:21 +00:00
parent 7843d11bdc
commit a8f12b67c4
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/wx/fs_mem.h
View File

@ -28,9 +28,9 @@
class WXDLLIMPEXP_CORE wxImage;
#endif // wxUSE_GUI
//--------------------------------------------------------------------------------
// wxMemoryFSHandler
//--------------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxMemoryFSHandlerBase
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxMemoryFSHandlerBase : public wxFileSystemHandler
{
@ -57,17 +57,36 @@ protected:
static wxHashTable *m_Hash;
};
class wxMemoryFSHandler : public wxMemoryFSHandlerBase
// ----------------------------------------------------------------------------
// wxMemoryFSHandler
// ----------------------------------------------------------------------------
#if wxUSE_GUI
// add GUI-only operations to the base class
class WXDLLIMPEXP_CORE wxMemoryFSHandler : public wxMemoryFSHandlerBase
{
public:
#if wxUSE_GUI
// bring the base class versions into the scope, otherwise they would be
// inaccessible in wxMemoryFSHandler
using wxMemoryFSHandlerBase::AddFile;
#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);
#endif // wxUSE_GUI
};
#else // !wxUSE_GUI
// just the same thing as the base class in wxBase
class WXDLLIMPEXP_BASE wxMemoryFSHandler : public wxMemoryFSHandlerBase
{
};
#endif // wxUSE_GUI/!wxUSE_GUI
#endif // wxUSE_FILESYSTEM
#endif // _WX_FS_MEM_H_