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

fixed wxXRC compilation with --disable-filesystem (bug #10580)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2009-03-16 13:18:27 +00:00
parent 5cfb5f66af
commit 159852aeae
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/xrc/xmlres.h
View File

@@ -31,6 +31,8 @@
#include "wx/xml/xml.h" #include "wx/xml/xml.h"
class WXDLLIMPEXP_FWD_BASE wxFileName;
class WXDLLIMPEXP_FWD_CORE wxMenu; class WXDLLIMPEXP_FWD_CORE wxMenu;
class WXDLLIMPEXP_FWD_CORE wxMenuBar; class WXDLLIMPEXP_FWD_CORE wxMenuBar;
class WXDLLIMPEXP_FWD_CORE wxDialog; class WXDLLIMPEXP_FWD_CORE wxDialog;

4
src/xrc/xmlres.cpp
View File

@@ -180,7 +180,11 @@ bool wxXmlResource::IsArchive(const wxString& filename)
bool wxXmlResource::LoadFile(const wxFileName& file) bool wxXmlResource::LoadFile(const wxFileName& file)
{ {
#if wxUSE_FILESYSTEM
return Load(wxFileSystem::FileNameToURL(file)); return Load(wxFileSystem::FileNameToURL(file));
#else
return Load(file.GetFullPath());
#endif
} }
bool wxXmlResource::LoadAllFiles(const wxString& dirname) bool wxXmlResource::LoadAllFiles(const wxString& dirname)