various tweaks and fixes for wxWidgets update

This commit is contained in:
Robin Dunn
2021-07-24 16:03:21 -07:00
parent 7d09024195
commit f321c561ad
6 changed files with 30 additions and 3 deletions

View File

@@ -753,6 +753,7 @@
"Country":"wx.DateTime.",
"CreateDynamicObject":"wx.",
"CreateFileTipProvider":"wx.adv.",
"CredentialEntryDialog":"wx.",
"Cursor":"wx.",
"CursorProperty":"wx.propgrid.",
"CustomDataObject":"wx.",
@@ -1038,6 +1039,9 @@
"FD_SAVE":"wx.",
"FD_SHOW_HIDDEN":"wx.",
"FFont":"wx.",
"FH_PATH_SHOW_ALWAYS":"wx.",
"FH_PATH_SHOW_IF_DIFFERENT":"wx.",
"FH_PATH_SHOW_NEVER":"wx.",
"FIXED_LENGTH":"wx.",
"FIXED_MINSIZE":"wx.",
"FLEX_GROWMODE_ALL":"wx.",
@@ -1254,6 +1258,7 @@
"FileDirPickerEvent":"wx.",
"FileDropTarget":"wx.",
"FileHistory":"wx.",
"FileHistoryMenuPathStyle":"wx.",
"FileLayout":"wx.StandardPaths.",
"FileOffset":"wx.",
"FilePickerCtrl":"wx.",
@@ -1319,6 +1324,7 @@
"FromEnd":"wx.",
"FromStart":"wx.",
"FromString":"wx.",
"FullScreenEvent":"wx.",
"GA_HORIZONTAL":"wx.",
"GA_PROGRESS":"wx.",
"GA_SMOOTH":"wx.",
@@ -2066,6 +2072,7 @@
"LANGUAGE_ENGLISH_CARIBBEAN":"wx.",
"LANGUAGE_ENGLISH_DENMARK":"wx.",
"LANGUAGE_ENGLISH_EIRE":"wx.",
"LANGUAGE_ENGLISH_ISRAEL":"wx.",
"LANGUAGE_ENGLISH_JAMAICA":"wx.",
"LANGUAGE_ENGLISH_NEW_ZEALAND":"wx.",
"LANGUAGE_ENGLISH_PHILIPPINES":"wx.",
@@ -2623,7 +2630,7 @@
"ObjectRefData":"wx.",
"OperatingSystemId":"wx.",
"Orientation":"wx.",
"Origin":"wx.grid.GridActivationSource.",
"Origin":"wx.HelpEvent.",
"OutBottom":"wx.",
"OutCode":"wx.",
"OutLeft":"wx.",
@@ -2784,6 +2791,9 @@
"PENSTYLE_TRANSPARENT":"wx.",
"PENSTYLE_USER_DASH":"wx.",
"PENSTYLE_VERTICAL_HATCH":"wx.",
"PEN_QUALITY_DEFAULT":"wx.",
"PEN_QUALITY_HIGH":"wx.",
"PEN_QUALITY_LOW":"wx.",
"PGArrayEditorDialog":"wx.propgrid.",
"PGArrayStringEditorDialog":"wx.propgrid.",
"PGAttributeStorage":"wx.propgrid.",
@@ -3057,10 +3067,12 @@
"PenInfo":"wx.",
"PenJoin":"wx.",
"PenList":"wx.",
"PenQuality":"wx.",
"PenStyle":"wx.",
"PercentOf":"wx.",
"PickerBase":"wx.",
"PixelDataBase":"wx.",
"PlatformId":"wx.",
"PlatformInformation":"wx.",
"Point":"wx.",
"Point2D":"wx.",
@@ -3216,6 +3228,8 @@
"RIBBON_ART_PANEL_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon.",
"RIBBON_ART_PANEL_BORDER_COLOUR":"wx.ribbon.",
"RIBBON_ART_PANEL_BORDER_GRADIENT_COLOUR":"wx.ribbon.",
"RIBBON_ART_PANEL_HOVER_BORDER_COLOUR":"wx.ribbon.",
"RIBBON_ART_PANEL_HOVER_BORDER_GRADIENT_COLOUR":"wx.ribbon.",
"RIBBON_ART_PANEL_HOVER_LABEL_BACKGROUND_COLOUR":"wx.ribbon.",
"RIBBON_ART_PANEL_HOVER_LABEL_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
"RIBBON_ART_PANEL_HOVER_LABEL_COLOUR":"wx.ribbon.",
@@ -6675,6 +6689,8 @@
"WEBVIEW_FIND_HIGHLIGHT_RESULT":"wx.html2.",
"WEBVIEW_FIND_MATCH_CASE":"wx.html2.",
"WEBVIEW_FIND_WRAP":"wx.html2.",
"WEBVIEW_INJECT_AT_DOCUMENT_END":"wx.html2.",
"WEBVIEW_INJECT_AT_DOCUMENT_START":"wx.html2.",
"WEBVIEW_NAV_ACTION_NONE":"wx.html2.",
"WEBVIEW_NAV_ACTION_OTHER":"wx.html2.",
"WEBVIEW_NAV_ACTION_USER":"wx.html2.",
@@ -6952,6 +6968,7 @@
"WebViewNavigationActionFlags":"wx.html2.",
"WebViewNavigationError":"wx.html2.",
"WebViewReloadFlags":"wx.html2.",
"WebViewUserScriptInjectionTime":"wx.html2.",
"WebViewZoom":"wx.html2.",
"WebViewZoomType":"wx.html2.",
"WeekDay":"wx.DateTime.",
@@ -7161,6 +7178,7 @@
"wxEVT_FIND_REPLACE_ALL":"wx.",
"wxEVT_FONTPICKER_CHANGED":"wx.",
"wxEVT_FSWATCHER":"wx.",
"wxEVT_FULLSCREEN":"wx.",
"wxEVT_GESTURE_PAN":"wx.",
"wxEVT_GESTURE_ROTATE":"wx.",
"wxEVT_GESTURE_ZOOM":"wx.",
@@ -7483,10 +7501,13 @@
"wxEVT_WEBKIT_NEW_WINDOW":"wx.webkit.",
"wxEVT_WEBKIT_STATE_CHANGED":"wx.webkit.",
"wxEVT_WEBVIEW_ERROR":"wx.html2.",
"wxEVT_WEBVIEW_FULLSCREEN_CHANGED":"wx.html2.",
"wxEVT_WEBVIEW_FULL_SCREEN_CHANGED":"wx.html2.",
"wxEVT_WEBVIEW_LOADED":"wx.html2.",
"wxEVT_WEBVIEW_NAVIGATED":"wx.html2.",
"wxEVT_WEBVIEW_NAVIGATING":"wx.html2.",
"wxEVT_WEBVIEW_NEWWINDOW":"wx.html2.",
"wxEVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED":"wx.html2.",
"wxEVT_WEBVIEW_TITLE_CHANGED":"wx.html2.",
"wxEVT_WINDOW_MODAL_DIALOG_CLOSED":"wx.",
"wxEVT_WIZARD_BEFORE_PAGE_CHANGED":"wx.adv.",

View File

@@ -425,6 +425,8 @@ def run():
c.find('SetEditor.editor').transfer = True # these are probably redundant now...
c.find('SetRenderer.renderer').transfer = True
c.find('GetRendererPtr').ignore()
#-----------------------------------------------------------------
module.find('wxGridCellRendererPtr').piIgnored = True
module.find('wxGridCellEditorPtr').piIgnored = True
@@ -635,7 +637,7 @@ def run():
# Custom code to deal with the wxGridBlockCoordsVector return type of these
# methods. It's a wxVector, which we'll just convert to a list.
# TODO: There are a few of these now to we ought to either wrap wxVector, or add
# TODO: There are a few of these now so we ought to either wrap wxVector, or add
# something in tweaker_tools to make adding code like this easier and more
# automated.
code = """\

View File

@@ -99,6 +99,7 @@ def run():
body="""\
return self->FindItem(id);""")
c.find('MSWCommand').ignore()
#-----------------------------------------------------------------
c = module.find('wxMenuBar')

View File

@@ -103,6 +103,8 @@ def run():
dtor = c.find('~wxObjectDataPtr')
dtor.isDtor = True
ctor.findOverload('< U >').ignore()
# more name hacks/fixes
c.nodeBases = ({'wxObjectDataPtr': ('wxObjectDataPtr', [])},
['wxObjectDataPtr'])

View File

@@ -19,6 +19,7 @@ DOCSTRING = ""
# this script.
ITEMS = [ 'wxPlatformInfo',
'wxLinuxDistributionInfo',
'wxPlatformId',
]
#---------------------------------------------------------------------------

View File

@@ -220,7 +220,7 @@ if haveWheel:
def run(self):
# Ensure that there is a basic library build for bdist_egg to pull from.
# Ensure that there is a basic library build for bdist_egg/wheel to pull from.
self.run_command("build")
_cleanup_symlinks(self)