Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compile fixes for Python 2.5

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-09-02 21:53:01 +00:00
parent 226118fcad
commit 8c9c423bea
3 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
wxPython/src/mac/_core_wrap.cpp
View File

@@ -13410,6 +13410,7 @@ SWIGINTERN PyObject *_wrap_new_ImageFromData(PyObject *SWIGUNUSEDPARM(self), PyO
int ecode1 = 0 ; int ecode1 = 0 ;
int val2 ; int val2 ;
int ecode2 = 0 ; int ecode2 = 0 ;
Py_ssize_t temp3 ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ; PyObject * obj2 = 0 ;
@@ -13429,7 +13430,8 @@ SWIGINTERN PyObject *_wrap_new_ImageFromData(PyObject *SWIGUNUSEDPARM(self), PyO
} }
arg2 = static_cast< int >(val2); arg2 = static_cast< int >(val2);
{ {
if (PyObject_AsReadBuffer(obj2, (const void**)(&arg3), &arg4) == -1) SWIG_fail; if (PyObject_AsReadBuffer(obj2, (const void**)(&arg3), &temp3) == -1) SWIG_fail;
arg4 = (int)temp3;
} }
{ {
PyThreadState* __tstate = wxPyBeginAllowThreads(); PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13457,6 +13459,8 @@ SWIGINTERN PyObject *_wrap_new_ImageFromDataWithAlpha(PyObject *SWIGUNUSEDPARM(s
int ecode1 = 0 ; int ecode1 = 0 ;
int val2 ; int val2 ;
int ecode2 = 0 ; int ecode2 = 0 ;
Py_ssize_t temp3 ;
Py_ssize_t temp5 ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ; PyObject * obj2 = 0 ;
@@ -13477,11 +13481,13 @@ SWIGINTERN PyObject *_wrap_new_ImageFromDataWithAlpha(PyObject *SWIGUNUSEDPARM(s
} }
arg2 = static_cast< int >(val2); arg2 = static_cast< int >(val2);
{ {
if (PyObject_AsReadBuffer(obj2, (const void**)(&arg3), &arg4) == -1) SWIG_fail; if (PyObject_AsReadBuffer(obj2, (const void**)(&arg3), &temp3) == -1) SWIG_fail;
arg4 = (int)temp3;
} }
{ {
if (obj3 != Py_None) { if (obj3 != Py_None) {
if (PyObject_AsReadBuffer(obj3, (const void**)(&arg5), &arg6) == -1) SWIG_fail; if (PyObject_AsReadBuffer(obj3, (const void**)(&arg5), &temp5) == -1) SWIG_fail;
arg6 = (int)temp5;
} }
} }
{ {
@@ -15491,6 +15497,7 @@ SWIGINTERN PyObject *_wrap_Image_SetData(PyObject *SWIGUNUSEDPARM(self), PyObjec
int arg3 ; int arg3 ;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
Py_ssize_t temp2 ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj1 = 0 ;
char * kwnames[] = { char * kwnames[] = {
@@ -15504,7 +15511,8 @@ SWIGINTERN PyObject *_wrap_Image_SetData(PyObject *SWIGUNUSEDPARM(self), PyObjec
} }
arg1 = reinterpret_cast< wxImage * >(argp1); arg1 = reinterpret_cast< wxImage * >(argp1);
{ {
if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &arg3) == -1) SWIG_fail; if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &temp2) == -1) SWIG_fail;
arg3 = (int)temp2;
} }
{ {
PyThreadState* __tstate = wxPyBeginAllowThreads(); PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15554,6 +15562,7 @@ SWIGINTERN PyObject *_wrap_Image_SetDataBuffer(PyObject *SWIGUNUSEDPARM(self), P
int arg3 ; int arg3 ;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
Py_ssize_t temp2 ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj1 = 0 ;
char * kwnames[] = { char * kwnames[] = {
@@ -15567,7 +15576,8 @@ SWIGINTERN PyObject *_wrap_Image_SetDataBuffer(PyObject *SWIGUNUSEDPARM(self), P
} }
arg1 = reinterpret_cast< wxImage * >(argp1); arg1 = reinterpret_cast< wxImage * >(argp1);
{ {
if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &arg3) == -1) SWIG_fail; if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &temp2) == -1) SWIG_fail;
arg3 = (int)temp2;
} }
{ {
PyThreadState* __tstate = wxPyBeginAllowThreads(); PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15617,6 +15627,7 @@ SWIGINTERN PyObject *_wrap_Image_SetAlphaData(PyObject *SWIGUNUSEDPARM(self), Py
int arg3 ; int arg3 ;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
Py_ssize_t temp2 ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj1 = 0 ;
char * kwnames[] = { char * kwnames[] = {
@@ -15631,7 +15642,8 @@ SWIGINTERN PyObject *_wrap_Image_SetAlphaData(PyObject *SWIGUNUSEDPARM(self), Py
arg1 = reinterpret_cast< wxImage * >(argp1); arg1 = reinterpret_cast< wxImage * >(argp1);
{ {
if (obj1 != Py_None) { if (obj1 != Py_None) {
if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &arg3) == -1) SWIG_fail; if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &temp2) == -1) SWIG_fail;
arg3 = (int)temp2;
} }
} }
{ {
@@ -15682,6 +15694,7 @@ SWIGINTERN PyObject *_wrap_Image_SetAlphaBuffer(PyObject *SWIGUNUSEDPARM(self),
int arg3 ; int arg3 ;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
Py_ssize_t temp2 ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj1 = 0 ;
char * kwnames[] = { char * kwnames[] = {
@@ -15696,7 +15709,8 @@ SWIGINTERN PyObject *_wrap_Image_SetAlphaBuffer(PyObject *SWIGUNUSEDPARM(self),
arg1 = reinterpret_cast< wxImage * >(argp1); arg1 = reinterpret_cast< wxImage * >(argp1);
{ {
if (obj1 != Py_None) { if (obj1 != Py_None) {
if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &arg3) == -1) SWIG_fail; if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &temp2) == -1) SWIG_fail;
arg3 = (int)temp2;
} }
} }
{ {
@@ -17053,6 +17067,8 @@ SWIGINTERN PyObject *_wrap__ImageFromBuffer(PyObject *SWIGUNUSEDPARM(self), PyOb
int ecode1 = 0 ; int ecode1 = 0 ;
int val2 ; int val2 ;
int ecode2 = 0 ; int ecode2 = 0 ;
Py_ssize_t temp3 ;
Py_ssize_t temp5 ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ; PyObject * obj2 = 0 ;
@@ -17073,12 +17089,14 @@ SWIGINTERN PyObject *_wrap__ImageFromBuffer(PyObject *SWIGUNUSEDPARM(self), PyOb
} }
arg2 = static_cast< int >(val2); arg2 = static_cast< int >(val2);
{ {
if (PyObject_AsReadBuffer(obj2, (const void**)(&arg3), &arg4) == -1) SWIG_fail; if (PyObject_AsReadBuffer(obj2, (const void**)(&arg3), &temp3) == -1) SWIG_fail;
arg4 = (int)temp3;
} }
if (obj3) { if (obj3) {
{ {
if (obj3 != Py_None) { if (obj3 != Py_None) {
if (PyObject_AsReadBuffer(obj3, (const void**)(&arg5), &arg6) == -1) SWIG_fail; if (PyObject_AsReadBuffer(obj3, (const void**)(&arg5), &temp5) == -1) SWIG_fail;
arg6 = (int)temp5;
} }
} }
} }

16
wxPython/src/mac/_gdi_wrap.cpp
View File

@@ -6702,6 +6702,8 @@ SWIGINTERN PyObject *_wrap__BitmapFromBufferAlpha(PyObject *SWIGUNUSEDPARM(self)
int ecode1 = 0 ; int ecode1 = 0 ;
int val2 ; int val2 ;
int ecode2 = 0 ; int ecode2 = 0 ;
Py_ssize_t temp3 ;
Py_ssize_t temp5 ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ; PyObject * obj2 = 0 ;
@@ -6722,11 +6724,13 @@ SWIGINTERN PyObject *_wrap__BitmapFromBufferAlpha(PyObject *SWIGUNUSEDPARM(self)
} }
arg2 = static_cast< int >(val2); arg2 = static_cast< int >(val2);
{ {
if (PyObject_AsReadBuffer(obj2, (const void**)(&arg3), &arg4) == -1) SWIG_fail; if (PyObject_AsReadBuffer(obj2, (const void**)(&arg3), &temp3) == -1) SWIG_fail;
arg4 = (int)temp3;
} }
{ {
if (obj3 != Py_None) { if (obj3 != Py_None) {
if (PyObject_AsReadBuffer(obj3, (const void**)(&arg5), &arg6) == -1) SWIG_fail; if (PyObject_AsReadBuffer(obj3, (const void**)(&arg5), &temp5) == -1) SWIG_fail;
arg6 = (int)temp5;
} }
} }
{ {
@@ -6751,6 +6755,7 @@ SWIGINTERN PyObject *_wrap__BitmapFromBuffer(PyObject *SWIGUNUSEDPARM(self), PyO
int ecode1 = 0 ; int ecode1 = 0 ;
int val2 ; int val2 ;
int ecode2 = 0 ; int ecode2 = 0 ;
Py_ssize_t temp3 ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ; PyObject * obj2 = 0 ;
@@ -6770,7 +6775,8 @@ SWIGINTERN PyObject *_wrap__BitmapFromBuffer(PyObject *SWIGUNUSEDPARM(self), PyO
} }
arg2 = static_cast< int >(val2); arg2 = static_cast< int >(val2);
{ {
if (PyObject_AsReadBuffer(obj2, (const void**)(&arg3), &arg4) == -1) SWIG_fail; if (PyObject_AsReadBuffer(obj2, (const void**)(&arg3), &temp3) == -1) SWIG_fail;
arg4 = (int)temp3;
} }
{ {
result = (wxBitmap *)_BitmapFromBuffer(arg1,arg2,arg3,arg4); result = (wxBitmap *)_BitmapFromBuffer(arg1,arg2,arg3,arg4);
@@ -6794,6 +6800,7 @@ SWIGINTERN PyObject *_wrap__BitmapFromBufferRGBA(PyObject *SWIGUNUSEDPARM(self),
int ecode1 = 0 ; int ecode1 = 0 ;
int val2 ; int val2 ;
int ecode2 = 0 ; int ecode2 = 0 ;
Py_ssize_t temp3 ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ; PyObject * obj2 = 0 ;
@@ -6813,7 +6820,8 @@ SWIGINTERN PyObject *_wrap__BitmapFromBufferRGBA(PyObject *SWIGUNUSEDPARM(self),
} }
arg2 = static_cast< int >(val2); arg2 = static_cast< int >(val2);
{ {
if (PyObject_AsReadBuffer(obj2, (const void**)(&arg3), &arg4) == -1) SWIG_fail; if (PyObject_AsReadBuffer(obj2, (const void**)(&arg3), &temp3) == -1) SWIG_fail;
arg4 = (int)temp3;
} }
{ {
result = (wxBitmap *)_BitmapFromBufferRGBA(arg1,arg2,arg3,arg4); result = (wxBitmap *)_BitmapFromBufferRGBA(arg1,arg2,arg3,arg4);

10
wxPython/src/my_typemaps.i
View File

@@ -319,15 +319,17 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
// Typemaps for loading a image or bitmap from an object that implements the // Typemaps for loading a image or bitmap from an object that implements the
// buffer interface // buffer interface
%typemap(in) (buffer data, int DATASIZE) %typemap(in) (buffer data, int DATASIZE) (Py_ssize_t temp)
{ {
if (PyObject_AsReadBuffer($input, (const void**)(&$1), &$2) == -1) SWIG_fail; if (PyObject_AsReadBuffer($input, (const void**)(&$1), &temp) == -1) SWIG_fail;
$2 = (int)temp;
} }
%typemap(in) (buffer alpha, int ALPHASIZE) %typemap(in) (buffer alpha, int ALPHASIZE) (Py_ssize_t temp)
{ {
if ($input != Py_None) { if ($input != Py_None) {
if (PyObject_AsReadBuffer($input, (const void**)(&$1), &$2) == -1) SWIG_fail; if (PyObject_AsReadBuffer($input, (const void**)(&$1), &temp) == -1) SWIG_fail;
$2 = (int)temp;
} }
} }