From 5be76ec3e493163284088988ffd28bf1ebb67ef0 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 17 Nov 2011 03:58:12 +0000 Subject: [PATCH] minor tweaks git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- etg/dc.py | 2 +- etg/image.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/etg/dc.py b/etg/dc.py index 31247550..e08753ab 100644 --- a/etg/dc.py +++ b/etg/dc.py @@ -109,7 +109,7 @@ def run(): """, factory=True) # Return the rect instead of using an output parameter - m = c.find('DrawLabel') + m = c.find('DrawLabel').findOverload('rectBounding') m.type = 'wxRect*' m.find('rectBounding').ignore() m.factory = True # a new instance is being created diff --git a/etg/image.py b/etg/image.py index 493ca9ea..a34984e0 100644 --- a/etg/image.py +++ b/etg/image.py @@ -262,13 +262,13 @@ def run(): module.find('wxIMAGE_ALPHA_TRANSPARENT').pyInt = True module.find('wxIMAGE_ALPHA_OPAQUE').pyInt = True - # These are defines for string objects, not integers, so we can't generate - # code for them the same way as integer values. Since they are #defines we - # can't just tell SIP that they are global wxString objects because it will - # then end up taking the address of temporary values when it makes the - # getters for them. So instead we'll just make some python code to add the - # .py module and hope that the interface file always has the correct - # values of these options. + # These are defines for string objects, not integers, so we can't + # generate code for them the same way as integer values. Since they are + # #defines we can't just tell SIP that they are global wxString objects + # because it will then end up taking the address of temporary values when + # it makes the getters for them. So instead we'll just make some python + # code to insert into the .py module and hope that the interface file + # always has the correct values of these options. pycode = "" for item in module: if 'IMAGE_OPTION' in item.name and isinstance(item, etgtools.DefineDef):