Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-05 11:30:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace MSWSetEmulationLevel with a version that uses sys.executable.

Browse Source 
Call MSWSetEmulationLevel in the demo
This commit is contained in:
Robin Dunn
2019-06-10 20:36:43 -07:00
parent 6dbf2223c3
commit 02bf03a49e
2 changed files with 61 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/HTML2_WebView.py
View File

@@ -18,6 +18,8 @@ class TestPanel(wx.Panel):
sizer = wx.BoxSizer(wx.VERTICAL)
btnSizer = wx.BoxSizer(wx.HORIZONTAL)
self.wv = webview.WebView.New(self)
webview.WebView.MSWSetEmulationLevel(level=webview.WEBVIEWIE_EMU_IE11)
self.Bind(webview.EVT_WEBVIEW_NAVIGATING, self.OnWebViewNavigating, self.wv)
self.Bind(webview.EVT_WEBVIEW_LOADED, self.OnWebViewLoaded, self.wv)

64
etg/webview.py
View File

@@ -134,23 +134,77 @@ def run():
## "sipCpp->LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem>(item));")
c.find('MSWSetModernEmulationLevel').setCppCode("""\
# The emulation level is set as a per-application value in the Windows
# Registry. The way this is implemented in the C++ code we end up with the
# name of the _core extransion module in the Reistry instead of the .exe
# name which is what is needed.
#
# So instead of doing simple wrappers with #if checks like normal, replace
# these methods with a new implementation that does the RightThing using
# sys.executable.
c.find('MSWSetEmulationLevel').setCppCode("""\
#if wxUSE_WEBVIEW_IE && defined(__WXMSW__)
return wxWebViewIE::MSWSetModernEmulationLevel(modernLevel);
return _do_MSWSetEmulationLevel(level);
#else
return false;
#endif
""")
c.find('MSWSetEmulationLevel').setCppCode("""\
c.find('MSWSetModernEmulationLevel').setCppCode("""\
#if wxUSE_WEBVIEW_IE && defined(__WXMSW__)
return wxWebViewIE::MSWSetEmulationLevel(level);
return _do_MSWSetEmulationLevel(modernLevel ? wxWEBVIEWIE_EMU_IE8
: wxWEBVIEWIE_EMU_DEFAULT);
#else
return false;
#endif
""")
c.addCppCode(r"""\
#if wxUSE_WEBVIEW_IE && defined(__WXMSW__)
#include <wx/msw/webview_ie.h>
#include <wx/msw/registry.h>
bool _do_MSWSetEmulationLevel(wxWebViewIE_EmulationLevel level)
{
wxString programName;
wxPyBLOCK_THREADS(
programName = Py2wxString(PySys_GetObject("executable")));
// 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() )
{
wxLogWarning(_("Failed to find web view emulation level in the registry"));
return false;
}
if ( level != wxWEBVIEWIE_EMU_DEFAULT )
{
if ( !key.SetValue(programName, level) )
{
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;
}
#endif
""")
c = module.find('wxWebViewEvent')
tools.fixEventClass(c)