use wxFileName::MakeAbsolute istead of Normalize

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp
index 94d4be28422a9e610a3d967ac661f86b8fe11733..5fe121106654b7eba5411393ce0060b4e0be4b86 100644 (file)
--- a/contrib/src/xrc/xmlres.cpp
+++ b/contrib/src/xrc/xmlres.cpp
@@ -112,7 +112,7 @@ bool wxXmlResource::Load(const wxString& filemask)
             wxFileName fn(fnd);
             if (fn.IsRelative())
             {
             wxFileName fn(fnd);
             if (fn.IsRelative())
             {

-                fn.Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_ABSOLUTE);
+                fn.MakeAbsolute();

                 fnd = fn.GetFullPath();
             }
         }
                 fnd = fn.GetFullPath();
             }
         }

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 94d4be28422a9e610a3d967ac661f86b8fe11733..5fe121106654b7eba5411393ce0060b4e0be4b86 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -112,7 +112,7 @@ bool wxXmlResource::Load(const wxString& filemask)
             wxFileName fn(fnd);
             if (fn.IsRelative())
             {
             wxFileName fn(fnd);
             if (fn.IsRelative())
             {

-                fn.Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_ABSOLUTE);
+                fn.MakeAbsolute();

                 fnd = fn.GetFullPath();
             }
         }
                 fnd = fn.GetFullPath();
             }
         }