Add classes that have been added to existing interface headers

javagner · Feb 9, 2018 · f1a24d4 · f1a24d4
1 parent 6b56f8e
commit f1a24d4
Show file tree

Hide file tree

Showing 15 changed files with 77 additions and 5 deletions.
diff --git a/etg/_glcanvas.py b/etg/_glcanvas.py
@@ -19,7 +19,10 @@
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script.
-ITEMS  = [ 'wxGLContext',
+ITEMS  = [ 'wxGLAttribsBase',
+           'wxGLAttributes',
+           'wxGLContextAttrs',
+           'wxGLContext',
            'wxGLCanvas',
           ]
 
@@ -67,6 +70,9 @@ def run():
     c.addPrivateCopyCtor()
 
 
+    c = module.find('wxGLAttribsBase')
+    assert isinstance(c, etgtools.ClassDef)
+    c.find('GetGLAttrs').ignore()
 
     c = module.find('wxGLCanvas')
     tools.fixWindowClass(c)

diff --git a/etg/_xml.py b/etg/_xml.py
@@ -25,6 +25,7 @@
 ITEMS  = [ 'wxXmlNode',
            'wxXmlAttribute',
            'wxXmlDocument',
+           'wxXmlDoctype',
            ]
 
 

diff --git a/etg/auiframemanager.py b/etg/auiframemanager.py
@@ -23,6 +23,7 @@
            'wxAuiDockInfo',
            'wxAuiDockUIPart',
            'wxAuiPaneButton',
+           'wxAuiFloatingFrame'
            ]
 
 #---------------------------------------------------------------------------

diff --git a/etg/busyinfo.py b/etg/busyinfo.py
@@ -18,6 +18,7 @@
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script.
 ITEMS  = [ "wxBusyInfo",
+           "wxBusyInfoFlags",
            ]
 
 #---------------------------------------------------------------------------

diff --git a/etg/dataview.py b/etg/dataview.py
@@ -35,6 +35,7 @@
             'wxDataViewCustomRenderer',
             'wxDataViewTextRenderer',
             'wxDataViewIconTextRenderer',
+            'wxDataViewCheckIconTextRenderer',
             'wxDataViewProgressRenderer',
             'wxDataViewSpinRenderer',
             'wxDataViewToggleRenderer',
@@ -46,6 +47,7 @@
             'wxDataViewColumn',
             'wxDataViewCtrl',
             'wxDataViewEvent',
+            'wxDataViewValueAdjuster',
 
             'wxDataViewListCtrl',
             'wxDataViewListStore',

diff --git a/etg/dcsvg.py b/etg/dcsvg.py
@@ -17,7 +17,12 @@
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script.
-ITEMS  = [ 'wxSVGFileDC' ]
+ITEMS  = [ 'wxSVGFileDC',
+           'wxSVGBitmapHandler',
+           'wxSVGBitmapEmbedHandler',
+           'wxSVGBitmapFileHandler',
+
+           ]
 
 #---------------------------------------------------------------------------
 

diff --git a/etg/event.py b/etg/event.py
@@ -63,6 +63,15 @@
     'wxWindowCreateEvent',
     'wxWindowDestroyEvent',
 
+    'wxGestureEvent',
+    'wxPanGestureEvent',
+    'wxZoomGestureEvent',
+    'wxRotateGestureEvent',
+    'wxTwoFingerTapEvent',
+    'wxLongPressEvent',
+    'wxPressAndTapEvent',
+
+
     #'wxThreadEvent',
 
 ]

diff --git a/etg/graphics.py b/etg/graphics.py
@@ -24,6 +24,7 @@
             'wxGraphicsBitmap',
             'wxGraphicsBrush',
             'wxGraphicsFont',
+            'wxGraphicsPenInfo',
             'wxGraphicsPen',
             'wxGraphicsContext',
             'wxGraphicsGradientStop',
@@ -225,6 +226,15 @@ def markFactories(klass):
                    factory=True)
 
 
+    #---------------------------------------------
+    c = module.find('wxGraphicsPenInfo')
+    # Ignore Dashes for now
+    # TODO: we need to do something like wx.Pen.SetDashes, but since
+    # GraphicsPenInfo is transitory we can't save the reference in it to the
+    # holder, and the pen will not have been created yet...
+    c.find('Dashes').ignore()
+
+
     #---------------------------------------------
     # Use the pyNames we set for these classes in geometry.py so the old
     # names do not show up in the docstrings, etc.

diff --git a/etg/listctrl.py b/etg/listctrl.py
@@ -17,7 +17,7 @@
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script.
-ITEMS  = [ "wxListItemAttr",
+ITEMS  = [ "wxItemAttr",  # TODO: technically this should be in its own etg script...
            "wxListItem",
            "wxListCtrl",
            "wxListView",

diff --git a/etg/pen.py b/etg/pen.py
@@ -17,7 +17,9 @@
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script.
-ITEMS  = [ 'wxPen', 'wxPenList', ]
+ITEMS  = [ 'wxPenInfo',
+           'wxPen',
+           'wxPenList', ]
 
 #---------------------------------------------------------------------------
 
@@ -103,11 +105,18 @@ def run():
     module.addPyCode(pycode)
 
 
+    c = module.find('wxPenInfo')
+    # Ignore Dashes for now
+    # TODO: we need to do something like SetDashes above, but since PenInfo is
+    # transitory we can't save the reference in it to the holder, and the pen
+    # will not have been created yet...
+    c.find('Dashes').ignore()
+
+
     # it is delay-initialized, see stockgdi.sip
     module.find('wxThePenList').ignore()
 
 
-
     # Some aliases that should be phased out eventually, (sooner rather than
     # later.) They are already gone (or wrapped by an #if) in the C++ code,
     # and so are not found in the documentation...

diff --git a/etg/power.py b/etg/power.py
@@ -18,6 +18,8 @@
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script.
 ITEMS  = [ "wxPowerEvent",
+           'wxPowerResource',
+           'wxPowerResourceBlocker',
            ]
 
 #---------------------------------------------------------------------------
@@ -68,6 +70,11 @@ class wxPowerEvent : public wxEvent
         EVT_POWER_RESUME           = wx.PyEventBinder( wxEVT_POWER_RESUME , 1 )
         """)
 
+
+    c = module.find('wxPowerResourceBlocker')
+    c.addPrivateCopyCtor()
+    c.addPrivateAssignOp()
+
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)
     tools.runGenerators(module)

diff --git a/etg/propgrid.py b/etg/propgrid.py
@@ -21,6 +21,7 @@
            'wxPGValidationInfo',
            'wxPropertyGrid',
            'wxPropertyGridEvent',
+           'wxPropertyGridPopulator',
            ]
 
 #---------------------------------------------------------------------------
@@ -116,6 +117,10 @@ def _PropertyGrid__init__(self, *args, **kw):
         if hasattr(item, 'type') and 'wxVariant' in item.type:
             item.type = item.type.replace('wxVariant', 'wxPGVariant')
 
+
+    c = module.find('wxPropertyGridPopulator')
+    tools.ignoreConstOverloads(c)
+
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)
     tools.runGenerators(module)

diff --git a/etg/propgridproperty.py b/etg/propgridproperty.py
@@ -22,6 +22,7 @@
            'wxPGDefaultRenderer',
            'wxPGCellData',
            'wxPGCell',
+           'wxPGAttributeStorage',
 
            'wxPGProperty',
            'wxPropertyCategory',

diff --git a/etg/richtextbuffer.py b/etg/richtextbuffer.py
@@ -23,6 +23,7 @@
            "wxTextAttrDimensionConverter",
            "wxTextAttrBorder",
            "wxTextAttrBorders",
+           "wxTextAttrShadow",
            "wxTextBoxAttr",
            "wxRichTextAttr",
            "wxRichTextProperties",
@@ -134,6 +135,11 @@ class wxRichTextFloatCollector;
     c.addCppMethod('int', '__nonzero__', '()', "return self->IsValid();")
 
 
+    #-------------------------------------------------------
+    c = module.find('wxTextAttrShadow')
+    tools.ignoreConstOverloads(c)
+
+
     #-------------------------------------------------------
     c = module.find('wxTextBoxAttr')
     tools.ignoreConstOverloads(c)

diff --git a/src/event_ex.py b/src/event_ex.py
@@ -82,6 +82,7 @@
                                       wxEVT_AUX2_UP,
                                       wxEVT_AUX2_DCLICK,
                                      ])
+EVT_MAGNIFY = wx.PyEventBinder( wxEVT_MAGNIFY )
 
 
 # Scrolling from wxWindow (sent to wxScrolledWindow)
@@ -208,6 +209,14 @@
                                         wxEVT_JOY_ZMOVE,
                                         ])
 
+EVT_GESTURE_PAN = wx.PyEventBinder( wxEVT_GESTURE_PAN )
+EVT_GESTURE_ZOOM = wx.PyEventBinder( wxEVT_GESTURE_ZOOM )
+EVT_GESTURE_ROTATE = wx.PyEventBinder( wxEVT_GESTURE_ROTATE )
+EVT_TWO_FINGER_TAP = wx.PyEventBinder( wxEVT_TWO_FINGER_TAP )
+EVT_LONG_PRESS = wx.PyEventBinder( wxEVT_LONG_PRESS )
+EVT_PRESS_AND_TAP = wx.PyEventBinder( wxEVT_PRESS_AND_TAP )
+
+
 # deprecated wxEVT aliases
 wxEVT_COMMAND_BUTTON_CLICKED         = wxEVT_BUTTON
 wxEVT_COMMAND_CHECKBOX_CLICKED       = wxEVT_CHECKBOX