must convert filename to URL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
137b730319
commit
75d3838010
@ -115,6 +115,9 @@ bool wxXmlResource::Load(const wxString& filemask)
|
||||
fn.MakeAbsolute();
|
||||
fnd = fn.GetFullPath();
|
||||
}
|
||||
#if wxUSE_FILESYSTEM
|
||||
fnd = wxFileSystem::FileNameToURL(fnd);
|
||||
#endif
|
||||
}
|
||||
|
||||
#if wxUSE_FILESYSTEM
|
||||
@ -331,9 +334,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
|
||||
|
@ -115,6 +115,9 @@ bool wxXmlResource::Load(const wxString& filemask)
|
||||
fn.MakeAbsolute();
|
||||
fnd = fn.GetFullPath();
|
||||
}
|
||||
#if wxUSE_FILESYSTEM
|
||||
fnd = wxFileSystem::FileNameToURL(fnd);
|
||||
#endif
|
||||
}
|
||||
|
||||
#if wxUSE_FILESYSTEM
|
||||
@ -331,9 +334,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
|
||||
|
Loading…
Reference in New Issue
Block a user