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

Lots of little changes made to Phoenix code over the past few months, plus some tweaks to get it running with the current wx.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@68905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-08-25 23:45:50 +00:00
parent f330955043
commit 911d90273c
22 changed files with 271 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
etgtools/sip_generator.py
View File

@@ -50,7 +50,10 @@ class SipWrapperGenerator(generators.WrapperGeneratorBase):
""")
if module.name == module.module:
stream.write("""
%%Module(name=%s.%s, use_argument_names=True, language="C++")
%%Module( name=%s.%s,
keyword_arguments="All",
use_argument_names=True,
language="C++")
{
%%AutoPyName(remove_leading="wx")
};
@@ -539,7 +542,7 @@ from %s import *
if item.transferBack:
annotations.append('TransferBack')
if item.transferThis:
annotations.append('TranserThis')
annotations.append('TransferThis')
if item.pyInt:
annotations.append('PyInt')

44
etgtools/tweaker_tools.py
View File

@@ -99,7 +99,20 @@ def fixWindowClass(klass):
klass.find('%s.id' % klass.name).default = 'wxID_ANY'
klass.find('Create.id').default = 'wxID_ANY'
def fixTopLevelWindowClass(klass):
"""
Tweaks for TLWs
"""
# TLW tweaks are a little different. We use the function annotation for
# TransferThis instead of the argument anotation.
klass.find(klass.name).findOverload('parent').transfer = True
klass.find('Create').transferThis = True
# give the id param a default value
klass.find('%s.id' % klass.name).default = 'wxID_ANY'
klass.find('Create.id').default = 'wxID_ANY'
def removeVirtuals(klass):
"""
Sometimes methods are marked as virtual but probably don't ever need to be
@@ -429,10 +442,12 @@ def convertFourDoublesTemplate(CLASS):
def wxListWrapperTemplate(ListClass, ItemClass, RealItemClass=None):
if RealItemClass is None:
RealItemClass = ItemClass
ListClass_noPrefix = removeWxPrefix(ListClass)
ListClass_pyName = removeWxPrefix(ListClass)
# *** TODO: This can probably be done in a way that is not SIP-specfic. Try
# creating extractor objects from scratch and attach cppMethods to them.
# *** TODO: This can probably be done in a way that is not SIP-specfic.
# Try creating extractor objects from scratch and attach cppMethods to
# them as needed, etc..
return extractors.WigCode('''\
class {ListClass}_iterator /Abstract/
@@ -444,13 +459,15 @@ class {ListClass}_iterator /Abstract/
{ListClass}_iterator({ListClass}::compatibility_iterator start)
: m_node(start) {{}}
{ItemClass}* next() {{
{ItemClass}* __next__() {{
{RealItemClass}* obj = NULL;
if (m_node) {{
obj = m_node->GetData();
m_node = m_node->GetNext();
}}
else PyErr_SetString(PyExc_StopIteration, "");
else {{
PyErr_SetString(PyExc_StopIteration, "");
}}
return ({ItemClass}*)obj;
}}
private:
@@ -458,13 +475,18 @@ class {ListClass}_iterator /Abstract/
}};
%End
public:
{ItemClass}* next();
{ItemClass}* __next__();
%MethodCode
sipRes = sipCpp->__next__();
if (PyErr_Occurred())
return NULL;
%End
}};
class {ListClass}
{{
public:
int __len__();
SIP_SSIZE_T __len__();
%MethodCode
sipRes = sipCpp->size();
%End
@@ -506,10 +528,10 @@ public:
}};
%Extract(id=pycode)
def _{ListClass_noPrefix}___repr__(self):
return "{ListClass}: " + repr(list(self))
{ListClass_noPrefix}.__repr__ = _{ListClass_noPrefix}___repr__
del _{ListClass_noPrefix}___repr__
def _{ListClass_pyName}___repr__(self):
return "{ListClass_pyName}: " + repr(list(self))
{ListClass_pyName}.__repr__ = _{ListClass_pyName}___repr__
del _{ListClass_pyName}___repr__
%End
'''.format(**locals()))