Merge pull request #2894 from swt2c/fix_webview_stubs

Fix webview stubs for wxWidgets 3.3.x

Author: swt2c

docs/sphinx/itemToModuleMap.json

@@ -342,6 +342,7 @@
 "App":"wx.",
 "AppAssertMode":"wx.",
 "AppConsole":"wx.",
+"AppModal":"wx.",
 "AppTraits":"wx.",
 "Appearance":"wx.PyApp.",
 "AppearanceResult":"wx.PyApp.",
@@ -1516,6 +1517,7 @@
 "GetSingleChoice":"wx.",
 "GetSingleChoiceData":"wx.",
 "GetSingleChoiceIndex":"wx.",
+"GetStockHelpString":"wx.",
 "GetStockLabel":"wx.",
 "GetTextFromUser":"wx.",
 "GetTextFromUserPromptStr":"wx.",
@@ -7286,6 +7288,7 @@
 "STC_ZIG_STRING":"wx.stc.",
 "STC_ZIG_STRINGEOL":"wx.stc.",
 "STOCK_FOR_BUTTON":"wx.",
+"STOCK_MENU":"wx.",
 "STOCK_NOFLAGS":"wx.",
 "STOCK_WITHOUT_ELLIPSIS":"wx.",
 "STOCK_WITH_ACCELERATOR":"wx.",
@@ -7510,6 +7513,7 @@
 "StayInProperty":"wx.propgrid.",
 "StdDialogButtonSizer":"wx.",
 "StockCursor":"wx.",
+"StockHelpStringClient":"wx.",
 "StockLabelQueryFlag":"wx.",
 "StockPreferencesPage":"wx.",
 "StopWatch":"wx.",
@@ -7527,6 +7531,7 @@
 "StyledTextCtrl":"wx.stc.",
 "StyledTextEvent":"wx.stc.",
 "Swap":"wx.",
+"SwapInterval":"wx.glcanvas.GLCanvas.",
 "SymbolPickerDialog":"wx.richtext.",
 "SysColourChangedEvent":"wx.",
 "SysErrorCode":"wx.",
@@ -8319,6 +8324,8 @@
 "WebViewFindFlags":"wx.html2.",
 "WebViewHandler":"wx.html2.",
 "WebViewHandlerRequest":"wx.html2.",
+"WebViewHandlerResponse":"wx.html2.",
+"WebViewHandlerResponseData":"wx.html2.",
 "WebViewHistoryItem":"wx.html2.",
 "WebViewIE_EmulationLevel":"wx.html2.",
 "WebViewNameStr":"wx.html2.",
@@ -8340,7 +8347,9 @@
 "WindowDisabler":"wx.",
 "WindowID":"wx.",
 "WindowIDRef":"wx.",
+"WindowModal":"wx.",
 "WindowModalDialogEvent":"wx.",
+"WindowMode":"wx.",
 "WindowVariant":"wx.",
 "WithImages":"wx.",
 "Wizard":"wx.adv.",

etg/webview.py

@@ -21,12 +21,14 @@
            'wxWebViewHandler',
            'wxWebViewArchiveHandler',
            'wxWebViewFSHandler',
+           'wxWebViewConfiguration',
+           'wxWebViewFactory',
            'wxWebView',
            'wxWebViewEvent',
-           'wxWebViewFactory',
            'wxWebViewIE',
            'wxWebViewHandlerRequest',
-           'wxWebViewConfiguration',
+           'wxWebViewHandlerResponse',
+           'wxWebViewHandlerResponseData',
            'wxWebViewWindowFeatures',
            ]
 
@@ -99,20 +101,24 @@ def run():
     c.find('GetVersionInfo').ignore()
     c.find('CreateConfiguration').isPureVirtual = True
     c.find('CreateConfiguration').setCppCode_sip("""\
-        PyErr_Clear();
-        Py_BEGIN_ALLOW_THREADS
-        wxWebViewConfiguration cfg = sipCpp->CreateConfiguration();
-        sipRes = new wxWebViewConfiguration(cfg.GetBackend(), cfg.GetImpl());
-        Py_END_ALLOW_THREADS
-        if (PyErr_Occurred()) sipIsErr = 1;
+        #if wxUSE_WEBVIEW
+            PyErr_Clear();
+            Py_BEGIN_ALLOW_THREADS
+            wxWebViewConfiguration cfg = sipCpp->CreateConfiguration();
+            sipRes = new wxWebViewConfiguration(cfg.GetBackend(), cfg.GetImpl());
+            Py_END_ALLOW_THREADS
+            if (PyErr_Occurred()) sipIsErr = 1;
+        #else
+            wxPyRaiseNotImplemented();
+        #endif
     """)
 
     tools.generateStubs('wxUSE_WEBVIEW', module,
                         typeValMap={
                             'wxWebViewNavigationActionFlags': 'wxWEBVIEW_NAV_ACTION_NONE',
                             'wxWebViewZoom': 'wxWEBVIEW_ZOOM_MEDIUM',
                             'wxVersionInfo': 'wxVersionInfo()',
-                            'wxWebViewConfiguration': 'wxWebViewConfiguration("", NULL)',
+                            'wxWebViewConfiguration': 'wxWebView::NewConfiguration()',
                             })
 
     c = module.find('wxWebView')
@@ -292,9 +298,18 @@ def run():
     c = module.find('wxWebViewHandlerRequest')
     c.find('GetDataString').ignore()
 
+    c = module.find('wxWebViewHandlerResponse')
+    c.abstract = True
+    for m in c.find('Finish').all():
+        m.ignore()
+
     c = module.find('wxWebViewConfiguration')
     c.abstract = True
-    c.instanceCode = 'sipCpp = new wxWebViewConfiguration("", NULL);'
+    c.instanceCode = """\
+        #if wxUSE_WEBVIEW
+            sipCpp = new wxWebViewConfiguration("", NULL);
+        #endif
+        """
 
     c = module.find('wxWebViewWindowFeatures')
     c.abstract = True

etgtools/tweaker_tools.py

@@ -1925,6 +1925,8 @@ def _generateMethodStub(code, method, typeValMap):
         decl += '{} {}'.format(method.type, method.name)
     decl += method.argsString
     if method.isPureVirtual:
+        if '=0' not in decl:
+            decl += '=0'
         decl += ';'
     code.hdr.append(decl)