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

Don't define unnecessary constants in public webview_ie.h

Browse Source 
There is no need to check that calling MSWSetModernEmulationLevel()
changed the registry key in the test, this is just an implementation
detail of this function.

This makes it unnecessary to define wxIE_EMULATION_LEVEL and
wxREGISTRY_IE_PATH (which are both badly named) in the public header.

Finally, improve the error message in MSWSetModernEmulationLevel() and
add another one for failing to reset the emulation level too.
This commit is contained in:
Vadim Zeitlin
2017-10-22 17:07:18 +02:00
parent 732cb97af3
commit ae88141fa0
3 changed files with 63 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/msw/webview_ie.cpp
View File

@@ -857,26 +857,40 @@ wxString wxWebViewIE::GetPageText() const
bool wxWebViewIE::MSWSetModernEmulationLevel(bool modernLevel)
{
wxRegKey key(wxRegKey::HKCU, wxREGISTRY_IE_PATH);
if ( key.Exists() )
// Registry key where emulation level for programs are set
static const wxChar* IE_EMULATION_KEY =
wxT("SOFTWARE\\Microsoft\\Internet Explorer\\Main")
wxT("\\FeatureControl\\FEATURE_BROWSER_EMULATION");
wxRegKey key(wxRegKey::HKCU, IE_EMULATION_KEY);
if ( !key.Exists() )
{
wxString programName = wxGetFullModuleName().AfterLast('\\');
if ( modernLevel )
{
if ( !key.SetValue(programName, wxIE_EMULATION_LEVEL) )
{
wxLogWarning(_("Failed to set the current browser control emulation level"));
return false;
}
}
else
{
key.DeleteValue(programName);
}
return true;
wxLogWarning(_("Failed to find web view emulation level in the registry"));
return false;
}
wxLogWarning(_("Failed to find current browser control emulation level"));
return false;
const wxString programName = wxGetFullModuleName().AfterLast('\\');
if ( modernLevel )
{
// IE8 (8000) is sufficiently modern for our needs, see
// https://msdn.microsoft.com/library/ee330730.aspx#browser_emulation
// for other values that could be used here.
if ( !key.SetValue(programName, 8000) )
{
wxLogWarning(_("Failed to set web view to modern emulation level"));
return false;
}
}
else
{
if ( !key.DeleteValue(programName) )
{
wxLogWarning(_("Failed to reset web view to standard emulation level"));
return false;
}
}
return true;
}
static