mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2026-01-25 21:20:08 +01:00
Remove all but the 3rd trial implementation for dealing with the multiple inheritance in the scrolled window classes.
This commit is contained in:
Robin Dunn
280
etg/vscroll.py
280
etg/vscroll.py
@@ -27,7 +27,6 @@ ITEMS = [ "wxVarScrollHelperBase",
|
||||
"wxHVScrolledWindow",
|
||||
]
|
||||
|
||||
KEEP_ALL = 3
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
@@ -40,240 +39,65 @@ def run():
|
||||
# Tweak the parsed meta objects in the module object as needed for
|
||||
# customizing the generated code and docstrings.
|
||||
|
||||
|
||||
c = module.find('wxVarScrollHelperBase')
|
||||
assert isinstance(c, etgtools.ClassDef)
|
||||
c.abstract = True
|
||||
|
||||
c.find('OnGetUnitsSizeHint').ignore(False)
|
||||
c.find('EstimateTotalSize').ignore(False)
|
||||
c.find('OnGetUnitSize').ignore(False)
|
||||
|
||||
c.find('GetTargetWindow').isVirtual = False
|
||||
c.find('SetTargetWindow').isVirtual = False
|
||||
c.find('RefreshAll').isVirtual = False
|
||||
c.find('UpdateScrollbar').isVirtual = False
|
||||
|
||||
# Ensure that SIP knows that there are implementations of these base
|
||||
# class virtual methods in each of the two helper classes below.
|
||||
baseVirtuals = """\
|
||||
virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const;
|
||||
virtual wxCoord EstimateTotalSize() const;
|
||||
virtual int GetNonOrientationTargetSize() const;
|
||||
virtual wxOrientation GetOrientation() const;
|
||||
virtual int GetOrientationTargetSize() const;
|
||||
virtual wxCoord OnGetUnitSize(size_t unit) const;
|
||||
"""
|
||||
|
||||
|
||||
if KEEP_ALL == 1:
|
||||
# First (more like 3rd...) attempt. Try to keep all the classes and
|
||||
# virtuals available to Python, and untangle things using SIP's
|
||||
# directive's etc. as needed
|
||||
|
||||
c = module.find('wxVarScrollHelperBase')
|
||||
assert isinstance(c, etgtools.ClassDef)
|
||||
c.find('OnGetUnitsSizeHint').ignore(False)
|
||||
c.find('EstimateTotalSize').ignore(False)
|
||||
c.find('OnGetUnitSize').ignore(False)
|
||||
|
||||
|
||||
# Ensure that SIP knows that there are implementations of these base
|
||||
# class virtual methods in each of the two helper classes below.
|
||||
baseVirtuals = """\
|
||||
virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const;
|
||||
virtual wxCoord EstimateTotalSize() const;
|
||||
virtual int GetNonOrientationTargetSize() const;
|
||||
virtual wxOrientation GetOrientation() const;
|
||||
virtual int GetOrientationTargetSize() const;
|
||||
virtual wxCoord OnGetUnitSize(size_t unit) const;
|
||||
"""
|
||||
|
||||
c = module.find('wxVarVScrollHelper')
|
||||
c.addItem(WigCode(baseVirtuals, protection='protected'))
|
||||
c.find('EstimateTotalHeight').ignore(False)
|
||||
c.find('OnGetRowsHeightHint').ignore(False)
|
||||
c.find('OnGetRowHeight').ignore(False)
|
||||
c.find('RefreshRows.from').name = 'from_'
|
||||
c.find('RefreshRows.to').name = 'to_'
|
||||
|
||||
c = module.find('wxVarHScrollHelper')
|
||||
c.addItem(WigCode(baseVirtuals, protection='protected'))
|
||||
c.find('EstimateTotalWidth').ignore(False)
|
||||
c.find('OnGetColumnsWidthHint').ignore(False)
|
||||
c.find('OnGetColumnWidth').ignore(False)
|
||||
c.find('RefreshColumns.from').name = 'from_'
|
||||
c.find('RefreshColumns.to').name = 'to_'
|
||||
|
||||
|
||||
|
||||
c = module.find('wxVarHVScrollHelper')
|
||||
# This class is the bottom of a diamond inheritance hierarchy, and since
|
||||
# the same virtual methods may be inherited from both sides we need to
|
||||
# help the generator know which version of the methods to call.
|
||||
def _baseVirtualHints(decl, methCode, vCallCode):
|
||||
code = """\
|
||||
{decl}
|
||||
%MethodCode
|
||||
{methCode}
|
||||
%End
|
||||
%VirtualCallCode
|
||||
{vCallCode}
|
||||
%End
|
||||
""".format(**locals())
|
||||
return code
|
||||
|
||||
for decl, methCode, vCallCode in [
|
||||
('virtual wxCoord OnGetUnitSize(size_t unit) const;',
|
||||
'sipRes = sipCpp->wxVarVScrollHelper::OnGetUnitSize(unit);',
|
||||
'sipRes = wxVarVScrollHelper::OnGetUnitSize(unit);'),
|
||||
|
||||
('virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const;',
|
||||
'sipCpp->wxVarVScrollHelper::OnGetUnitsSizeHint(unitMin, unitMax);',
|
||||
'wxVarVScrollHelper::OnGetUnitsSizeHint(unitMin, unitMax);'),
|
||||
|
||||
('virtual wxCoord EstimateTotalSize() const;',
|
||||
'sipRes = sipCpp->wxVarVScrollHelper::EstimateTotalSize();',
|
||||
'sipRes = wxVarVScrollHelper::EstimateTotalSize();'),
|
||||
|
||||
('virtual wxOrientation GetOrientation() const;',
|
||||
'sipRes = sipCpp->wxVarVScrollHelper::GetOrientation();',
|
||||
'sipRes = wxVarVScrollHelper::GetOrientation();'),
|
||||
|
||||
('virtual int GetOrientationTargetSize() const;',
|
||||
'sipRes = sipCpp->wxVarVScrollHelper::GetOrientationTargetSize();',
|
||||
'sipRes = wxVarVScrollHelper::GetOrientationTargetSize();'),
|
||||
|
||||
('virtual int GetNonOrientationTargetSize() const;',
|
||||
'sipRes = sipCpp->wxVarVScrollHelper::GetNonOrientationTargetSize();',
|
||||
'sipRes = wxVarVScrollHelper::GetNonOrientationTargetSize();'),
|
||||
]:
|
||||
c.addItem(WigCode(_baseVirtualHints(decl, methCode, vCallCode), protection='protected'))
|
||||
|
||||
for decl, methCode, vCallCode in [
|
||||
('virtual void UpdateScrollbar();',
|
||||
'sipCpp->wxVarVScrollHelper::UpdateScrollbar();',
|
||||
'wxVarVScrollHelper::UpdateScrollbar();'),
|
||||
|
||||
('virtual wxWindow* GetTargetWindow() const;',
|
||||
'sipRes = sipCpp->wxVarVScrollHelper::GetTargetWindow();',
|
||||
'sipRes = wxVarVScrollHelper::GetTargetWindow();'),
|
||||
|
||||
('virtual void SetTargetWindow(wxWindow* target);',
|
||||
'sipCpp->wxVarVScrollHelper::SetTargetWindow(target);',
|
||||
'wxVarVScrollHelper::SetTargetWindow(target);'),
|
||||
|
||||
('virtual void RefreshAll();',
|
||||
'sipCpp->wxVarVScrollHelper::RefreshAll();',
|
||||
'wxVarVScrollHelper::RefreshAll();'),
|
||||
]:
|
||||
c.addItem(WigCode(_baseVirtualHints(decl, methCode, vCallCode), protection='public'))
|
||||
|
||||
|
||||
c = module.find('wxVScrolledWindow')
|
||||
tools.fixWindowClass(c)
|
||||
|
||||
c = module.find('wxHScrolledWindow')
|
||||
tools.fixWindowClass(c)
|
||||
|
||||
#c = module.find('wxHVScrolledWindow')
|
||||
#tools.fixWindowClass(c)
|
||||
|
||||
|
||||
|
||||
elif KEEP_ALL == 2:
|
||||
# This version will surgically exclude or unvirtualize things that
|
||||
# may be less important to Python code, in order to untangle the
|
||||
# multiple inheritance mess.
|
||||
c = module.find('wxVarVScrollHelper')
|
||||
c.addItem(WigCode(baseVirtuals, protection='protected'))
|
||||
c.find('EstimateTotalHeight').ignore(False)
|
||||
c.find('OnGetRowsHeightHint').ignore(False)
|
||||
c.find('OnGetRowHeight').ignore(False)
|
||||
c.find('RefreshRows.from').name = 'from_'
|
||||
c.find('RefreshRows.to').name = 'to_'
|
||||
|
||||
c = module.find('wxVarScrollHelperBase')
|
||||
assert isinstance(c, etgtools.ClassDef)
|
||||
c.abstract = True
|
||||
c.find('OnGetUnitsSizeHint').ignore()
|
||||
c.find('OnGetUnitSize').ignore()
|
||||
c.find('EstimateTotalSize').ignore()
|
||||
|
||||
c.find('GetOrientation').ignore()
|
||||
c.find('GetOrientationTargetSize').ignore()
|
||||
c.find('GetNonOrientationTargetSize').ignore()
|
||||
|
||||
c.find('GetTargetWindow').isVirtual = False
|
||||
c.find('SetTargetWindow').isVirtual = False
|
||||
c.find('RefreshAll').isVirtual = False
|
||||
c.find('UpdateScrollbar').isVirtual = False
|
||||
|
||||
# Ensure that SIP knows that there are implementations of these base
|
||||
# class virtual methods in each of the two helper classes below.
|
||||
baseVirtuals = """\
|
||||
// virtual wxOrientation GetOrientation() const;
|
||||
// virtual int GetOrientationTargetSize() const;
|
||||
// virtual int GetNonOrientationTargetSize() const;
|
||||
"""
|
||||
|
||||
c = module.find('wxVarVScrollHelper')
|
||||
c.addItem(WigCode(baseVirtuals, protection='protected'))
|
||||
c.find('EstimateTotalHeight').ignore(False)
|
||||
c.find('OnGetRowsHeightHint').ignore(False)
|
||||
c.find('OnGetRowHeight').ignore(False)
|
||||
c.find('RefreshRows.from').name = 'from_'
|
||||
c.find('RefreshRows.to').name = 'to_'
|
||||
|
||||
c = module.find('wxVarHScrollHelper')
|
||||
c.addItem(WigCode(baseVirtuals, protection='protected'))
|
||||
c.find('EstimateTotalWidth').ignore(False)
|
||||
c.find('OnGetColumnsWidthHint').ignore(False)
|
||||
c.find('OnGetColumnWidth').ignore(False)
|
||||
c.find('RefreshColumns.from').name = 'from_'
|
||||
c.find('RefreshColumns.to').name = 'to_'
|
||||
c = module.find('wxVarHScrollHelper')
|
||||
c.addItem(WigCode(baseVirtuals, protection='protected'))
|
||||
c.find('EstimateTotalWidth').ignore(False)
|
||||
c.find('OnGetColumnsWidthHint').ignore(False)
|
||||
c.find('OnGetColumnWidth').ignore(False)
|
||||
c.find('RefreshColumns.from').name = 'from_'
|
||||
c.find('RefreshColumns.to').name = 'to_'
|
||||
|
||||
c = module.find('wxVarHVScrollHelper')
|
||||
|
||||
c = module.find('wxVScrolledWindow')
|
||||
tools.fixWindowClass(c)
|
||||
|
||||
c = module.find('wxHScrolledWindow')
|
||||
tools.fixWindowClass(c)
|
||||
|
||||
#c = module.find('wxHVScrolledWindow')
|
||||
#tools.fixWindowClass(c)
|
||||
c = module.find('wxVarHVScrollHelper')
|
||||
# For this class those base methods shouldn't be overridden, (since there
|
||||
# are orientation-specfic versions in the 2 superclasses) so tell SIP
|
||||
# that they are private so it won't add support for them and end up with
|
||||
# multiple inheritance ambiguities.
|
||||
c.addItem(WigCode(baseVirtuals, protection='private'))
|
||||
|
||||
|
||||
|
||||
elif KEEP_ALL == 3:
|
||||
c = module.find('wxVarScrollHelperBase')
|
||||
assert isinstance(c, etgtools.ClassDef)
|
||||
c.abstract = True
|
||||
|
||||
c.find('OnGetUnitsSizeHint').ignore(False)
|
||||
c.find('EstimateTotalSize').ignore(False)
|
||||
c.find('OnGetUnitSize').ignore(False)
|
||||
|
||||
c.find('GetTargetWindow').isVirtual = False
|
||||
c.find('SetTargetWindow').isVirtual = False
|
||||
c.find('RefreshAll').isVirtual = False
|
||||
c.find('UpdateScrollbar').isVirtual = False
|
||||
|
||||
# Ensure that SIP knows that there are implementations of these base
|
||||
# class virtual methods in each of the two helper classes below.
|
||||
baseVirtuals = """\
|
||||
virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const;
|
||||
virtual wxCoord EstimateTotalSize() const;
|
||||
virtual int GetNonOrientationTargetSize() const;
|
||||
virtual wxOrientation GetOrientation() const;
|
||||
virtual int GetOrientationTargetSize() const;
|
||||
virtual wxCoord OnGetUnitSize(size_t unit) const;
|
||||
"""
|
||||
|
||||
c = module.find('wxVarVScrollHelper')
|
||||
c.addItem(WigCode(baseVirtuals, protection='protected'))
|
||||
c.find('EstimateTotalHeight').ignore(False)
|
||||
c.find('OnGetRowsHeightHint').ignore(False)
|
||||
c.find('OnGetRowHeight').ignore(False)
|
||||
c.find('RefreshRows.from').name = 'from_'
|
||||
c.find('RefreshRows.to').name = 'to_'
|
||||
|
||||
c = module.find('wxVarHScrollHelper')
|
||||
c.addItem(WigCode(baseVirtuals, protection='protected'))
|
||||
c.find('EstimateTotalWidth').ignore(False)
|
||||
c.find('OnGetColumnsWidthHint').ignore(False)
|
||||
c.find('OnGetColumnWidth').ignore(False)
|
||||
c.find('RefreshColumns.from').name = 'from_'
|
||||
c.find('RefreshColumns.to').name = 'to_'
|
||||
|
||||
|
||||
c = module.find('wxVarHVScrollHelper')
|
||||
# For this class those methods shouldn't be overridden, (since there
|
||||
# are orientation-specfic versions in the 2 superclasses) so tell SIP
|
||||
# that they are private so it won't add support for them and end up
|
||||
# with multiple inheritance ambiguities.
|
||||
c.addItem(WigCode(baseVirtuals, protection='private'))
|
||||
|
||||
|
||||
|
||||
c = module.find('wxVScrolledWindow')
|
||||
tools.fixWindowClass(c)
|
||||
|
||||
c = module.find('wxHScrolledWindow')
|
||||
tools.fixWindowClass(c)
|
||||
|
||||
c = module.find('wxHVScrolledWindow')
|
||||
tools.fixWindowClass(c)
|
||||
c = module.find('wxVScrolledWindow')
|
||||
tools.fixWindowClass(c)
|
||||
|
||||
c = module.find('wxHScrolledWindow')
|
||||
tools.fixWindowClass(c)
|
||||
|
||||
c = module.find('wxHVScrolledWindow')
|
||||
tools.fixWindowClass(c)
|
||||
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user