Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 20:10:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

The new SIP lets us use the wxScrolled template as-is, not need to turn it into fake wxScrolledWindow and wxScrolledCanvas classes anymore.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-12-02 01:05:01 +00:00
parent d4b5a463a6
commit a9cecfff46
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
etg/scrolwin.py
View File

@@ -52,7 +52,7 @@ def run():
scrolled.find('GetVirtualSize.y').out = True
if False:
if True:
# When SIP gets the ability to support template classes where the
# base class is the template parameter, then we can use this instead
# of the trickery below.
@@ -66,9 +66,9 @@ def run():
tools.fixWindowClass(scrolled)
# Add back some virtuals that were removed in fixWindowClass
node.find('OnDraw').isVirtual = True
node.find('GetSizeAvailableForScrollTarget').isVirtual = True
node.find('GetSizeAvailableForScrollTarget').ignore(False)
scrolled.find('OnDraw').isVirtual = True
scrolled.find('GetSizeAvailableForScrollTarget').isVirtual = True
scrolled.find('GetSizeAvailableForScrollTarget').ignore(False)
else:
@@ -76,7 +76,7 @@ def run():
# NOTE: We do a tricky tweak here because wxScrolled requires using
# a template parameter as the base class, which SIP doesn't handle
# yet. So instead we'll just copy the current extractor elements for
# wxScrolled and morph it into nodes that will generated wrappers for
# wxScrolled and morph it into nodes that will generate wrappers for
# wxScrolledWindow and wxScrolledCanvas as if they were non-template
# classes.
@@ -85,7 +85,7 @@ def run():
module.find('wxScrolledCanvas').ignore()
swDoc = " This class derives from wxPanel so it shares its behavior with regard "\
"to TAB traversal and focus handling. If you do n0t want this then use "\
"to TAB traversal and focus handling. If you do not want this then use "\
"wxScrolledCanvas instead."
scDoc = " This scrolled window is not intended to have children so it doesn't "\
"have special handling for TAB traversal or focus management."
@@ -118,6 +118,7 @@ def run():
# Ignore the wxScrolled template class
scrolled.ignore()
module.addPyCode("PyScrolledWindow = wx.deprecated(ScrolledWindow)")
#-----------------------------------------------------------------