From 44070c60b4ba848d646b88f4409bd8dbb4168e07 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 16 Aug 2012 01:06:39 +0000 Subject: [PATCH] Use my 2/3 compatibility macro git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- etg/rawbmp.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/etg/rawbmp.py b/etg/rawbmp.py index 4556a8cd..f6c532aa 100644 --- a/etg/rawbmp.py +++ b/etg/rawbmp.py @@ -245,9 +245,9 @@ def addPixelDataClass(module, pd, img, bpp, doc=""): body="""\ wxPyThreadBlocker blocker; PyObject* rv = PyTuple_New(3); - PyTuple_SetItem(rv, 0, PyInt_FromLong(self->Red())); - PyTuple_SetItem(rv, 1, PyInt_FromLong(self->Green())); - PyTuple_SetItem(rv, 2, PyInt_FromLong(self->Blue())); + PyTuple_SetItem(rv, 0, wxPyInt_FromLong(self->Red())); + PyTuple_SetItem(rv, 1, wxPyInt_FromLong(self->Green())); + PyTuple_SetItem(rv, 2, wxPyInt_FromLong(self->Blue())); return rv; """) @@ -269,10 +269,10 @@ def addPixelDataClass(module, pd, img, bpp, doc=""): int blue = self->Blue(); int alpha = self->Alpha(); - PyTuple_SetItem(rv, 0, PyInt_FromLong( wxPy_unpremultiply(red, alpha) )); - PyTuple_SetItem(rv, 1, PyInt_FromLong( wxPy_unpremultiply(green, alpha) )); - PyTuple_SetItem(rv, 2, PyInt_FromLong( wxPy_unpremultiply(blue, alpha) )); - PyTuple_SetItem(rv, 3, PyInt_FromLong( alpha )); + PyTuple_SetItem(rv, 0, wxPyInt_FromLong( wxPy_unpremultiply(red, alpha) )); + PyTuple_SetItem(rv, 1, wxPyInt_FromLong( wxPy_unpremultiply(green, alpha) )); + PyTuple_SetItem(rv, 2, wxPyInt_FromLong( wxPy_unpremultiply(blue, alpha) )); + PyTuple_SetItem(rv, 3, wxPyInt_FromLong( alpha )); return rv; """)