From 73b2e4515669feca33a806737634c3505c811634 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 3 Mar 2015 20:48:37 -0800 Subject: [PATCH] More progress on propgrid classes --- etg/property.py | 22 ++++++++++++++++++---- etg/propgrideditors.py | 16 +++++++++++++--- sphinxtools/constants.py | 3 ++- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/etg/property.py b/etg/property.py index 8c1d9e30..126ba40b 100644 --- a/etg/property.py +++ b/etg/property.py @@ -17,11 +17,15 @@ DOCSTRING = "" # The classes and/or the basename of the Doxygen XML files to be processed by # this script. -ITEMS = [ 'wxPGProperty', - 'wxPGCell', - 'wxPGChoices', - 'wxPGPaintData', +ITEMS = [ 'wxPGPaintData', 'wxPGCellRenderer', + 'wxPGDefaultRenderer', + 'wxPGCellData', + 'wxPGProperty', + 'wxPGCell', + 'wxPGChoiceEntry', + 'wxPGChoicesData', + 'wxPGChoices', ] #--------------------------------------------------------------------------- @@ -37,6 +41,16 @@ def run(): c = module.find('wxPGProperty') assert isinstance(c, etgtools.ClassDef) + tools.ignoreConstOverloads(c) + + + c = module.find('wxPGChoicesData') + tools.ignoreConstOverloads(c) + + + c = module.find('wxPGChoices') + c.find('wxPGChoices').findOverload('wxChar **').ignore() + tools.ignoreConstOverloads(c) #----------------------------------------------------------------- diff --git a/etg/propgrideditors.py b/etg/propgrideditors.py index 914415db..88f88481 100644 --- a/etg/propgrideditors.py +++ b/etg/propgrideditors.py @@ -17,7 +17,15 @@ DOCSTRING = "" # The classes and/or the basename of the Doxygen XML files to be processed by # this script. -ITEMS = [ 'wxPGEditor', +ITEMS = [ 'wxPGWindowList', + 'wxPGEditor', + 'wxPGTextCtrlEditor', + 'wxPGChoiceEditor', + 'wxPGComboBoxEditor', + 'wxPGChoiceAndButtonEditor', + 'wxPGTextCtrlAndButtonEditor', + 'wxPGCheckBoxEditor', + 'wxPGEditorDialogAdapter', 'wxPGMultiButton', ] @@ -32,8 +40,10 @@ def run(): # Tweak the parsed meta objects in the module object as needed for # customizing the generated code and docstrings. - #c = module.find('') - #assert isinstance(c, etgtools.ClassDef) + c = module.find('wxPGMultiButton') + assert isinstance(c, etgtools.ClassDef) + tools.fixWindowClass(c) + #----------------------------------------------------------------- diff --git a/sphinxtools/constants.py b/sphinxtools/constants.py index f4846187..bf0e3a7b 100644 --- a/sphinxtools/constants.py +++ b/sphinxtools/constants.py @@ -5,7 +5,7 @@ # Author: Andrea Gavana # # Created: 30-Nov-2010 -# Copyright: (c) 2010-2016 by Total Control Software +# Copyright: (c) 2013 by Total Control Software # License: wxWindows License #--------------------------------------------------------------------------- @@ -84,6 +84,7 @@ MODULENAME_REPLACE = {'_core' : 'wx.', '_media' : 'wx.media.', '_msw' : 'wx.msw.', '_ribbon' : 'wx.ribbon.', + '_propgrid': 'wx.propgrid.', }