X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b639c3c5ef53c4bdefd3b27aac1496787f024cb8..71432ef81fcd99814dc5eab49622e7af04c668e1:/utils/wxPython/src/msw/gdi.cpp diff --git a/utils/wxPython/src/msw/gdi.cpp b/utils/wxPython/src/msw/gdi.cpp index c152aff9b9..0d9db6b569 100644 --- a/utils/wxPython/src/msw/gdi.cpp +++ b/utils/wxPython/src/msw/gdi.cpp @@ -55,6 +55,9 @@ extern PyObject *SWIG_newvarlink(void); #include "helpers.h" #include +#ifndef __WXMSW__ +#include +#endif static PyObject* l_output_helper(PyObject* target, PyObject* o) { PyObject* o2; @@ -1318,7 +1321,7 @@ static PyObject *_wrap_wxBitmap_SetPalette(PyObject *self, PyObject *args) { return NULL; } } - wxBitmap_SetPalette(_arg0,_arg1); + wxBitmap_SetPalette(_arg0,*_arg1); Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2289,58 +2292,6 @@ static PyObject *_wrap_wxPen_GetColour(PyObject *self, PyObject *args) { return _resultobj; } -#define wxPen_GetDashes(_swigobj,_swigarg0) (_swigobj->GetDashes(_swigarg0)) -static PyObject *_wrap_wxPen_GetDashes(PyObject *self, PyObject *args) { - PyObject * _resultobj; - int _result; - wxPen * _arg0; - wxDash ** _arg1; - char * _argc0 = 0; - char * _argc1 = 0; - - self = self; - if(!PyArg_ParseTuple(args,"ss:wxPen_GetDashes",&_argc0,&_argc1)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetDashes. Expected _wxPen_p."); - return NULL; - } - } - if (_argc1) { - if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxDash_pp")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPen_GetDashes. Expected _wxDash_pp."); - return NULL; - } - } - _result = (int )wxPen_GetDashes(_arg0,_arg1); - _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - -#define wxPen_GetStipple(_swigobj) (_swigobj->GetStipple()) -static PyObject *_wrap_wxPen_GetStipple(PyObject *self, PyObject *args) { - PyObject * _resultobj; - wxBitmap * _result; - wxPen * _arg0; - char * _argc0 = 0; - char _ptemp[128]; - - self = self; - if(!PyArg_ParseTuple(args,"s:wxPen_GetStipple",&_argc0)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetStipple. Expected _wxPen_p."); - return NULL; - } - } - _result = (wxBitmap *)wxPen_GetStipple(_arg0); - SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); - _resultobj = Py_BuildValue("s",_ptemp); - return _resultobj; -} - #define wxPen_GetJoin(_swigobj) (_swigobj->GetJoin()) static PyObject *_wrap_wxPen_GetJoin(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -2476,133 +2427,185 @@ static PyObject *_wrap_wxPen_SetColour(PyObject *self, PyObject *args) { return _resultobj; } -#define wxPen_SetDashes(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetDashes(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxPen_SetDashes(PyObject *self, PyObject *args) { +#define wxPen_SetJoin(_swigobj,_swigarg0) (_swigobj->SetJoin(_swigarg0)) +static PyObject *_wrap_wxPen_SetJoin(PyObject *self, PyObject *args) { PyObject * _resultobj; wxPen * _arg0; int _arg1; - wxDash * _arg2; char * _argc0 = 0; - PyObject * _obj2 = 0; self = self; - if(!PyArg_ParseTuple(args,"sO:wxPen_SetDashes",&_argc0,&_obj2)) + if(!PyArg_ParseTuple(args,"si:wxPen_SetJoin",&_argc0,&_arg1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetDashes. Expected _wxPen_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetJoin. Expected _wxPen_p."); return NULL; } } - if (_obj2) -{ - _arg2 = (unsigned long*)long_LIST_helper(_obj2); - if (_arg2 == NULL) { + wxPen_SetJoin(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPen_SetStyle(_swigobj,_swigarg0) (_swigobj->SetStyle(_swigarg0)) +static PyObject *_wrap_wxPen_SetStyle(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxPen * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxPen_SetStyle",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetStyle. Expected _wxPen_p."); return NULL; + } } -} -{ - _arg1 = PyList_Size(_obj2); -} - wxPen_SetDashes(_arg0,_arg1,_arg2); + wxPen_SetStyle(_arg0,_arg1); Py_INCREF(Py_None); _resultobj = Py_None; -{ - delete [] _arg2; + return _resultobj; } + +#define wxPen_SetWidth(_swigobj,_swigarg0) (_swigobj->SetWidth(_swigarg0)) +static PyObject *_wrap_wxPen_SetWidth(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxPen * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxPen_SetWidth",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetWidth. Expected _wxPen_p."); + return NULL; + } + } + wxPen_SetWidth(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxPen_SetStipple(_swigobj,_swigarg0) (_swigobj->SetStipple(_swigarg0)) -static PyObject *_wrap_wxPen_SetStipple(PyObject *self, PyObject *args) { +#define wxPen_GetDashes(_swigobj,_swigarg0) (_swigobj->GetDashes(_swigarg0)) +static PyObject *_wrap_wxPen_GetDashes(PyObject *self, PyObject *args) { PyObject * _resultobj; + int _result; wxPen * _arg0; - wxBitmap * _arg1; + wxDash ** _arg1; char * _argc0 = 0; char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"ss:wxPen_SetStipple",&_argc0,&_argc1)) + if(!PyArg_ParseTuple(args,"ss:wxPen_GetDashes",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetStipple. Expected _wxPen_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetDashes. Expected _wxPen_p."); return NULL; } } if (_argc1) { - if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPen_SetStipple. Expected _wxBitmap_p."); + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxDash_pp")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPen_GetDashes. Expected _wxDash_pp."); return NULL; } } - wxPen_SetStipple(_arg0,_arg1); - Py_INCREF(Py_None); - _resultobj = Py_None; + _result = (int )wxPen_GetDashes(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxPen_SetJoin(_swigobj,_swigarg0) (_swigobj->SetJoin(_swigarg0)) -static PyObject *_wrap_wxPen_SetJoin(PyObject *self, PyObject *args) { +#define wxPen_GetStipple(_swigobj) (_swigobj->GetStipple()) +static PyObject *_wrap_wxPen_GetStipple(PyObject *self, PyObject *args) { PyObject * _resultobj; + wxBitmap * _result; wxPen * _arg0; - int _arg1; char * _argc0 = 0; + char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"si:wxPen_SetJoin",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"s:wxPen_GetStipple",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetJoin. Expected _wxPen_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetStipple. Expected _wxPen_p."); return NULL; } } - wxPen_SetJoin(_arg0,_arg1); - Py_INCREF(Py_None); - _resultobj = Py_None; + _result = (wxBitmap *)wxPen_GetStipple(_arg0); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxPen_SetStyle(_swigobj,_swigarg0) (_swigobj->SetStyle(_swigarg0)) -static PyObject *_wrap_wxPen_SetStyle(PyObject *self, PyObject *args) { +#define wxPen_SetDashes(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetDashes(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPen_SetDashes(PyObject *self, PyObject *args) { PyObject * _resultobj; wxPen * _arg0; int _arg1; + wxDash * _arg2; char * _argc0 = 0; + PyObject * _obj2 = 0; self = self; - if(!PyArg_ParseTuple(args,"si:wxPen_SetStyle",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"sO:wxPen_SetDashes",&_argc0,&_obj2)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetStyle. Expected _wxPen_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetDashes. Expected _wxPen_p."); return NULL; } } - wxPen_SetStyle(_arg0,_arg1); + if (_obj2) +{ + _arg2 = (unsigned long*)long_LIST_helper(_obj2); + if (_arg2 == NULL) { + return NULL; + } +} +{ + _arg1 = PyList_Size(_obj2); +} + wxPen_SetDashes(_arg0,_arg1,_arg2); Py_INCREF(Py_None); _resultobj = Py_None; +{ + delete [] _arg2; +} return _resultobj; } -#define wxPen_SetWidth(_swigobj,_swigarg0) (_swigobj->SetWidth(_swigarg0)) -static PyObject *_wrap_wxPen_SetWidth(PyObject *self, PyObject *args) { +#define wxPen_SetStipple(_swigobj,_swigarg0) (_swigobj->SetStipple(_swigarg0)) +static PyObject *_wrap_wxPen_SetStipple(PyObject *self, PyObject *args) { PyObject * _resultobj; wxPen * _arg0; - int _arg1; + wxBitmap * _arg1; char * _argc0 = 0; + char * _argc1 = 0; self = self; - if(!PyArg_ParseTuple(args,"si:wxPen_SetWidth",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"ss:wxPen_SetStipple",&_argc0,&_argc1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPen_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetWidth. Expected _wxPen_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_SetStipple. Expected _wxPen_p."); return NULL; } } - wxPen_SetWidth(_arg0,_arg1); + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPen_SetStipple. Expected _wxBitmap_p."); + return NULL; + } + } + wxPen_SetStipple(_arg0,*_arg1); Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2776,7 +2779,7 @@ static PyObject *_wrap_wxBrush_SetStipple(PyObject *self, PyObject *args) { return NULL; } } - wxBrush_SetStipple(_arg0,_arg1); + wxBrush_SetStipple(_arg0,*_arg1); Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -3459,6 +3462,38 @@ static PyObject *_wrap_wxDC_EndPage(PyObject *self, PyObject *args) { return _resultobj; } +#define wxDC_FloodFill(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->FloodFill(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxDC_FloodFill(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxDC * _arg0; + long _arg1; + long _arg2; + wxColour * _arg3; + int _arg4 = (wxFLOOD_SURFACE); + char * _argc0 = 0; + char * _argc3 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"slls|i:wxDC_FloodFill",&_argc0,&_arg1,&_arg2,&_argc3,&_arg4)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_FloodFill. Expected _wxDC_p."); + return NULL; + } + } + if (_argc3) { + if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxColour_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxDC_FloodFill. Expected _wxColour_p."); + return NULL; + } + } + wxDC_FloodFill(_arg0,_arg1,_arg2,*_arg3,_arg4); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxDC_GetBackground(_swigobj) (_swigobj->GetBackground()) static PyObject *_wrap_wxDC_GetBackground(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -3476,7 +3511,8 @@ static PyObject *_wrap_wxDC_GetBackground(PyObject *self, PyObject *args) { return NULL; } } - _result = (wxBrush *)wxDC_GetBackground(_arg0); + wxBrush & _result_ref = wxDC_GetBackground(_arg0); + _result = (wxBrush *) &_result_ref; SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -3499,7 +3535,8 @@ static PyObject *_wrap_wxDC_GetBrush(PyObject *self, PyObject *args) { return NULL; } } - _result = (wxBrush *)wxDC_GetBrush(_arg0); + wxBrush & _result_ref = wxDC_GetBrush(_arg0); + _result = (wxBrush *) &_result_ref; SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -3625,7 +3662,8 @@ static PyObject *_wrap_wxDC_GetFont(PyObject *self, PyObject *args) { return NULL; } } - _result = (wxFont *)wxDC_GetFont(_arg0); + wxFont & _result_ref = wxDC_GetFont(_arg0); + _result = (wxFont *) &_result_ref; SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -3711,7 +3749,8 @@ static PyObject *_wrap_wxDC_GetPen(PyObject *self, PyObject *args) { return NULL; } } - _result = (wxPen *)wxDC_GetPen(_arg0); + wxPen & _result_ref = wxDC_GetPen(_arg0); + _result = (wxPen *) &_result_ref; SWIG_MakePtr(_ptemp, (char *) _result,"_wxPen_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -4521,12 +4560,12 @@ 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) { +static void wxDC_DrawBitmap(wxDC *self,wxBitmap & bitmap,long x,long y,bool swapPalette) { wxMemoryDC* memDC = new wxMemoryDC; memDC->SelectObject(bitmap); if (swapPalette) - self->SetPalette(bitmap->GetPalette()); - self->Blit(x, y, bitmap->GetWidth(), bitmap->GetHeight(), memDC, + self->SetPalette(*bitmap.GetPalette()); + self->Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), memDC, 0, 0, self->GetLogicalFunction()); memDC->SelectObject(wxNullBitmap); delete memDC; @@ -4558,7 +4597,7 @@ static PyObject *_wrap_wxDC_DrawBitmap(PyObject *self, PyObject *args) { } } _arg4 = (bool ) tempbool4; - wxDC_DrawBitmap(_arg0,_arg1,_arg2,_arg3,_arg4); + wxDC_DrawBitmap(_arg0,*_arg1,_arg2,_arg3,_arg4); Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -5161,6 +5200,7 @@ static PyMethodDef gdicMethods[] = { { "wxDC_GetCharHeight", _wrap_wxDC_GetCharHeight, 1 }, { "wxDC_GetBrush", _wrap_wxDC_GetBrush, 1 }, { "wxDC_GetBackground", _wrap_wxDC_GetBackground, 1 }, + { "wxDC_FloodFill", _wrap_wxDC_FloodFill, 1 }, { "wxDC_EndPage", _wrap_wxDC_EndPage, 1 }, { "wxDC_EndDrawing", _wrap_wxDC_EndDrawing, 1 }, { "wxDC_EndDoc", _wrap_wxDC_EndDoc, 1 }, @@ -5194,19 +5234,19 @@ static PyMethodDef gdicMethods[] = { { "wxBrush_GetStipple", _wrap_wxBrush_GetStipple, 1 }, { "wxBrush_GetColour", _wrap_wxBrush_GetColour, 1 }, { "new_wxBrush", _wrap_new_wxBrush, 1 }, + { "wxPen_SetStipple", _wrap_wxPen_SetStipple, 1 }, + { "wxPen_SetDashes", _wrap_wxPen_SetDashes, 1 }, + { "wxPen_GetStipple", _wrap_wxPen_GetStipple, 1 }, + { "wxPen_GetDashes", _wrap_wxPen_GetDashes, 1 }, { "wxPen_SetWidth", _wrap_wxPen_SetWidth, 1 }, { "wxPen_SetStyle", _wrap_wxPen_SetStyle, 1 }, { "wxPen_SetJoin", _wrap_wxPen_SetJoin, 1 }, - { "wxPen_SetStipple", _wrap_wxPen_SetStipple, 1 }, - { "wxPen_SetDashes", _wrap_wxPen_SetDashes, 1 }, { "wxPen_SetColour", _wrap_wxPen_SetColour, 1 }, { "wxPen_SetCap", _wrap_wxPen_SetCap, 1 }, { "wxPen_Ok", _wrap_wxPen_Ok, 1 }, { "wxPen_GetWidth", _wrap_wxPen_GetWidth, 1 }, { "wxPen_GetStyle", _wrap_wxPen_GetStyle, 1 }, { "wxPen_GetJoin", _wrap_wxPen_GetJoin, 1 }, - { "wxPen_GetStipple", _wrap_wxPen_GetStipple, 1 }, - { "wxPen_GetDashes", _wrap_wxPen_GetDashes, 1 }, { "wxPen_GetColour", _wrap_wxPen_GetColour, 1 }, { "wxPen_GetCap", _wrap_wxPen_GetCap, 1 }, { "new_wxPen", _wrap_new_wxPen, 1 }, @@ -5329,6 +5369,7 @@ SWIGEXPORT(void,initgdic)() { */ SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0); SWIG_RegisterMapping("_signed_long","_long",0); + SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); @@ -5374,6 +5415,7 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_EBool","_signed_int",0); SWIG_RegisterMapping("_EBool","_int",0); SWIG_RegisterMapping("_EBool","_wxWindowID",0); + SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0); SWIG_RegisterMapping("_wxFont","_class_wxFont",0); SWIG_RegisterMapping("_unsigned_long","_wxDash",0); SWIG_RegisterMapping("_unsigned_long","_long",0); @@ -5439,6 +5481,7 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_int","_unsigned_int",0); SWIG_RegisterMapping("_int","_signed_int",0); SWIG_RegisterMapping("_wxSize","_class_wxSize",0); + SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0); SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0); SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0); @@ -5446,6 +5489,7 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_class_wxColour","_wxColour",0); SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0); SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0); + SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0); SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0); SWIG_RegisterMapping("_class_wxSize","_wxSize",0); SWIG_RegisterMapping("_class_wxBitmap","_class_wxCursor",SwigwxCursorTowxBitmap);