Applied patch [ 809066 ] Cleanup for text2rtf

[wxWidgets.git] / contrib / src / xrc / xmlres.cpp

diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp
index d988aed649ce97fbf3d80e61a667cdb4db6ea889..36d3989fc2ea243d724f8314be305be6ab01d49b 100644 (file)
--- 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")))
@@ -284,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;
@@ -331,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
@@ -566,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)
         {