Update to current wxWidgets master

docs/sphinx/itemToModuleMap.json

@@ -49,6 +49,7 @@
 "ACC_EVENT_SYSTEM_SWITCHSTART":"wx.",
 "ACC_FAIL":"wx.",
 "ACC_FALSE":"wx.",
+"ACC_INVALID_ARG":"wx.",
 "ACC_NOT_IMPLEMENTED":"wx.",
 "ACC_NOT_SUPPORTED":"wx.",
 "ACC_OK":"wx.",
@@ -901,7 +902,7 @@
 "DirProperty":"wx.propgrid.",
 "DirSelector":"wx.",
 "DirSelectorPromptStr":"wx.",
-"Direction":"wx.",
+"Direction":"wx.DataObject.",
 "DisableAsserts":"wx.",
 "Display":"wx.",
 "DisplayChangedEvent":"wx.",
@@ -1159,9 +1160,17 @@
 "FONTSTYLE_NORMAL":"wx.",
 "FONTSTYLE_SLANT":"wx.",
 "FONTWEIGHT_BOLD":"wx.",
+"FONTWEIGHT_EXTRABOLD":"wx.",
+"FONTWEIGHT_EXTRAHEAVY":"wx.",
+"FONTWEIGHT_EXTRALIGHT":"wx.",
+"FONTWEIGHT_HEAVY":"wx.",
+"FONTWEIGHT_INVALID":"wx.",
 "FONTWEIGHT_LIGHT":"wx.",
 "FONTWEIGHT_MAX":"wx.",
+"FONTWEIGHT_MEDIUM":"wx.",
 "FONTWEIGHT_NORMAL":"wx.",
+"FONTWEIGHT_SEMIBOLD":"wx.",
+"FONTWEIGHT_THIN":"wx.",
 "FORWARD":"wx.",
 "FRAME_DRAWER":"wx.",
 "FRAME_EX_CONTEXTHELP":"wx.",
@@ -3025,6 +3034,7 @@
 "Process":"wx.",
 "ProcessEvent":"wx.",
 "ProgressDialog":"wx.",
+"PromptMode":"wx.html.HtmlEasyPrinting.",
 "PropagateOnce":"wx.",
 "PropagationDisabler":"wx.",
 "PropertyCategory":"wx.propgrid.",
@@ -6564,6 +6574,9 @@
 "WEBVIEW_FIND_HIGHLIGHT_RESULT":"wx.html2.",
 "WEBVIEW_FIND_MATCH_CASE":"wx.html2.",
 "WEBVIEW_FIND_WRAP":"wx.html2.",
+"WEBVIEW_NAV_ACTION_NONE":"wx.html2.",
+"WEBVIEW_NAV_ACTION_OTHER":"wx.html2.",
+"WEBVIEW_NAV_ACTION_USER":"wx.html2.",
 "WEBVIEW_NAV_ERR_AUTH":"wx.html2.",
 "WEBVIEW_NAV_ERR_CERTIFICATE":"wx.html2.",
 "WEBVIEW_NAV_ERR_CONNECTION":"wx.html2.",
@@ -6833,6 +6846,7 @@
 "WebViewHandler":"wx.html2.",
 "WebViewHistoryItem":"wx.html2.",
 "WebViewNameStr":"wx.html2.",
+"WebViewNavigationActionFlags":"wx.html2.",
 "WebViewNavigationError":"wx.html2.",
 "WebViewReloadFlags":"wx.html2.",
 "WebViewZoom":"wx.html2.",

etg/bitmap.py

@@ -40,6 +40,8 @@ def run():
 
     c = module.find('wxMask')
     c.mustHaveApp()
+    for m in c.find('Create').all():
+        m.ignore()
 
     c = module.find('wxBitmap')
     assert isinstance(c, etgtools.ClassDef)

etg/colour.py

@@ -84,7 +84,7 @@ def run():
 
     c.find('GetPixel').ignore()  # We need to add a typcast
     c.addCppMethod('wxIntPtr*', 'GetPixel', '()', """\
-        #ifdef __WXGTK3__
+        #if defined(__WXGTK3__) || defined(__WXOSX__)
             return new wxIntPtr(0);
         #else
             return new wxIntPtr((wxIntPtr)self->GetPixel());

etg/font.py

@@ -33,6 +33,11 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
+    c = module.find('wxFontInfo')
+    assert isinstance(c, etgtools.ClassDef)
+    ctor = c.find('wxFontInfo').findOverload('T pointSize')
+    ctor.find('pointSize').type = 'float'
+
     c = module.find('wxFont')
     assert isinstance(c, etgtools.ClassDef)
     tools.removeVirtuals(c)

etg/propgridproperty.py

@@ -150,6 +150,11 @@ def run():
     #---------------------------------------------------------
     c = module.find('wxPGChoices')
     c.find('wxPGChoices').findOverload('wxChar **').ignore()
+    c.find('wxPGChoices').findOverload('wxString *').ignore()
+    c.find('Add').findOverload('wxChar **').ignore()
+    c.find('Add').findOverload('wxString *').ignore()
+    c.find('Set').findOverload('wxChar **').ignore()
+    c.find('Set').findOverload('wxString *').ignore()
     tools.ignoreConstOverloads(c)
     c.find('operator[]').ignore()
     c.find('GetId').type = 'wxIntPtr'