Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

must convert filename to URL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-07-19 20:27:17 +00:00
parent 137b730319
commit 75d3838010
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/src/xrc/xmlres.cpp
View File

@@ -115,6 +115,9 @@ bool wxXmlResource::Load(const wxString& filemask)
fn.MakeAbsolute(); fn.MakeAbsolute();
fnd = fn.GetFullPath(); fnd = fn.GetFullPath();
} }
#if wxUSE_FILESYSTEM
fnd = wxFileSystem::FileNameToURL(fnd);
#endif
} }
#if wxUSE_FILESYSTEM #if wxUSE_FILESYSTEM
@@ -331,9 +334,9 @@ void wxXmlResource::UpdateResources()
#if !wxUSE_UNICODE && wxUSE_INTL #if !wxUSE_UNICODE && wxUSE_INTL
if ( (GetFlags() & wxXRC_USE_LOCALE) == 0 ) if ( (GetFlags() & wxXRC_USE_LOCALE) == 0 )
{ {
// In case we are not using wxLocale to translate strings, convert the strings // In case we are not using wxLocale to translate strings, convert the
// GUI's charset. This must not be done when wxXRC_USE_LOCALE is on, because // strings GUI's charset. This must not be done when wxXRC_USE_LOCALE
// it could break wxGetTranslation lookup. // is on, because it could break wxGetTranslation lookup.
encoding = wxLocale::GetSystemEncodingName(); encoding = wxLocale::GetSystemEncodingName();
} }
#endif #endif

9
src/xrc/xmlres.cpp
View File

@@ -115,6 +115,9 @@ bool wxXmlResource::Load(const wxString& filemask)
fn.MakeAbsolute(); fn.MakeAbsolute();
fnd = fn.GetFullPath(); fnd = fn.GetFullPath();
} }
#if wxUSE_FILESYSTEM
fnd = wxFileSystem::FileNameToURL(fnd);
#endif
} }
#if wxUSE_FILESYSTEM #if wxUSE_FILESYSTEM
@@ -331,9 +334,9 @@ void wxXmlResource::UpdateResources()
#if !wxUSE_UNICODE && wxUSE_INTL #if !wxUSE_UNICODE && wxUSE_INTL
if ( (GetFlags() & wxXRC_USE_LOCALE) == 0 ) if ( (GetFlags() & wxXRC_USE_LOCALE) == 0 )
{ {
// In case we are not using wxLocale to translate strings, convert the strings // In case we are not using wxLocale to translate strings, convert the
// GUI's charset. This must not be done when wxXRC_USE_LOCALE is on, because // strings GUI's charset. This must not be done when wxXRC_USE_LOCALE
// it could break wxGetTranslation lookup. // is on, because it could break wxGetTranslation lookup.
encoding = wxLocale::GetSystemEncodingName(); encoding = wxLocale::GetSystemEncodingName();
} }
#endif #endif