define WX_XTI_TEMPLATE_FIX in case it is not yet

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

diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp
index c29959f11905302f1fa82769666c9faed9711ef2..9e1078612e2939a7bfc742052a7c9692f9d4d6f5 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/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"
 #include "wx/xrc/xmlres.h"
 
 #include "wx/arrimpl.cpp"


@@ -115,6 +115,9 @@ bool wxXmlResource::Load(const wxString& filemask)
                 fn.MakeAbsolute();
                 fnd = fn.GetFullPath();
             }
                 fn.MakeAbsolute();
                 fnd = fn.GetFullPath();
             }

+#if wxUSE_FILESYSTEM
+            fnd = wxFileSystem::FileNameToURL(fnd);
+#endif

         }
         
 #if wxUSE_FILESYSTEM
         }
         
 #if wxUSE_FILESYSTEM


@@ -143,6 +146,7 @@ bool wxXmlResource::Load(const wxString& filemask)
 }
 
 
 }
 
 

+IMPLEMENT_ABSTRACT_CLASS(wxXmlResourceHandler, wxObject)

 
 void wxXmlResource::AddHandler(wxXmlResourceHandler *handler)
 {
 
 void wxXmlResource::AddHandler(wxXmlResourceHandler *handler)
 {


@@ -330,9 +334,9 @@ void wxXmlResource::UpdateResources()
 #if !wxUSE_UNICODE && wxUSE_INTL
     if ( (GetFlags() & wxXRC_USE_LOCALE) == 0 )
     {
 #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
         encoding = wxLocale::GetSystemEncodingName();
     }
 #endif