X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d0b50ad93942338301a318eda78f7d3999a93fab..25088f1eea365f0da7aeb565932dd4fe0fd5d20e:/contrib/src/xrc/xmlres.cpp?ds=sidebyside diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp index f7355536ee..36d3989fc2 100644 --- a/contrib/src/xrc/xmlres.cpp +++ b/contrib/src/xrc/xmlres.cpp @@ -35,7 +35,7 @@ #include "wx/fontmap.h" #include "wx/artprov.h" -#include "wx/xrc/xml.h" +#include "wx/xml/xml.h" #include "wx/xrc/xmlres.h" #include "wx/arrimpl.cpp" @@ -107,7 +107,7 @@ bool wxXmlResource::Load(const wxString& filemask) // filename and not URL: if (wxFileName::FileExists(fnd)) { - // Make the name absolute filename, because the app may + // Make the name absolute filename, because the app may // change working directory later: wxFileName fn(fnd); if (fn.IsRelative()) @@ -115,8 +115,11 @@ bool wxXmlResource::Load(const wxString& filemask) fn.MakeAbsolute(); fnd = fn.GetFullPath(); } +#if wxUSE_FILESYSTEM + fnd = wxFileSystem::FileNameToURL(fnd); +#endif } - + #if wxUSE_FILESYSTEM if (fnd.Lower().Matches(wxT("*.zip")) || fnd.Lower().Matches(wxT("*.xrs"))) @@ -143,6 +146,7 @@ bool wxXmlResource::Load(const wxString& filemask) } +IMPLEMENT_ABSTRACT_CLASS(wxXmlResourceHandler, wxObject) void wxXmlResource::AddHandler(wxXmlResourceHandler *handler) { @@ -283,14 +287,13 @@ static void ProcessPlatformProperty(wxXmlNode *node) while (tkn.HasMoreTokens()) { s = tkn.GetNextToken(); -#ifdef __WXMSW__ +#ifdef __WINDOWS__ if (s == wxT("win")) isok = true; #endif -#ifdef __UNIX__ - if (s == wxT("unix")) isok = true; -#endif -#ifdef __MAC__ +#if defined(__MAC__) || defined(__APPLE__) if (s == wxT("mac")) isok = true; +#elif defined(__UNIX__) + if (s == wxT("unix")) isok = true; #endif #ifdef __OS2__ if (s == wxT("os2")) isok = true; @@ -330,9 +333,9 @@ void wxXmlResource::UpdateResources() #if !wxUSE_UNICODE && wxUSE_INTL if ( (GetFlags() & wxXRC_USE_LOCALE) == 0 ) { - // In case we are not using wxLocale to translate strings, convert the strings - // GUI's charset. This must not be done when wxXRC_USE_LOCALE is on, because - // it could break wxGetTranslation lookup. + // In case we are not using wxLocale to translate strings, convert the + // strings GUI's charset. This must not be done when wxXRC_USE_LOCALE + // is on, because it could break wxGetTranslation lookup. encoding = wxLocale::GetSystemEncodingName(); } #endif @@ -565,14 +568,14 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wxXmlResourceHandler *handler; if (handlerToUse) - { + { if (handlerToUse->CanHandle(node)) { return handlerToUse->CreateResource(node, parent, instance); } } else if (node->GetName() == wxT("object")) - { + { wxNode *ND = m_handlers.GetFirst(); while (ND) { @@ -1226,7 +1229,10 @@ static void CleanXRCID_Record(XRCID_record *rec) static void CleanXRCID_Records() { for (int i = 0; i < XRCID_TABLE_SIZE; i++) + { CleanXRCID_Record(XRCID_Records[i]); + XRCID_Records[i] = NULL; + } } static void AddStdXRCID_Records() @@ -1286,5 +1292,3 @@ void wxXmlInitResourceModule() module->Init(); wxModule::RegisterModule(module); } - -