From 38ebb70786a7b99b03e337e705f7c80f6f2d222e Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 15 Jan 2019 16:00:01 -0800 Subject: [PATCH] Merge pull request #1143 from RobinD42/fix-issue1140 Added missing setters for the wheel-related properties in wx.MouseEvent (cherry picked from commit c3cbf2e68abff65aa38ec4d53597f00caa41ab8e) --- CHANGES.rst | 2 ++ etg/event.py | 25 +++++++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 1f3152b4..aced86fc 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -53,6 +53,8 @@ Changes in this release include the following: * Added missing HtmlWindow.ScrollToAnchor method, and also a couple methods in HtmlCell too. (#1141) +* Added missing setters for the wheel-related properties in wx.MouseEvent. + (#1140) diff --git a/etg/event.py b/etg/event.py index 5540628a..2fec8186 100644 --- a/etg/event.py +++ b/etg/event.py @@ -419,10 +419,27 @@ def run(): #--------------------------------------- # wxMouseEvent c = module.find('wxMouseEvent') - c.addProperty('LinesPerAction GetLinesPerAction') - c.addProperty('LogicalPosition GetLogicalPosition') - c.addProperty('WheelDelta GetWheelDelta') - c.addProperty('WheelRotation GetWheelRotation') + + c.addCppMethod('void', 'SetWheelAxis', '(wxMouseWheelAxis wheelAxis)', + body="self->m_wheelAxis = wheelAxis;") + + c.addCppMethod('void', 'SetWheelRotation', '(int wheelRotation)', + body="self->m_wheelRotation = wheelRotation;") + + c.addCppMethod('void', 'SetWheelDelta', '(int wheelDelta)', + body="self->m_wheelDelta = wheelDelta;") + + c.addCppMethod('void', 'SetLinesPerAction', '(int linesPerAction)', + body="self->m_linesPerAction = linesPerAction;") + + c.addCppMethod('void', 'SetColumnsPerAction', '(int columnsPerAction)', + body="self->m_columnsPerAction = columnsPerAction;") + + c.addProperty('WheelAxis GetWheelAxis SetWheelAxis') + c.addProperty('WheelRotation GetWheelRotation SetWheelRotation') + c.addProperty('WheelDelta GetWheelDelta SetWheelDelta') + c.addProperty('LinesPerAction GetLinesPerAction SetLinesPerAction') + c.addProperty('ColumnsPerAction GetColumnsPerAction SetColumnsPerAction') #--------------------------------------- # wxSetCursorEvent