From 3bce916e34fa306ec882cbab022dfd212bb56e34 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 4 Sep 2019 14:18:12 -0700
Subject: [PATCH] Update wxWidgets, add wxDPIChangedEvent, adapt to some
 propgrid api changes

---
 docs/sphinx/itemToModuleMap.json | 10 ++++++++++
 etg/_xrc.py                      |  4 ++++
 etg/event.py                     |  1 +
 etg/propgridproperty.py          |  6 ++++--
 ext/wxWidgets                    |  2 +-
 src/event_ex.py                  |  1 +
 6 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/docs/sphinx/itemToModuleMap.json b/docs/sphinx/itemToModuleMap.json
index 499cd436..fbb28ffa 100644
--- a/docs/sphinx/itemToModuleMap.json
+++ b/docs/sphinx/itemToModuleMap.json
@@ -812,6 +812,7 @@
 "DISABLE_DEBUG_SUPPORT":"wx.",
 "DOUBLE_BORDER":"wx.",
 "DOWN":"wx.",
+"DPIChangedEvent":"wx.",
 "DP_ALLOWNONE":"wx.adv.",
 "DP_DEFAULT":"wx.adv.",
 "DP_DROPDOWN":"wx.adv.",
@@ -2803,6 +2804,7 @@
 "PG_DEFAULT_IMAGE_SIZE":"wx.propgrid.",
 "PG_DEFAULT_STYLE":"wx.propgrid.",
 "PG_DESCRIPTION":"wx.propgrid.",
+"PG_DIALOG_TITLE":"wx.propgrid.",
 "PG_DONT_RECURSE":"wx.propgrid.",
 "PG_EDITABLE_VALUE":"wx.propgrid.",
 "PG_EX_ALWAYS_ALLOW_FOCUS":"wx.propgrid.",
@@ -5942,6 +5944,12 @@
 "SVGBitmapFileHandler":"wx.",
 "SVGBitmapHandler":"wx.",
 "SVGFileDC":"wx.",
+"SVGShapeRenderingMode":"wx.",
+"SVG_SHAPE_RENDERING_AUTO":"wx.",
+"SVG_SHAPE_RENDERING_CRISP_EDGES":"wx.",
+"SVG_SHAPE_RENDERING_GEOMETRIC_PRECISION":"wx.",
+"SVG_SHAPE_RENDERING_OPTIMISE_SPEED":"wx.",
+"SVG_SHAPE_RENDERING_OPTIMIZE_SPEED":"wx.",
 "SWISS_FONT":"wx.",
 "SW_3D":"wx.adv.",
 "SW_3DBORDER":"wx.adv.",
@@ -6931,6 +6939,7 @@
 "XRCID":"wx.xrc.",
 "XRC_NO_RELOADING":"wx.xrc.",
 "XRC_NO_SUBCLASSING":"wx.xrc.",
+"XRC_USE_ENVVARS":"wx.xrc.",
 "XRC_USE_LOCALE":"wx.xrc.",
 "XmlAttribute":"wx.xml.",
 "XmlDoctype":"wx.xml.",
@@ -7075,6 +7084,7 @@
 "wxEVT_DIRCTRL_SELECTIONCHANGED":"wx.",
 "wxEVT_DIRPICKER_CHANGED":"wx.",
 "wxEVT_DISPLAY_CHANGED":"wx.",
+"wxEVT_DPI_CHANGED":"wx.",
 "wxEVT_DROP_FILES":"wx.",
 "wxEVT_END_PROCESS":"wx.",
 "wxEVT_END_SESSION":"wx.",
diff --git a/etg/_xrc.py b/etg/_xrc.py
index 13ef615a..aac5ea5c 100644
--- a/etg/_xrc.py
+++ b/etg/_xrc.py
@@ -143,6 +143,10 @@ def run():
 
     c.find('DoCreateResource').factory = True
 
+    # TODO: It looks like there may be a bug in wx here.
+    # Just ignore it for now.
+    c.find('GetFilePath').ignore()
+
 
     #-----------------------------------------------------------------
     module.addPyFunction('EmptyXmlResource', '(flags=XRC_USE_LOCALE, domain="")',
diff --git a/etg/event.py b/etg/event.py
index 2fec8186..bd587c66 100644
--- a/etg/event.py
+++ b/etg/event.py
@@ -33,6 +33,7 @@ ITEMS  = [
     'wxCloseEvent',
     'wxContextMenuEvent',
     'wxDisplayChangedEvent',
+    'wxDPIChangedEvent',
     'wxDropFilesEvent',
     'wxEraseEvent',
     'wxFocusEvent',
diff --git a/etg/propgridproperty.py b/etg/propgridproperty.py
index 51fb90dc..60bac2a3 100644
--- a/etg/propgridproperty.py
+++ b/etg/propgridproperty.py
@@ -196,9 +196,10 @@ def run():
                   'wxPG_FILE_SHOW_FULL_PATH',
                   'wxPG_FILE_SHOW_RELATIVE_PATH',
                   'wxPG_FILE_INITIAL_PATH',
-                  'wxPG_FILE_DIALOG_TITLE',
+                  # 'wxPG_FILE_DIALOG_TITLE',
+                  'wxPG_DIALOG_TITLE',
                   'wxPG_FILE_DIALOG_STYLE',
-                  'wxPG_DIR_DIALOG_MESSAGE',
+                  # 'wxPG_DIR_DIALOG_MESSAGE',
                   'wxPG_ARRAY_DELIMITER',
                   'wxPG_DATE_FORMAT',
                   'wxPG_DATE_PICKER_STYLE',
@@ -234,6 +235,7 @@ def run():
             PG_FILE_SHOW_RELATIVE_PATH        = u"ShowRelativePath"
             PG_FILE_INITIAL_PATH              = u"InitialPath"
             PG_FILE_DIALOG_TITLE              = u"DialogTitle"
+            PG_DIALOG_TITLE                   = u"DialogTitle"
             PG_FILE_DIALOG_STYLE              = u"DialogStyle"
             PG_DIR_DIALOG_MESSAGE             = u"DialogMessage"
             PG_ARRAY_DELIMITER                = u"Delimiter"
diff --git a/ext/wxWidgets b/ext/wxWidgets
index cd2e3dd2..1269b712 160000
--- a/ext/wxWidgets
+++ b/ext/wxWidgets
@@ -1 +1 @@
-Subproject commit cd2e3dd2cf2df4df386f843fee60b933736c2e47
+Subproject commit 1269b712bb80856434dc69bd88b4631724cb9fee
diff --git a/src/event_ex.py b/src/event_ex.py
index ccd26897..e09418da 100644
--- a/src/event_ex.py
+++ b/src/event_ex.py
@@ -30,6 +30,7 @@ EVT_DROP_FILES = wx.PyEventBinder( wxEVT_DROP_FILES )
 EVT_INIT_DIALOG = wx.PyEventBinder( wxEVT_INIT_DIALOG )
 EVT_SYS_COLOUR_CHANGED = wx.PyEventBinder( wxEVT_SYS_COLOUR_CHANGED )
 EVT_DISPLAY_CHANGED = wx.PyEventBinder( wxEVT_DISPLAY_CHANGED )
+EVT_DPI_CHANGED = wx.PyEventBinder( wxEVT_DPI_CHANGED )
 EVT_SHOW = wx.PyEventBinder( wxEVT_SHOW )
 EVT_MAXIMIZE = wx.PyEventBinder( wxEVT_MAXIMIZE )
 EVT_ICONIZE = wx.PyEventBinder( wxEVT_ICONIZE )