From 159852aeae999909a67884aa74cc84610d88bf37 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 16 Mar 2009 13:18:27 +0000 Subject: [PATCH] fixed wxXRC compilation with --disable-filesystem (bug #10580) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/xrc/xmlres.h | 2 ++ src/xrc/xmlres.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index c130d915cf..0f0b69aa92 100644 --- a/include/wx/xrc/xmlres.h +++ b/include/wx/xrc/xmlres.h @@ -31,6 +31,8 @@ #include "wx/xml/xml.h" +class WXDLLIMPEXP_FWD_BASE wxFileName; + class WXDLLIMPEXP_FWD_CORE wxMenu; class WXDLLIMPEXP_FWD_CORE wxMenuBar; class WXDLLIMPEXP_FWD_CORE wxDialog; diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index fc2fa3d3ce..075489d9e7 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -180,7 +180,11 @@ bool wxXmlResource::IsArchive(const wxString& filename) bool wxXmlResource::LoadFile(const wxFileName& file) { +#if wxUSE_FILESYSTEM return Load(wxFileSystem::FileNameToURL(file)); +#else + return Load(file.GetFullPath()); +#endif } bool wxXmlResource::LoadAllFiles(const wxString& dirname) -- 2.45.2