M0ve the call to addAutoProperties into the doCommonTweaks function, but make it not generate the auto properties if there are already properties in the class or the class explicitly clears the alllowAutoProperties flag, turning it off.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2026-01-08 04:50:07 +01:00 · 2011-10-24 21:35:29 +00:00
parent 54520f7a3a
commit 766baba0a6
52 changed files with 17 additions and 51 deletions
--- a/etg/accel.py
+++ b/etg/accel.py
@@ -102,7 +102,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/bitmap.py
+++ b/etg/bitmap.py
@@ -74,7 +74,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/button.py
+++ b/etg/button.py
@@ -35,7 +35,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/checkbox.py
+++ b/etg/checkbox.py
@@ -38,7 +38,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/checklst.py
+++ b/etg/checklst.py
@@ -87,7 +87,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/choice.py
+++ b/etg/choice.py
@@ -42,7 +42,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/collpane.py
+++ b/etg/collpane.py
@@ -45,7 +45,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/combobox.py
+++ b/etg/combobox.py
@@ -54,7 +54,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/config.py
+++ b/etg/config.py
@@ -130,7 +130,6 @@ def run():
        
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/control.py
+++ b/etg/control.py
@@ -39,7 +39,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/cursor.py
+++ b/etg/cursor.py
@@ -82,7 +82,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/dataobj.py
+++ b/etg/dataobj.py
@@ -52,7 +52,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/dataview.py
+++ b/etg/dataview.py
@@ -60,7 +60,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/dc.py
+++ b/etg/dc.py
@@ -225,7 +225,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/dcgraph.py
+++ b/etg/dcgraph.py
@@ -45,7 +45,6 @@ def run():


    #-----------------------------------------------------------------
-    tools.addAutoProperties(module)
    tools.doCommonTweaks(module)
    tools.runGenerators(module)
    
--- a/etg/dialog.py
+++ b/etg/dialog.py
@@ -58,7 +58,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/dirdlg.py
+++ b/etg/dirdlg.py
@@ -36,7 +36,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/filedlg.py
+++ b/etg/filedlg.py
@@ -67,7 +67,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/gauge.py
+++ b/etg/gauge.py
@@ -38,7 +38,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/graphics.py
+++ b/etg/graphics.py
@@ -225,7 +225,6 @@ def run():

    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/imaglist.py
+++ b/etg/imaglist.py
@@ -43,7 +43,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/intl.py
+++ b/etg/intl.py
@@ -62,7 +62,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/listbox.py
+++ b/etg/listbox.py
@@ -58,7 +58,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/log.py
+++ b/etg/log.py
@@ -106,7 +106,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/menu.py
+++ b/etg/menu.py
@@ -121,7 +121,6 @@ def run():

    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/menuitem.py
+++ b/etg/menuitem.py
@@ -114,7 +114,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/msgdlg.py
+++ b/etg/msgdlg.py
@@ -57,7 +57,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/nonownedwnd.py
+++ b/etg/nonownedwnd.py
@@ -37,7 +37,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/notebook.py
+++ b/etg/notebook.py
@@ -40,7 +40,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/platinfo.py
+++ b/etg/platinfo.py
@@ -53,7 +53,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/process.py
+++ b/etg/process.py
@@ -17,7 +17,9 @@ DOCSTRING = ""

 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script. 
-ITEMS  = [ 'wxProcess' ]    
+ITEMS  = [ 'wxProcess',
+           'wxProcessEvent',
+           ]    
    
 #---------------------------------------------------------------------------

@@ -32,6 +34,7 @@ def run():
    
    
    
+    module.addPyCode('EVT_END_PROCESS = wx.PyEventBinder( wxEVT_END_PROCESS )')
    
    
    #-----------------------------------------------------------------
--- a/etg/radiobox.py
+++ b/etg/radiobox.py
@@ -43,7 +43,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/radiobtn.py
+++ b/etg/radiobtn.py
@@ -37,7 +37,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/scrolwin.py
+++ b/etg/scrolwin.py
@@ -52,7 +52,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/searchctrl.py
+++ b/etg/searchctrl.py
@@ -39,7 +39,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/sizer.py
+++ b/etg/sizer.py
@@ -78,7 +78,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/slider.py
+++ b/etg/slider.py
@@ -42,7 +42,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/spinctrl.py
+++ b/etg/spinctrl.py
@@ -35,7 +35,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/splitter.py
+++ b/etg/splitter.py
@@ -39,7 +39,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/statbmp.py
+++ b/etg/statbmp.py
@@ -38,7 +38,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/statline.py
+++ b/etg/statline.py
@@ -35,7 +35,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/stattext.py
+++ b/etg/stattext.py
@@ -37,7 +37,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/statusbar.py
+++ b/etg/statusbar.py
@@ -35,7 +35,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/stdpaths.py
+++ b/etg/stdpaths.py
@@ -52,7 +52,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/textctrl.py
+++ b/etg/textctrl.py
@@ -58,7 +58,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/timer.py
+++ b/etg/timer.py
@@ -55,7 +55,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/togglebtn.py
+++ b/etg/togglebtn.py
@@ -37,7 +37,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etg/utils.py
+++ b/etg/utils.py
@@ -60,11 +60,14 @@ def run():
        if 'Env' in item.name:
            item.ignore()
    module.find('wxGetenv').ignore()
-    
+
    # Keep just the first wxExecute overload
    f = module.find('wxExecute')
    f.overloads = []
    
+    module.find('wxGetOsVersion.major').out = True
+    module.find('wxGetOsVersion.minor').out = True
+    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
    tools.runGenerators(module)
--- a/etg/withimage.py
+++ b/etg/withimage.py
@@ -38,7 +38,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etgtools/extractors.py
+++ b/etgtools/extractors.py
@@ -503,6 +503,7 @@ class ClassDef(BaseDef):
        self.external = False       # class is in another module
        self.noDefCtor = False      # do not generate a default constructor
        self.singlton = False       # class is a singleton so don't call the dtor until the interpreter exits
+        self.allowAutoProperties = True
        self.headerCode = []
        self.cppCode = []
        self.convertToPyObject = None
--- a/etgtools/make-new-etg-file.py
+++ b/etgtools/make-new-etg-file.py
@@ -61,7 +61,6 @@ def run():
    
    #-----------------------------------------------------------------
    tools.doCommonTweaks(module)
-    tools.addAutoProperties(module)
    tools.runGenerators(module)
    
    
--- a/etgtools/tweaker_tools.py
+++ b/etgtools/tweaker_tools.py
@@ -68,10 +68,16 @@ def ignoreAllOperators(node):
            
 def addAutoProperties(node):
    """
-    Call klass.addAutoProperties for all classes in node.
+    Call klass.addAutoProperties for all classes in node with
+    allowAutoProperties set and which do not already have properties added by
+    hand in the tweaker code.
    """
    for item in node.allItems():
        if isinstance(item, extractors.ClassDef):
+            if not item.allowAutoProperties:
+                continue
+            if len([i for i in item if isinstance(i, extractors.PropertyDef)]):
+                continue
            item.addAutoProperties()

            
@@ -274,6 +280,7 @@ def doCommonTweaks(module):
    """
    ignoreAssignmentOperators(module)
    removeWxPrefixes(module)
+    addAutoProperties(module)
    
    
 def changeTypeNames(module, oldName, newName, skipTypedef=False):