Prep for wxPython 2.1b3 release
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* This file was automatically generated by :
|
||||
* Simplified Wrapper and Interface Generator (SWIG)
|
||||
* Version 1.1 (Patch 6)
|
||||
* Version 1.1 (Build 802)
|
||||
*
|
||||
* Portions Copyright (c) 1995-1998
|
||||
* The University of Utah and The Regents of the University of California.
|
||||
@@ -3424,7 +3424,7 @@ static PyObject *_wrap_wxDC_BeginDrawing(PyObject *self, PyObject *args) {
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxDC_Blit(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (_swigobj->Blit(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
|
||||
#define wxDC_Blit(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8) (_swigobj->Blit(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8))
|
||||
static PyObject *_wrap_wxDC_Blit(PyObject *self, PyObject *args) {
|
||||
PyObject * _resultobj;
|
||||
bool _result;
|
||||
@@ -3436,12 +3436,13 @@ static PyObject *_wrap_wxDC_Blit(PyObject *self, PyObject *args) {
|
||||
wxDC * _arg5;
|
||||
long _arg6;
|
||||
long _arg7;
|
||||
long _arg8;
|
||||
int _arg8 = (int ) wxCOPY;
|
||||
int _arg9 = (int ) FALSE;
|
||||
PyObject * _argo0 = 0;
|
||||
PyObject * _argo5 = 0;
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTuple(args,"OllllOlll:wxDC_Blit",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5,&_arg6,&_arg7,&_arg8))
|
||||
if(!PyArg_ParseTuple(args,"OllllOll|ii:wxDC_Blit",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5,&_arg6,&_arg7,&_arg8,&_arg9))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
@@ -3459,7 +3460,7 @@ static PyObject *_wrap_wxDC_Blit(PyObject *self, PyObject *args) {
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
_result = (bool )wxDC_Blit(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8);
|
||||
_result = (bool )wxDC_Blit(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9);
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
} _resultobj = Py_BuildValue("i",_result);
|
||||
@@ -5640,31 +5641,19 @@ static PyObject *_wrap_wxDC_StartPage(PyObject *self, PyObject *args) {
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static void wxDC_DrawBitmap(wxDC *self,wxBitmap & bitmap,long x,long y,bool swapPalette) {
|
||||
wxMemoryDC* memDC = new wxMemoryDC;
|
||||
memDC->SelectObject(bitmap);
|
||||
#ifdef __WXMSW__
|
||||
if (swapPalette)
|
||||
self->SetPalette(*bitmap.GetPalette());
|
||||
#endif
|
||||
self->Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), memDC,
|
||||
0, 0, self->GetLogicalFunction());
|
||||
memDC->SelectObject(wxNullBitmap);
|
||||
delete memDC;
|
||||
}
|
||||
#define wxDC_DrawBitmap(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->DrawBitmap(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
|
||||
static PyObject *_wrap_wxDC_DrawBitmap(PyObject *self, PyObject *args) {
|
||||
PyObject * _resultobj;
|
||||
wxDC * _arg0;
|
||||
wxBitmap * _arg1;
|
||||
long _arg2;
|
||||
long _arg3;
|
||||
bool _arg4 = (bool ) TRUE;
|
||||
int _arg4 = (int ) FALSE;
|
||||
PyObject * _argo0 = 0;
|
||||
PyObject * _argo1 = 0;
|
||||
int tempbool4 = (int) TRUE;
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTuple(args,"OOll|i:wxDC_DrawBitmap",&_argo0,&_argo1,&_arg2,&_arg3,&tempbool4))
|
||||
if(!PyArg_ParseTuple(args,"OOll|i:wxDC_DrawBitmap",&_argo0,&_argo1,&_arg2,&_arg3,&_arg4))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
@@ -5680,7 +5669,6 @@ static PyObject *_wrap_wxDC_DrawBitmap(PyObject *self, PyObject *args) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
_arg4 = (bool ) tempbool4;
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
wxDC_DrawBitmap(_arg0,*_arg1,_arg2,_arg3,_arg4);
|
||||
|
Reference in New Issue
Block a user