diff --git a/docs/sphinx/itemToModuleMap.json b/docs/sphinx/itemToModuleMap.json
index fba9c104..615dddbd 100644
--- a/docs/sphinx/itemToModuleMap.json
+++ b/docs/sphinx/itemToModuleMap.json
@@ -1419,6 +1419,7 @@
 "GridBagSizer":"wx.",
 "GridCellAttr":"wx.grid.",
 "GridCellAttrProvider":"wx.grid.",
+"GridCellAttrPtr":"wx.grid.",
 "GridCellAutoWrapStringEditor":"wx.grid.",
 "GridCellAutoWrapStringRenderer":"wx.grid.",
 "GridCellBoolEditor":"wx.grid.",
@@ -1429,6 +1430,7 @@
 "GridCellDateRenderer":"wx.grid.",
 "GridCellDateTimeRenderer":"wx.grid.",
 "GridCellEditor":"wx.grid.",
+"GridCellEditorPtr":"wx.grid.",
 "GridCellEnumEditor":"wx.grid.",
 "GridCellEnumRenderer":"wx.grid.",
 "GridCellFloatEditor":"wx.grid.",
@@ -1437,6 +1439,7 @@
 "GridCellNumberEditor":"wx.grid.",
 "GridCellNumberRenderer":"wx.grid.",
 "GridCellRenderer":"wx.grid.",
+"GridCellRendererPtr":"wx.grid.",
 "GridCellStringRenderer":"wx.grid.",
 "GridCellTextEditor":"wx.grid.",
 "GridColumnHeaderRenderer":"wx.grid.",
@@ -2577,6 +2580,8 @@
 "OS_WINDOWS_NT":"wx.",
 "Object":"wx.",
 "ObjectConstructorFn":"wx.",
+"ObjectDataPtr":"wx.",
+"ObjectDataPtr< T >":"wx.",
 "ObjectRefData":"wx.",
 "OperatingSystemId":"wx.",
 "Orientation":"wx.",
diff --git a/etg/auiframemanager.py b/etg/auiframemanager.py
index c9e075f3..1e1040ba 100644
--- a/etg/auiframemanager.py
+++ b/etg/auiframemanager.py
@@ -22,7 +22,6 @@ ITEMS  = [ 'wxAuiManager',
            'wxAuiManagerEvent',
            'wxAuiDockInfo',
            'wxAuiDockUIPart',
-           'wxAuiPaneButton',
            'wxAuiFloatingFrame'
            ]
 
@@ -68,9 +67,6 @@ def run():
     module.addItem(tools.wxArrayWrapperTemplate(
             'wxAuiDockUIPartArray', 'wxAuiDockUIPart', module))
 
-    module.addItem(tools.wxArrayWrapperTemplate(
-            'wxAuiPaneButtonArray', 'wxAuiPaneButton', module))
-
     module.addItem(tools.wxArrayWrapperTemplate(
             'wxAuiPaneInfoPtrArray', 'wxAuiPaneInfo', module, itemIsPtr=True))
 
diff --git a/etg/event.py b/etg/event.py
index 0d6d4636..38f6d0fa 100644
--- a/etg/event.py
+++ b/etg/event.py
@@ -383,6 +383,14 @@ def run():
     c.addProperty('String GetString SetString')
 
 
+    #---------------------------------------
+    # wxPaintEvent
+    c = module.find('wxPaintEvent')
+    # Although the default ctor is listed as public in the interface, it is
+    # magically made private for the users of fthe library as it can only be
+    # created within wxWidgets.
+    c.find('wxPaintEvent').protection = 'private'
+
     #---------------------------------------
     # wxKeyEvent
     c = module.find('wxKeyEvent')
@@ -600,7 +608,6 @@ def run():
     #---------------------------------------
     # wxIconizeEvent
     c = module.find('wxIconizeEvent')
-
     # deprecated and removed
     c.find('Iconized').ignore()
 
diff --git a/etg/grid.py b/etg/grid.py
index 3c6b533c..1f5bdc7e 100644
--- a/etg/grid.py
+++ b/etg/grid.py
@@ -293,6 +293,13 @@ def run():
     c.find('SetEditor.editor').transfer = True  # these are probably redundant now...
     c.find('SetRenderer.renderer').transfer = True
 
+    #-----------------------------------------------------------------
+    module.find('wxGridCellRendererPtr').piIgnored = True
+    module.find('wxGridCellEditorPtr').piIgnored = True
+    module.find('wxGridCellAttrPtr').piIgnored = True
+
+    module.addHeaderCode('#define sipName_ptr "ptr"')
+    module.addHeaderCode('#define sipName_tocopy "tocopy"')
 
     #-----------------------------------------------------------------
     # The instanceCode attribute is code that is used to make a default
diff --git a/etg/object.py b/etg/object.py
index 448575af..0861eec9 100644
--- a/etg/object.py
+++ b/etg/object.py
@@ -21,7 +21,9 @@ ITEMS  = [
     'wxRefCounter',
     'wxObject',
     'wxClassInfo',
-]
+    #'wxObjectDataPtr',
+    'classwx_object_data_ptr_3_01_t_01_4.xml',
+    ]
 
 #---------------------------------------------------------------------------
 
@@ -89,6 +91,22 @@ def run():
 
     tools.addSipConvertToSubClassCode(c)
 
+    #-----------------------------------------------------------------
+    c = module.find('wxObjectDataPtr< T >')
+    c.name = 'wxObjectDataPtr'
+    c.piIgnored = True
+
+    # fix up the ctor/dtor due to name change above
+    ctor = c.find('wxObjectDataPtr')
+    ctor.isCtor = True
+    dtor = c.find('~wxObjectDataPtr')
+    dtor.isDtor = True
+
+    c.find('operator->').ignore()
+    c.find('operator*').ignore()
+    c.find('operator unspecified_bool_type').ignore()
+
+
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)
     tools.runGenerators(module)