From 1afc06c2d8c945535175bf32e427aac0bbb704de Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 10 Sep 1999 06:23:48 +0000 Subject: [PATCH] Some tweaks and updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxPython/README.txt | 9 + utils/wxPython/demo/wxGrid.py | 8 + utils/wxPython/modules/.cvsignore | 1 + utils/wxPython/src/.cvsignore | 1 + utils/wxPython/src/__init__.py | 2 +- utils/wxPython/src/_defs.i | 52 +- utils/wxPython/src/build.cfg | 2 + utils/wxPython/src/controls2.i | 8 +- utils/wxPython/src/gdi.i | 3 +- utils/wxPython/src/libpy.c | 38 +- utils/wxPython/src/msw/.cvsignore | 1 + utils/wxPython/src/msw/cmndlgs.cpp | 18 +- utils/wxPython/src/msw/controls.cpp | 18 +- utils/wxPython/src/msw/controls2.cpp | 26 +- utils/wxPython/src/msw/events.cpp | 18 +- utils/wxPython/src/msw/frames.cpp | 18 +- utils/wxPython/src/msw/gdi.cpp | 1292 +++++++++++++++----------- utils/wxPython/src/msw/image.cpp | 18 +- utils/wxPython/src/msw/mdi.cpp | 18 +- utils/wxPython/src/msw/misc.cpp | 18 +- utils/wxPython/src/msw/misc2.cpp | 18 +- utils/wxPython/src/msw/printfw.cpp | 49 +- utils/wxPython/src/msw/stattool.cpp | 18 +- utils/wxPython/src/msw/windows.cpp | 165 +++- utils/wxPython/src/msw/windows.py | 14 + utils/wxPython/src/msw/windows2.cpp | 28 +- utils/wxPython/src/msw/windows3.cpp | 18 +- utils/wxPython/src/msw/wx.cpp | 61 +- utils/wxPython/src/msw/wx.py | 41 +- utils/wxPython/src/printfw.i | 31 +- utils/wxPython/src/windows2.i | 10 +- utils/wxPython/src/wx.i | 2 +- 32 files changed, 1260 insertions(+), 764 deletions(-) create mode 100644 utils/wxPython/modules/.cvsignore create mode 100644 utils/wxPython/src/msw/.cvsignore diff --git a/utils/wxPython/README.txt b/utils/wxPython/README.txt index 615616bb37..68e52309dd 100644 --- a/utils/wxPython/README.txt +++ b/utils/wxPython/README.txt @@ -45,6 +45,15 @@ Or you can send mail directly to the list using this address: ---------------------------------------------------------------------- +What's new in 2.1b4 +-------------------- + +Much more support for event-less callbacks and add-on modules + +Created add-on module with wxOGL classes. + + + What's new in 2.1b3 -------------------- diff --git a/utils/wxPython/demo/wxGrid.py b/utils/wxPython/demo/wxGrid.py index e61e30ee05..dca12c088f 100644 --- a/utils/wxPython/demo/wxGrid.py +++ b/utils/wxPython/demo/wxGrid.py @@ -40,6 +40,14 @@ class TestGrid(wxGrid): def OnLabelClick(self, event): self.log.WriteText("OnLabelClick: (%d, %d)\n" % (event.m_row, event.m_col)) + #if event.m_row >= 10: + # self.SetLabelValue(wxVERTICAL, 'XX', event.m_row) + # self.Refresh() + #else: + # size = self.GetLabelSize(wxVERTICAL) + # print size + # self.SetLabelSize(wxVERTICAL, size+10) + # self.Refresh() #--------------------------------------------------------------------------- diff --git a/utils/wxPython/modules/.cvsignore b/utils/wxPython/modules/.cvsignore new file mode 100644 index 0000000000..a1ebbb1a1e --- /dev/null +++ b/utils/wxPython/modules/.cvsignore @@ -0,0 +1 @@ +update.log diff --git a/utils/wxPython/src/.cvsignore b/utils/wxPython/src/.cvsignore index 77c1ff0909..0e9f0579f4 100644 --- a/utils/wxPython/src/.cvsignore +++ b/utils/wxPython/src/.cvsignore @@ -6,6 +6,7 @@ Setup.in.new Setup.save Setup.save Setup.test +_make.bat build.local compile.py config.c diff --git a/utils/wxPython/src/__init__.py b/utils/wxPython/src/__init__.py index a1361d24c6..1c352fa5ed 100644 --- a/utils/wxPython/src/__init__.py +++ b/utils/wxPython/src/__init__.py @@ -11,7 +11,7 @@ # Licence: wxWindows license #---------------------------------------------------------------------------- -# ensure the main extension module is loaded, in case the embedded modules +# ensure the main extension module is loaded, in case the add-on modules # (such as utils,) are used standalone. This hack should go away soon. import wxc diff --git a/utils/wxPython/src/_defs.i b/utils/wxPython/src/_defs.i index 8473d0cc79..8be39c325a 100644 --- a/utils/wxPython/src/_defs.i +++ b/utils/wxPython/src/_defs.i @@ -181,10 +181,14 @@ enum { wxNO_3D, //wxOVERRIDE_KEY_TRANSLATIONS, wxTAB_TRAVERSAL, + wxWANTS_CHARS, wxHORIZONTAL, wxVERTICAL, wxBOTH, wxCENTER_FRAME, + wxCENTRE_ON_SCREEN, + wxCENTER_ON_SCREEN, + wxSTAY_ON_TOP, wxICONIZE, wxMINIMIZE, @@ -204,6 +208,11 @@ enum { wxFRAME_TOOL_WINDOW, wxFRAME_FLOAT_ON_PARENT, + wxED_CLIENT_MARGIN, + wxED_BUTTONS_BOTTOM, + wxED_BUTTONS_RIGHT, + wxED_STATIC_LINE, + wxEXT_DIALOG_STYLE, wxCLIP_CHILDREN, @@ -266,6 +275,7 @@ enum { wxTR_EDIT_LABELS, wxTR_LINES_AT_ROOT, wxTR_MULTIPLE, + wxTR_SINGLE, wxTR_HAS_VARIABLE_ROW_HEIGHT, wxLC_ICON, wxLC_SMALL_ICON, @@ -304,6 +314,8 @@ enum { wxCANCEL, wxYES, wxNO, + wxNO_DEFAULT, + wxYES_DEFAULT, wxICON_EXCLAMATION, wxICON_HAND, wxICON_QUESTION, @@ -311,6 +323,16 @@ enum { wxICON_STOP, wxICON_ASTERISK, wxICON_MASK, + wxICON_WARNING, + wxICON_ERROR, + + wxFORWARD, + wxBACKWARD, + wxRESET, + wxHELP, + wxMORE, + wxSETUP, + wxCENTRE, wxCENTER, wxSIZE_AUTO_WIDTH, @@ -370,6 +392,7 @@ enum { wxID_YES, wxID_NO, wxID_STATIC, + wxBITMAP_TYPE_BMP, wxBITMAP_TYPE_BMP_RESOURCE, wxBITMAP_TYPE_ICO, @@ -406,10 +429,37 @@ enum { wxPD_ESTIMATED_TIME, wxPD_REMAINING_TIME, - wxNO_DEFAULT, wxMENU_TEAROFF, + wxMB_DOCKABLE, wxNO_FULL_REPAINT_ON_RESIZE, + wxLEFT, + wxRIGHT, + wxUP, + wxDOWN, + wxALL, + wxTOP, + wxBOTTOM, + + wxNORTH, + wxSOUTH, + wxEAST, + wxWEST, + + wxSTRETCH_NOT, + wxSHRINK, + wxGROW, + wxEXPAND, + + wxNB_FIXEDWIDTH, + + wxLI_HORIZONTAL, + wxLI_VERTICAL, + + + wxHW_SCROLLBAR_NEVER, + wxHW_SCROLLBAR_AUTO, + }; diff --git a/utils/wxPython/src/build.cfg b/utils/wxPython/src/build.cfg index edbb3c9917..1e4d482c66 100644 --- a/utils/wxPython/src/build.cfg +++ b/utils/wxPython/src/build.cfg @@ -10,6 +10,8 @@ SWIGFILES = ['wx.i', 'windows.i', 'windows2.i', 'windows3.i', 'events.i', PYFILES = ['__init__.py'] +SWIGDEPS = '_defs.i my_typemaps.i' +OTHERDEPS = 'helpers.h' if sys.platform == 'win32': RESFILE = 1 diff --git a/utils/wxPython/src/controls2.i b/utils/wxPython/src/controls2.i index 8a8f6b72bc..fe0f0a6292 100644 --- a/utils/wxPython/src/controls2.i +++ b/utils/wxPython/src/controls2.i @@ -247,13 +247,9 @@ public: } ~wxPyTreeItemData() { -#ifdef WXP_WITH_THREAD - PyEval_RestoreThread(wxPyEventThreadState); -#endif + bool doSave = wxPyRestoreThread(); Py_DECREF(m_obj); -#ifdef WXP_WITH_THREAD - PyEval_SaveThread(); -#endif + wxPySaveThread(doSave); } PyObject* GetData() { diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i index 5785c2df4f..123515128c 100644 --- a/utils/wxPython/src/gdi.i +++ b/utils/wxPython/src/gdi.i @@ -474,8 +474,8 @@ extern wxFont *wxNORMAL_FONT; extern wxFont *wxSMALL_FONT; extern wxFont *wxITALIC_FONT; extern wxFont *wxSWISS_FONT; -extern wxPen *wxRED_PEN; +extern wxPen *wxRED_PEN; extern wxPen *wxCYAN_PEN; extern wxPen *wxGREEN_PEN; extern wxPen *wxBLACK_PEN; @@ -510,7 +510,6 @@ extern wxCursor *wxHOURGLASS_CURSOR; extern wxCursor *wxCROSS_CURSOR; extern wxBitmap wxNullBitmap; -//extern wxMask wxNullMask; extern wxIcon wxNullIcon; extern wxCursor wxNullCursor; extern wxPen wxNullPen; diff --git a/utils/wxPython/src/libpy.c b/utils/wxPython/src/libpy.c index 59aa8fae2f..89a14a606a 100644 --- a/utils/wxPython/src/libpy.c +++ b/utils/wxPython/src/libpy.c @@ -81,7 +81,7 @@ swig_varlink_print(swig_varlinkobject *v, FILE *fp, int flags) /* -------------------------------------------------------------------- swig_varlink_getattr - + This function gets the value of a variable and returns it as a PyObject. In our case, we'll be looking at the datatype and converting into a number or string @@ -128,17 +128,17 @@ swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) statichere PyTypeObject varlinktype = { /* PyObject_HEAD_INIT(&PyType_Type) Note : This doesn't work on some machines */ - PyObject_HEAD_INIT(0) + PyObject_HEAD_INIT(0) 0, "varlink", /* Type name */ sizeof(swig_varlinkobject), /* Basic size */ 0, /* Itemsize */ - 0, /* Deallocator */ + 0, /* Deallocator */ (printfunc) swig_varlink_print, /* Print */ (getattrfunc) swig_varlink_getattr, /* get attr */ (setattrfunc) swig_varlink_setattr, /* Set attr */ 0, /* tp_compare */ - (reprfunc) swig_varlink_repr, /* tp_repr */ + (reprfunc) swig_varlink_repr, /* tp_repr */ 0, /* tp_as_number */ 0, /* tp_as_mapping*/ 0, /* tp_hash */ @@ -169,7 +169,7 @@ SWIG_addvarlink(PyObject *p, char *name, { swig_varlinkobject *v; v= (swig_varlinkobject *) p; - + if (v->nvars >= v->maxvars -1) { v->maxvars = 2*v->maxvars; v->vars = (swig_globalvar **) realloc(v->vars,v->maxvars*sizeof(swig_globalvar *)); @@ -216,7 +216,7 @@ static SwigPtrType *SwigPtrTable = 0; /* Table containing pointer equivalences /* Cached values */ #define SWIG_CACHESIZE 8 #define SWIG_CACHEMASK 0x7 -static SwigCacheType SwigCache[SWIG_CACHESIZE]; +static SwigCacheType SwigCache[SWIG_CACHESIZE]; static int SwigCacheIndex = 0; static int SwigLastCache = 0; @@ -228,13 +228,13 @@ static int swigsort(const void *data1, const void *data2) { } /* Register a new datatype with the type-checker */ -SWIGSTATICRUNTIME(void) +SWIGSTATICRUNTIME(void) SWIG_RegisterMapping(char *origtype, char *newtype, void *(*cast)(void *)) { int i; SwigPtrType *t = 0,*t1; /* Allocate the pointer table if necessary */ - if (!SwigPtrTable) { + if (!SwigPtrTable) { SwigPtrTable = (SwigPtrType *) malloc(SwigPtrMax*sizeof(SwigPtrType)); } @@ -269,17 +269,17 @@ SWIG_RegisterMapping(char *origtype, char *newtype, void *(*cast)(void *)) { t1->name = newtype; t1->len = strlen(t1->name); t1->cast = cast; - t1->next = 0; - t->next = t1; + t1->next = 0; + t->next = t1; SwigPtrSort = 0; } /* Make a pointer value string */ -SWIGSTATICRUNTIME(void) +SWIGSTATICRUNTIME(void) SWIG_MakePtr(char *c, const void *ptr, char *type) { static char hex[17] = "0123456789abcdef"; unsigned long p, s; - char result[24], *r; + char result[24], *r; r = result; p = (unsigned long) ptr; if (p > 0) { @@ -298,7 +298,7 @@ SWIG_MakePtr(char *c, const void *ptr, char *type) { } /* Function for getting a pointer value */ -SWIGSTATICRUNTIME(char *) +SWIGSTATICRUNTIME(char *) SWIG_GetPtr(char *c, void **ptr, char *t) { unsigned long p; @@ -323,14 +323,14 @@ SWIG_GetPtr(char *c, void **ptr, char *t) else if ((d >= 'a') && (d <= 'f')) p = (p << 4) + (d - ('a'-10)); else - break; + break; c++; } *ptr = (void *) p; if ((!t) || (strcmp(t,c)==0)) return (char *) 0; if (!SwigPtrSort) { - qsort((void *) SwigPtrTable, SwigPtrN, sizeof(SwigPtrType), swigsort); + qsort((void *) SwigPtrTable, SwigPtrN, sizeof(SwigPtrType), swigsort); for (i = 0; i < 256; i++) SwigStart[i] = SwigPtrN; for (i = SwigPtrN-1; i >= 0; i--) SwigStart[(int) (SwigPtrTable[i].name[1])] = i; for (i = 255; i >= 1; i--) { @@ -388,7 +388,7 @@ SWIG_GetPtr(char *c, void **ptr, char *t) start++; } return c; -} +} /* New object-based GetPointer function. This uses the Python abstract * object interface to automatically dereference the 'this' attribute @@ -399,8 +399,10 @@ SWIG_GetPtrObj(PyObject *obj, void **ptr, char *type) { PyObject *sobj = obj; char *str; if (!PyString_Check(obj)) { - sobj = PyObject_GetAttrString(obj,"this"); - if (!sobj) return ""; + if (!PyInstance_Check(obj) || !(sobj = PyObject_GetAttrString(obj,"this"))) + return ""; +// sobj = PyObject_GetAttrString(obj,"this"); +// if (!sobj) return ""; } str = PyString_AsString(sobj); return SWIG_GetPtr(str,ptr,type); diff --git a/utils/wxPython/src/msw/.cvsignore b/utils/wxPython/src/msw/.cvsignore new file mode 100644 index 0000000000..5c511172dc --- /dev/null +++ b/utils/wxPython/src/msw/.cvsignore @@ -0,0 +1 @@ +*.doc diff --git a/utils/wxPython/src/msw/cmndlgs.cpp b/utils/wxPython/src/msw/cmndlgs.cpp index 00854f6ae0..ec26c5ed5d 100644 --- a/utils/wxPython/src/msw/cmndlgs.cpp +++ b/utils/wxPython/src/msw/cmndlgs.cpp @@ -3,7 +3,7 @@ * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 794) + * Version 1.1 (Build 810) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -107,14 +107,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } -extern byte* byte_LIST_helper(PyObject* source); -extern int* int_LIST_helper(PyObject* source); -extern long* long_LIST_helper(PyObject* source); -extern char** string_LIST_helper(PyObject* source); -extern wxPoint* wxPoint_LIST_helper(PyObject* source); -extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); -extern wxString* wxString_LIST_helper(PyObject* source); -extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; diff --git a/utils/wxPython/src/msw/controls.cpp b/utils/wxPython/src/msw/controls.cpp index 04d2f2523e..4f77a6cdd3 100644 --- a/utils/wxPython/src/msw/controls.cpp +++ b/utils/wxPython/src/msw/controls.cpp @@ -3,7 +3,7 @@ * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 794) + * Version 1.1 (Build 810) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -118,14 +118,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } -extern byte* byte_LIST_helper(PyObject* source); -extern int* int_LIST_helper(PyObject* source); -extern long* long_LIST_helper(PyObject* source); -extern char** string_LIST_helper(PyObject* source); -extern wxPoint* wxPoint_LIST_helper(PyObject* source); -extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); -extern wxString* wxString_LIST_helper(PyObject* source); -extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; diff --git a/utils/wxPython/src/msw/controls2.cpp b/utils/wxPython/src/msw/controls2.cpp index c0919089f7..afbbda1a4d 100644 --- a/utils/wxPython/src/msw/controls2.cpp +++ b/utils/wxPython/src/msw/controls2.cpp @@ -3,7 +3,7 @@ * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 794) + * Version 1.1 (Build 810) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -105,14 +105,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } -extern byte* byte_LIST_helper(PyObject* source); -extern int* int_LIST_helper(PyObject* source); -extern long* long_LIST_helper(PyObject* source); -extern char** string_LIST_helper(PyObject* source); -extern wxPoint* wxPoint_LIST_helper(PyObject* source); -extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); -extern wxString* wxString_LIST_helper(PyObject* source); -extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; @@ -129,13 +129,9 @@ public: } ~wxPyTreeItemData() { -#ifdef WXP_WITH_THREAD - PyEval_RestoreThread(wxPyEventThreadState); -#endif + bool doSave = wxPyRestoreThread(); Py_DECREF(m_obj); -#ifdef WXP_WITH_THREAD - PyEval_SaveThread(); -#endif + wxPySaveThread(doSave); } PyObject* GetData() { diff --git a/utils/wxPython/src/msw/events.cpp b/utils/wxPython/src/msw/events.cpp index 65793a58fd..4c6f184130 100644 --- a/utils/wxPython/src/msw/events.cpp +++ b/utils/wxPython/src/msw/events.cpp @@ -3,7 +3,7 @@ * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 794) + * Version 1.1 (Build 810) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -104,14 +104,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } -extern byte* byte_LIST_helper(PyObject* source); -extern int* int_LIST_helper(PyObject* source); -extern long* long_LIST_helper(PyObject* source); -extern char** string_LIST_helper(PyObject* source); -extern wxPoint* wxPoint_LIST_helper(PyObject* source); -extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); -extern wxString* wxString_LIST_helper(PyObject* source); -extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; diff --git a/utils/wxPython/src/msw/frames.cpp b/utils/wxPython/src/msw/frames.cpp index 331e047cf3..db1d2671a2 100644 --- a/utils/wxPython/src/msw/frames.cpp +++ b/utils/wxPython/src/msw/frames.cpp @@ -3,7 +3,7 @@ * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 794) + * Version 1.1 (Build 810) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -104,14 +104,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } -extern byte* byte_LIST_helper(PyObject* source); -extern int* int_LIST_helper(PyObject* source); -extern long* long_LIST_helper(PyObject* source); -extern char** string_LIST_helper(PyObject* source); -extern wxPoint* wxPoint_LIST_helper(PyObject* source); -extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); -extern wxString* wxString_LIST_helper(PyObject* source); -extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; diff --git a/utils/wxPython/src/msw/gdi.cpp b/utils/wxPython/src/msw/gdi.cpp index d7eca5c383..73594e1e0a 100644 --- a/utils/wxPython/src/msw/gdi.cpp +++ b/utils/wxPython/src/msw/gdi.cpp @@ -3,7 +3,7 @@ * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 802) + * Version 1.1 (Build 810) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -108,14 +108,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } -extern byte* byte_LIST_helper(PyObject* source); -extern int* int_LIST_helper(PyObject* source); -extern long* long_LIST_helper(PyObject* source); -extern char** string_LIST_helper(PyObject* source); -extern wxPoint* wxPoint_LIST_helper(PyObject* source); -extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); -extern wxString* wxString_LIST_helper(PyObject* source); -extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; @@ -203,16 +203,17 @@ extern wxColour wxNullColour; #ifdef __cplusplus extern "C" { #endif -static PyObject *_wrap_wxEmptyBitmap(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxEmptyBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBitmap * _result; int _arg0; int _arg1; int _arg2 = (int ) -1; + char *_kwnames[] = { "width","height","depth", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"ii|i:wxEmptyBitmap",&_arg0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii|i:wxEmptyBitmap",_kwnames,&_arg0,&_arg1,&_arg2)) return NULL; { wxPy_BEGIN_ALLOW_THREADS; @@ -229,15 +230,16 @@ static PyObject *_wrap_wxEmptyBitmap(PyObject *self, PyObject *args) { return _resultobj; } -static PyObject *_wrap_wxNoRefBitmap(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxNoRefBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBitmap * _result; char * _arg0; long _arg1; + char *_kwnames[] = { "name","flags", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"sl:wxNoRefBitmap",&_arg0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"sl:wxNoRefBitmap",_kwnames,&_arg0,&_arg1)) return NULL; { wxPy_BEGIN_ALLOW_THREADS; @@ -254,7 +256,7 @@ static PyObject *_wrap_wxNoRefBitmap(PyObject *self, PyObject *args) { return _resultobj; } -static PyObject *_wrap_wxBitmapFromData(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBitmapFromData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBitmap * _result; char * _arg0; @@ -262,10 +264,11 @@ static PyObject *_wrap_wxBitmapFromData(PyObject *self, PyObject *args) { int _arg2; int _arg3; int _arg4 = (int ) 1; + char *_kwnames[] = { "data","type","width","height","depth", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"slii|i:wxBitmapFromData",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"slii|i:wxBitmapFromData",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4)) return NULL; { wxPy_BEGIN_ALLOW_THREADS; @@ -282,17 +285,18 @@ static PyObject *_wrap_wxBitmapFromData(PyObject *self, PyObject *args) { return _resultobj; } -static PyObject *_wrap_wxMaskColour(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxMaskColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxMask * _result; wxBitmap * _arg0; wxColour * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "bitmap","colour", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"OO:wxMaskColour",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMaskColour",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -323,14 +327,15 @@ static PyObject *_wrap_wxMaskColour(PyObject *self, PyObject *args) { return _resultobj; } -static PyObject *_wrap_wxStockCursor(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxStockCursor(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxCursor * _result; int _arg0; + char *_kwnames[] = { "id", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"i:wxStockCursor",&_arg0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxStockCursor",_kwnames,&_arg0)) return NULL; { wxPy_BEGIN_ALLOW_THREADS; @@ -347,15 +352,16 @@ static PyObject *_wrap_wxStockCursor(PyObject *self, PyObject *args) { return _resultobj; } -static PyObject *_wrap_wxNamedColour(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxNamedColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxColour * _result; wxString * _arg0; PyObject * _obj0 = 0; + char *_kwnames[] = { "colorName", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:wxNamedColour",&_obj0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNamedColour",_kwnames,&_obj0)) return NULL; { if (!PyString_Check(_obj0)) { @@ -383,15 +389,16 @@ static PyObject *_wrap_wxNamedColour(PyObject *self, PyObject *args) { return _resultobj; } -static PyObject *_wrap_wxMemoryDCFromDC(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxMemoryDCFromDC(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxMemoryDC * _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "oldDC", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:wxMemoryDCFromDC",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMemoryDCFromDC",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1046,16 +1053,17 @@ static PyObject *_wrap_wxNullColour_get() { } #define new_wxBitmap(_swigarg0,_swigarg1) (new wxBitmap(_swigarg0,_swigarg1)) -static PyObject *_wrap_new_wxBitmap(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBitmap * _result; wxString * _arg0; long _arg1; PyObject * _obj0 = 0; + char *_kwnames[] = { "name","type", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"Ol:new_wxBitmap",&_obj0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:new_wxBitmap",_kwnames,&_obj0,&_arg1)) return NULL; { if (!PyString_Check(_obj0)) { @@ -1084,13 +1092,14 @@ static PyObject *_wrap_new_wxBitmap(PyObject *self, PyObject *args) { } #define delete_wxBitmap(_swigobj) (delete _swigobj) -static PyObject *_wrap_delete_wxBitmap(PyObject *self, PyObject *args) { +static PyObject *_wrap_delete_wxBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBitmap * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:delete_wxBitmap",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxBitmap",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1110,16 +1119,17 @@ static PyObject *_wrap_delete_wxBitmap(PyObject *self, PyObject *args) { } #define wxBitmap_Create(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->Create(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxBitmap_Create(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBitmap_Create(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBitmap * _arg0; int _arg1; int _arg2; int _arg3 = (int ) -1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","width","height","depth", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oii|i:wxBitmap_Create",&_argo0,&_arg1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|i:wxBitmap_Create",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1139,14 +1149,15 @@ static PyObject *_wrap_wxBitmap_Create(PyObject *self, PyObject *args) { } #define wxBitmap_GetDepth(_swigobj) (_swigobj->GetDepth()) -static PyObject *_wrap_wxBitmap_GetDepth(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBitmap_GetDepth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxBitmap * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxBitmap_GetDepth",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmap_GetDepth",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1165,14 +1176,15 @@ static PyObject *_wrap_wxBitmap_GetDepth(PyObject *self, PyObject *args) { } #define wxBitmap_GetHeight(_swigobj) (_swigobj->GetHeight()) -static PyObject *_wrap_wxBitmap_GetHeight(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBitmap_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxBitmap * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxBitmap_GetHeight",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmap_GetHeight",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1191,15 +1203,16 @@ static PyObject *_wrap_wxBitmap_GetHeight(PyObject *self, PyObject *args) { } #define wxBitmap_GetPalette(_swigobj) (_swigobj->GetPalette()) -static PyObject *_wrap_wxBitmap_GetPalette(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBitmap_GetPalette(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPalette * _result; wxBitmap * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:wxBitmap_GetPalette",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmap_GetPalette",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1224,15 +1237,16 @@ static PyObject *_wrap_wxBitmap_GetPalette(PyObject *self, PyObject *args) { } #define wxBitmap_GetMask(_swigobj) (_swigobj->GetMask()) -static PyObject *_wrap_wxBitmap_GetMask(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBitmap_GetMask(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxMask * _result; wxBitmap * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:wxBitmap_GetMask",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmap_GetMask",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1257,14 +1271,15 @@ static PyObject *_wrap_wxBitmap_GetMask(PyObject *self, PyObject *args) { } #define wxBitmap_GetWidth(_swigobj) (_swigobj->GetWidth()) -static PyObject *_wrap_wxBitmap_GetWidth(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBitmap_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxBitmap * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxBitmap_GetWidth",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmap_GetWidth",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1283,7 +1298,7 @@ static PyObject *_wrap_wxBitmap_GetWidth(PyObject *self, PyObject *args) { } #define wxBitmap_LoadFile(_swigobj,_swigarg0,_swigarg1) (_swigobj->LoadFile(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxBitmap_LoadFile(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBitmap_LoadFile(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxBitmap * _arg0; @@ -1291,9 +1306,10 @@ static PyObject *_wrap_wxBitmap_LoadFile(PyObject *self, PyObject *args) { long _arg2; PyObject * _argo0 = 0; PyObject * _obj1 = 0; + char *_kwnames[] = { "self","name","flags", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OOl:wxBitmap_LoadFile",&_argo0,&_obj1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOl:wxBitmap_LoadFile",_kwnames,&_argo0,&_obj1,&_arg2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1323,14 +1339,15 @@ static PyObject *_wrap_wxBitmap_LoadFile(PyObject *self, PyObject *args) { } #define wxBitmap_Ok(_swigobj) (_swigobj->Ok()) -static PyObject *_wrap_wxBitmap_Ok(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBitmap_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxBitmap * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxBitmap_Ok",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmap_Ok",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1349,7 +1366,7 @@ static PyObject *_wrap_wxBitmap_Ok(PyObject *self, PyObject *args) { } #define wxBitmap_SaveFile(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->SaveFile(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxBitmap_SaveFile(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBitmap_SaveFile(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxBitmap * _arg0; @@ -1359,9 +1376,10 @@ static PyObject *_wrap_wxBitmap_SaveFile(PyObject *self, PyObject *args) { PyObject * _argo0 = 0; PyObject * _obj1 = 0; PyObject * _argo3 = 0; + char *_kwnames[] = { "self","name","type","palette", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OOi|O:wxBitmap_SaveFile",&_argo0,&_obj1,&_arg2,&_argo3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi|O:wxBitmap_SaveFile",_kwnames,&_argo0,&_obj1,&_arg2,&_argo3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1398,14 +1416,15 @@ static PyObject *_wrap_wxBitmap_SaveFile(PyObject *self, PyObject *args) { } #define wxBitmap_SetDepth(_swigobj,_swigarg0) (_swigobj->SetDepth(_swigarg0)) -static PyObject *_wrap_wxBitmap_SetDepth(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBitmap_SetDepth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBitmap * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","depth", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxBitmap_SetDepth",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBitmap_SetDepth",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1425,14 +1444,15 @@ static PyObject *_wrap_wxBitmap_SetDepth(PyObject *self, PyObject *args) { } #define wxBitmap_SetHeight(_swigobj,_swigarg0) (_swigobj->SetHeight(_swigarg0)) -static PyObject *_wrap_wxBitmap_SetHeight(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBitmap_SetHeight(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBitmap * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","height", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxBitmap_SetHeight",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBitmap_SetHeight",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1452,15 +1472,16 @@ static PyObject *_wrap_wxBitmap_SetHeight(PyObject *self, PyObject *args) { } #define wxBitmap_SetMask(_swigobj,_swigarg0) (_swigobj->SetMask(_swigarg0)) -static PyObject *_wrap_wxBitmap_SetMask(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBitmap_SetMask(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBitmap * _arg0; wxMask * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","mask", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxBitmap_SetMask",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBitmap_SetMask",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1487,15 +1508,16 @@ static PyObject *_wrap_wxBitmap_SetMask(PyObject *self, PyObject *args) { } #define wxBitmap_SetPalette(_swigobj,_swigarg0) (_swigobj->SetPalette(_swigarg0)) -static PyObject *_wrap_wxBitmap_SetPalette(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBitmap_SetPalette(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBitmap * _arg0; wxPalette * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","palette", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxBitmap_SetPalette",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBitmap_SetPalette",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1522,14 +1544,15 @@ static PyObject *_wrap_wxBitmap_SetPalette(PyObject *self, PyObject *args) { } #define wxBitmap_SetWidth(_swigobj,_swigarg0) (_swigobj->SetWidth(_swigarg0)) -static PyObject *_wrap_wxBitmap_SetWidth(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBitmap_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBitmap * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","width", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxBitmap_SetWidth",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBitmap_SetWidth",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1549,15 +1572,16 @@ static PyObject *_wrap_wxBitmap_SetWidth(PyObject *self, PyObject *args) { } #define new_wxMask(_swigarg0) (new wxMask(_swigarg0)) -static PyObject *_wrap_new_wxMask(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxMask(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxMask * _result; wxBitmap * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "bitmap", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:new_wxMask",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxMask",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1582,13 +1606,14 @@ static PyObject *_wrap_new_wxMask(PyObject *self, PyObject *args) { } #define delete_wxMask(_swigobj) (delete _swigobj) -static PyObject *_wrap_delete_wxMask(PyObject *self, PyObject *args) { +static PyObject *_wrap_delete_wxMask(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxMask * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:delete_wxMask",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxMask",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1616,7 +1641,7 @@ static void *SwigwxIconTowxBitmap(void *ptr) { } #define new_wxIcon(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxIcon(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_new_wxIcon(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxIcon(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxIcon * _result; wxString * _arg0; @@ -1624,10 +1649,11 @@ static PyObject *_wrap_new_wxIcon(PyObject *self, PyObject *args) { int _arg2 = (int ) -1; int _arg3 = (int ) -1; PyObject * _obj0 = 0; + char *_kwnames[] = { "name","flags","desiredWidth","desiredHeight", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"Ol|ii:new_wxIcon",&_obj0,&_arg1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol|ii:new_wxIcon",_kwnames,&_obj0,&_arg1,&_arg2,&_arg3)) return NULL; { if (!PyString_Check(_obj0)) { @@ -1656,13 +1682,14 @@ static PyObject *_wrap_new_wxIcon(PyObject *self, PyObject *args) { } #define delete_wxIcon(_swigobj) (delete _swigobj) -static PyObject *_wrap_delete_wxIcon(PyObject *self, PyObject *args) { +static PyObject *_wrap_delete_wxIcon(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxIcon * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:delete_wxIcon",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxIcon",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1682,14 +1709,15 @@ static PyObject *_wrap_delete_wxIcon(PyObject *self, PyObject *args) { } #define wxIcon_GetDepth(_swigobj) (_swigobj->GetDepth()) -static PyObject *_wrap_wxIcon_GetDepth(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxIcon_GetDepth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxIcon * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxIcon_GetDepth",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIcon_GetDepth",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1708,14 +1736,15 @@ static PyObject *_wrap_wxIcon_GetDepth(PyObject *self, PyObject *args) { } #define wxIcon_GetHeight(_swigobj) (_swigobj->GetHeight()) -static PyObject *_wrap_wxIcon_GetHeight(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxIcon_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxIcon * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxIcon_GetHeight",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIcon_GetHeight",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1734,14 +1763,15 @@ static PyObject *_wrap_wxIcon_GetHeight(PyObject *self, PyObject *args) { } #define wxIcon_GetWidth(_swigobj) (_swigobj->GetWidth()) -static PyObject *_wrap_wxIcon_GetWidth(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxIcon_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxIcon * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxIcon_GetWidth",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIcon_GetWidth",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1760,7 +1790,7 @@ static PyObject *_wrap_wxIcon_GetWidth(PyObject *self, PyObject *args) { } #define wxIcon_LoadFile(_swigobj,_swigarg0,_swigarg1) (_swigobj->LoadFile(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxIcon_LoadFile(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxIcon_LoadFile(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxIcon * _arg0; @@ -1768,9 +1798,10 @@ static PyObject *_wrap_wxIcon_LoadFile(PyObject *self, PyObject *args) { long _arg2; PyObject * _argo0 = 0; PyObject * _obj1 = 0; + char *_kwnames[] = { "self","name","flags", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OOl:wxIcon_LoadFile",&_argo0,&_obj1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOl:wxIcon_LoadFile",_kwnames,&_argo0,&_obj1,&_arg2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1800,14 +1831,15 @@ static PyObject *_wrap_wxIcon_LoadFile(PyObject *self, PyObject *args) { } #define wxIcon_Ok(_swigobj) (_swigobj->Ok()) -static PyObject *_wrap_wxIcon_Ok(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxIcon_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxIcon * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxIcon_Ok",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIcon_Ok",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1826,14 +1858,15 @@ static PyObject *_wrap_wxIcon_Ok(PyObject *self, PyObject *args) { } #define wxIcon_SetDepth(_swigobj,_swigarg0) (_swigobj->SetDepth(_swigarg0)) -static PyObject *_wrap_wxIcon_SetDepth(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxIcon_SetDepth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxIcon * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","depth", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxIcon_SetDepth",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxIcon_SetDepth",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1853,14 +1886,15 @@ static PyObject *_wrap_wxIcon_SetDepth(PyObject *self, PyObject *args) { } #define wxIcon_SetHeight(_swigobj,_swigarg0) (_swigobj->SetHeight(_swigarg0)) -static PyObject *_wrap_wxIcon_SetHeight(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxIcon_SetHeight(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxIcon * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","height", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxIcon_SetHeight",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxIcon_SetHeight",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1880,14 +1914,15 @@ static PyObject *_wrap_wxIcon_SetHeight(PyObject *self, PyObject *args) { } #define wxIcon_SetWidth(_swigobj,_swigarg0) (_swigobj->SetWidth(_swigarg0)) -static PyObject *_wrap_wxIcon_SetWidth(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxIcon_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxIcon * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","width", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxIcon_SetWidth",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxIcon_SetWidth",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1915,7 +1950,7 @@ static void *SwigwxCursorTowxBitmap(void *ptr) { } #define new_wxCursor(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxCursor(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_new_wxCursor(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxCursor(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxCursor * _result; wxString * _arg0; @@ -1923,10 +1958,11 @@ static PyObject *_wrap_new_wxCursor(PyObject *self, PyObject *args) { int _arg2 = (int ) 0; int _arg3 = (int ) 0; PyObject * _obj0 = 0; + char *_kwnames[] = { "cursorName","flags","hotSpotX","hotSpotY", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"Ol|ii:new_wxCursor",&_obj0,&_arg1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol|ii:new_wxCursor",_kwnames,&_obj0,&_arg1,&_arg2,&_arg3)) return NULL; { if (!PyString_Check(_obj0)) { @@ -1955,13 +1991,14 @@ static PyObject *_wrap_new_wxCursor(PyObject *self, PyObject *args) { } #define delete_wxCursor(_swigobj) (delete _swigobj) -static PyObject *_wrap_delete_wxCursor(PyObject *self, PyObject *args) { +static PyObject *_wrap_delete_wxCursor(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxCursor * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:delete_wxCursor",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxCursor",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1981,14 +2018,15 @@ static PyObject *_wrap_delete_wxCursor(PyObject *self, PyObject *args) { } #define wxCursor_Ok(_swigobj) (_swigobj->Ok()) -static PyObject *_wrap_wxCursor_Ok(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxCursor_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxCursor * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxCursor_Ok",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCursor_Ok",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2012,7 +2050,7 @@ static wxFont *new_wxFont(int pointSize,int family,int style,int weight,int unde underline, faceName); } -static PyObject *_wrap_new_wxFont(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxFont(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxFont * _result; int _arg0; @@ -2021,10 +2059,11 @@ static PyObject *_wrap_new_wxFont(PyObject *self, PyObject *args) { int _arg3; int _arg4 = (int ) FALSE; char * _arg5 = (char *) ""; + char *_kwnames[] = { "pointSize","family","style","weight","underline","faceName", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"iiii|is:new_wxFont",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiii|is:new_wxFont",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) return NULL; { wxPy_BEGIN_ALLOW_THREADS; @@ -2042,14 +2081,15 @@ static PyObject *_wrap_new_wxFont(PyObject *self, PyObject *args) { } #define wxFont_GetFaceName(_swigobj) (_swigobj->GetFaceName()) -static PyObject *_wrap_wxFont_GetFaceName(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxFont_GetFaceName(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxString * _result; wxFont * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxFont_GetFaceName",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFont_GetFaceName",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2073,14 +2113,15 @@ static PyObject *_wrap_wxFont_GetFaceName(PyObject *self, PyObject *args) { } #define wxFont_GetFamily(_swigobj) (_swigobj->GetFamily()) -static PyObject *_wrap_wxFont_GetFamily(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxFont_GetFamily(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxFont * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxFont_GetFamily",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFont_GetFamily",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2099,14 +2140,15 @@ static PyObject *_wrap_wxFont_GetFamily(PyObject *self, PyObject *args) { } #define wxFont_GetFontId(_swigobj) (_swigobj->GetFontId()) -static PyObject *_wrap_wxFont_GetFontId(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxFont_GetFontId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxFont * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxFont_GetFontId",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFont_GetFontId",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2125,14 +2167,15 @@ static PyObject *_wrap_wxFont_GetFontId(PyObject *self, PyObject *args) { } #define wxFont_GetPointSize(_swigobj) (_swigobj->GetPointSize()) -static PyObject *_wrap_wxFont_GetPointSize(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxFont_GetPointSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxFont * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxFont_GetPointSize",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFont_GetPointSize",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2151,14 +2194,15 @@ static PyObject *_wrap_wxFont_GetPointSize(PyObject *self, PyObject *args) { } #define wxFont_GetStyle(_swigobj) (_swigobj->GetStyle()) -static PyObject *_wrap_wxFont_GetStyle(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxFont_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxFont * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxFont_GetStyle",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFont_GetStyle",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2177,14 +2221,15 @@ static PyObject *_wrap_wxFont_GetStyle(PyObject *self, PyObject *args) { } #define wxFont_GetUnderlined(_swigobj) (_swigobj->GetUnderlined()) -static PyObject *_wrap_wxFont_GetUnderlined(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxFont_GetUnderlined(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxFont * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxFont_GetUnderlined",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFont_GetUnderlined",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2203,14 +2248,15 @@ static PyObject *_wrap_wxFont_GetUnderlined(PyObject *self, PyObject *args) { } #define wxFont_GetWeight(_swigobj) (_swigobj->GetWeight()) -static PyObject *_wrap_wxFont_GetWeight(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxFont_GetWeight(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxFont * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxFont_GetWeight",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFont_GetWeight",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2229,15 +2275,16 @@ static PyObject *_wrap_wxFont_GetWeight(PyObject *self, PyObject *args) { } #define wxFont_SetFaceName(_swigobj,_swigarg0) (_swigobj->SetFaceName(_swigarg0)) -static PyObject *_wrap_wxFont_SetFaceName(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxFont_SetFaceName(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxFont * _arg0; wxString * _arg1; PyObject * _argo0 = 0; PyObject * _obj1 = 0; + char *_kwnames[] = { "self","faceName", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxFont_SetFaceName",&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFont_SetFaceName",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2268,14 +2315,15 @@ static PyObject *_wrap_wxFont_SetFaceName(PyObject *self, PyObject *args) { } #define wxFont_SetFamily(_swigobj,_swigarg0) (_swigobj->SetFamily(_swigarg0)) -static PyObject *_wrap_wxFont_SetFamily(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxFont_SetFamily(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxFont * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","family", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxFont_SetFamily",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFont_SetFamily",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2295,14 +2343,15 @@ static PyObject *_wrap_wxFont_SetFamily(PyObject *self, PyObject *args) { } #define wxFont_SetPointSize(_swigobj,_swigarg0) (_swigobj->SetPointSize(_swigarg0)) -static PyObject *_wrap_wxFont_SetPointSize(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxFont_SetPointSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxFont * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","pointSize", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxFont_SetPointSize",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFont_SetPointSize",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2322,14 +2371,15 @@ static PyObject *_wrap_wxFont_SetPointSize(PyObject *self, PyObject *args) { } #define wxFont_SetStyle(_swigobj,_swigarg0) (_swigobj->SetStyle(_swigarg0)) -static PyObject *_wrap_wxFont_SetStyle(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxFont_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxFont * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","style", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxFont_SetStyle",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFont_SetStyle",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2349,15 +2399,16 @@ static PyObject *_wrap_wxFont_SetStyle(PyObject *self, PyObject *args) { } #define wxFont_SetUnderlined(_swigobj,_swigarg0) (_swigobj->SetUnderlined(_swigarg0)) -static PyObject *_wrap_wxFont_SetUnderlined(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxFont_SetUnderlined(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxFont * _arg0; bool _arg1; PyObject * _argo0 = 0; int tempbool1; + char *_kwnames[] = { "self","underlined", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxFont_SetUnderlined",&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFont_SetUnderlined",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2378,14 +2429,15 @@ static PyObject *_wrap_wxFont_SetUnderlined(PyObject *self, PyObject *args) { } #define wxFont_SetWeight(_swigobj,_swigarg0) (_swigobj->SetWeight(_swigarg0)) -static PyObject *_wrap_wxFont_SetWeight(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxFont_SetWeight(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxFont * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","weight", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxFont_SetWeight",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFont_SetWeight",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2405,16 +2457,17 @@ static PyObject *_wrap_wxFont_SetWeight(PyObject *self, PyObject *args) { } #define new_wxColour(_swigarg0,_swigarg1,_swigarg2) (new wxColour(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_new_wxColour(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxColour * _result; unsigned char _arg0 = (unsigned char ) 0; unsigned char _arg1 = (unsigned char ) 0; unsigned char _arg2 = (unsigned char ) 0; + char *_kwnames[] = { "red","green","blue", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"|bbb:new_wxColour",&_arg0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|bbb:new_wxColour",_kwnames,&_arg0,&_arg1,&_arg2)) return NULL; { wxPy_BEGIN_ALLOW_THREADS; @@ -2432,13 +2485,14 @@ static PyObject *_wrap_new_wxColour(PyObject *self, PyObject *args) { } #define delete_wxColour(_swigobj) (delete _swigobj) -static PyObject *_wrap_delete_wxColour(PyObject *self, PyObject *args) { +static PyObject *_wrap_delete_wxColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxColour * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:delete_wxColour",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxColour",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2458,14 +2512,15 @@ static PyObject *_wrap_delete_wxColour(PyObject *self, PyObject *args) { } #define wxColour_Red(_swigobj) (_swigobj->Red()) -static PyObject *_wrap_wxColour_Red(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxColour_Red(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; unsigned char _result; wxColour * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxColour_Red",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColour_Red",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2484,14 +2539,15 @@ static PyObject *_wrap_wxColour_Red(PyObject *self, PyObject *args) { } #define wxColour_Green(_swigobj) (_swigobj->Green()) -static PyObject *_wrap_wxColour_Green(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxColour_Green(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; unsigned char _result; wxColour * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxColour_Green",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColour_Green",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2510,14 +2566,15 @@ static PyObject *_wrap_wxColour_Green(PyObject *self, PyObject *args) { } #define wxColour_Blue(_swigobj) (_swigobj->Blue()) -static PyObject *_wrap_wxColour_Blue(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxColour_Blue(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; unsigned char _result; wxColour * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxColour_Blue",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColour_Blue",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2536,14 +2593,15 @@ static PyObject *_wrap_wxColour_Blue(PyObject *self, PyObject *args) { } #define wxColour_Ok(_swigobj) (_swigobj->Ok()) -static PyObject *_wrap_wxColour_Ok(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxColour_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxColour * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxColour_Ok",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColour_Ok",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2562,16 +2620,17 @@ static PyObject *_wrap_wxColour_Ok(PyObject *self, PyObject *args) { } #define wxColour_Set(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->Set(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxColour_Set(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxColour_Set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxColour * _arg0; unsigned char _arg1; unsigned char _arg2; unsigned char _arg3; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","red","green","blue", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Obbb:wxColour_Set",&_argo0,&_arg1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Obbb:wxColour_Set",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2597,14 +2656,15 @@ static PyObject * wxColour_Get(wxColour *self) { PyTuple_SetItem(rv, 2, PyInt_FromLong(self->Blue())); return rv; } -static PyObject *_wrap_wxColour_Get(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxColour_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; PyObject * _result; wxColour * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxColour_Get",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColour_Get",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2628,17 +2688,18 @@ static wxPen *new_wxPen(wxColour *colour,int width,int style) { return wxThePenList->FindOrCreatePen(*colour, width, style); } -static PyObject *_wrap_new_wxPen(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxPen(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPen * _result; wxColour * _arg0; int _arg1 = (int ) 1; int _arg2 = (int ) wxSOLID; PyObject * _argo0 = 0; + char *_kwnames[] = { "colour","width","style", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O|ii:new_wxPen",&_argo0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|ii:new_wxPen",_kwnames,&_argo0,&_arg1,&_arg2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2663,14 +2724,15 @@ static PyObject *_wrap_new_wxPen(PyObject *self, PyObject *args) { } #define wxPen_GetCap(_swigobj) (_swigobj->GetCap()) -static PyObject *_wrap_wxPen_GetCap(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPen_GetCap(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxPen * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxPen_GetCap",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPen_GetCap",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2689,15 +2751,16 @@ static PyObject *_wrap_wxPen_GetCap(PyObject *self, PyObject *args) { } #define wxPen_GetColour(_swigobj) (_swigobj->GetColour()) -static PyObject *_wrap_wxPen_GetColour(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPen_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxColour * _result; wxPen * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:wxPen_GetColour",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPen_GetColour",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2723,14 +2786,15 @@ static PyObject *_wrap_wxPen_GetColour(PyObject *self, PyObject *args) { } #define wxPen_GetJoin(_swigobj) (_swigobj->GetJoin()) -static PyObject *_wrap_wxPen_GetJoin(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPen_GetJoin(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxPen * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxPen_GetJoin",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPen_GetJoin",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2749,14 +2813,15 @@ static PyObject *_wrap_wxPen_GetJoin(PyObject *self, PyObject *args) { } #define wxPen_GetStyle(_swigobj) (_swigobj->GetStyle()) -static PyObject *_wrap_wxPen_GetStyle(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPen_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxPen * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxPen_GetStyle",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPen_GetStyle",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2775,14 +2840,15 @@ static PyObject *_wrap_wxPen_GetStyle(PyObject *self, PyObject *args) { } #define wxPen_GetWidth(_swigobj) (_swigobj->GetWidth()) -static PyObject *_wrap_wxPen_GetWidth(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPen_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxPen * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxPen_GetWidth",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPen_GetWidth",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2801,14 +2867,15 @@ static PyObject *_wrap_wxPen_GetWidth(PyObject *self, PyObject *args) { } #define wxPen_Ok(_swigobj) (_swigobj->Ok()) -static PyObject *_wrap_wxPen_Ok(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPen_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxPen * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxPen_Ok",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPen_Ok",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2827,14 +2894,15 @@ static PyObject *_wrap_wxPen_Ok(PyObject *self, PyObject *args) { } #define wxPen_SetCap(_swigobj,_swigarg0) (_swigobj->SetCap(_swigarg0)) -static PyObject *_wrap_wxPen_SetCap(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPen_SetCap(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPen * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","cap_style", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxPen_SetCap",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPen_SetCap",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2854,15 +2922,16 @@ static PyObject *_wrap_wxPen_SetCap(PyObject *self, PyObject *args) { } #define wxPen_SetColour(_swigobj,_swigarg0) (_swigobj->SetColour(_swigarg0)) -static PyObject *_wrap_wxPen_SetColour(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPen_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPen * _arg0; wxColour * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","colour", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxPen_SetColour",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPen_SetColour",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2889,14 +2958,15 @@ static PyObject *_wrap_wxPen_SetColour(PyObject *self, PyObject *args) { } #define wxPen_SetJoin(_swigobj,_swigarg0) (_swigobj->SetJoin(_swigarg0)) -static PyObject *_wrap_wxPen_SetJoin(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPen_SetJoin(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPen * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","join_style", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxPen_SetJoin",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPen_SetJoin",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2916,14 +2986,15 @@ static PyObject *_wrap_wxPen_SetJoin(PyObject *self, PyObject *args) { } #define wxPen_SetStyle(_swigobj,_swigarg0) (_swigobj->SetStyle(_swigarg0)) -static PyObject *_wrap_wxPen_SetStyle(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPen_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPen * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","style", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxPen_SetStyle",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPen_SetStyle",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2943,14 +3014,15 @@ static PyObject *_wrap_wxPen_SetStyle(PyObject *self, PyObject *args) { } #define wxPen_SetWidth(_swigobj,_swigarg0) (_swigobj->SetWidth(_swigarg0)) -static PyObject *_wrap_wxPen_SetWidth(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPen_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPen * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","width", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxPen_SetWidth",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPen_SetWidth",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2970,16 +3042,17 @@ static PyObject *_wrap_wxPen_SetWidth(PyObject *self, PyObject *args) { } #define wxPen_GetDashes(_swigobj,_swigarg0) (_swigobj->GetDashes(_swigarg0)) -static PyObject *_wrap_wxPen_GetDashes(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPen_GetDashes(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxPen * _arg0; wxDash ** _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","dashes", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxPen_GetDashes",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPen_GetDashes",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3005,15 +3078,16 @@ static PyObject *_wrap_wxPen_GetDashes(PyObject *self, PyObject *args) { } #define wxPen_GetStipple(_swigobj) (_swigobj->GetStipple()) -static PyObject *_wrap_wxPen_GetStipple(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPen_GetStipple(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBitmap * _result; wxPen * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:wxPen_GetStipple",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPen_GetStipple",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3038,16 +3112,17 @@ static PyObject *_wrap_wxPen_GetStipple(PyObject *self, PyObject *args) { } #define wxPen_SetDashes(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetDashes(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxPen_SetDashes(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPen_SetDashes(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPen * _arg0; int _arg1; wxDash * _arg2; PyObject * _argo0 = 0; PyObject * _obj2 = 0; + char *_kwnames[] = { "self","LIST", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxPen_SetDashes",&_argo0,&_obj2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPen_SetDashes",_kwnames,&_argo0,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3085,15 +3160,16 @@ static PyObject *_wrap_wxPen_SetDashes(PyObject *self, PyObject *args) { } #define wxPen_SetStipple(_swigobj,_swigarg0) (_swigobj->SetStipple(_swigarg0)) -static PyObject *_wrap_wxPen_SetStipple(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPen_SetStipple(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPen * _arg0; wxBitmap * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","stipple", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxPen_SetStipple",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPen_SetStipple",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3123,16 +3199,17 @@ static wxBrush *new_wxBrush(wxColour *colour,int style) { return wxTheBrushList->FindOrCreateBrush(*colour, style); } -static PyObject *_wrap_new_wxBrush(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxBrush(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBrush * _result; wxColour * _arg0; int _arg1 = (int ) wxSOLID; PyObject * _argo0 = 0; + char *_kwnames[] = { "colour","style", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O|i:new_wxBrush",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:new_wxBrush",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3157,15 +3234,16 @@ static PyObject *_wrap_new_wxBrush(PyObject *self, PyObject *args) { } #define wxBrush_GetColour(_swigobj) (_swigobj->GetColour()) -static PyObject *_wrap_wxBrush_GetColour(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBrush_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxColour * _result; wxBrush * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:wxBrush_GetColour",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBrush_GetColour",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3191,15 +3269,16 @@ static PyObject *_wrap_wxBrush_GetColour(PyObject *self, PyObject *args) { } #define wxBrush_GetStipple(_swigobj) (_swigobj->GetStipple()) -static PyObject *_wrap_wxBrush_GetStipple(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBrush_GetStipple(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBitmap * _result; wxBrush * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:wxBrush_GetStipple",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBrush_GetStipple",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3224,14 +3303,15 @@ static PyObject *_wrap_wxBrush_GetStipple(PyObject *self, PyObject *args) { } #define wxBrush_GetStyle(_swigobj) (_swigobj->GetStyle()) -static PyObject *_wrap_wxBrush_GetStyle(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBrush_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxBrush * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxBrush_GetStyle",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBrush_GetStyle",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3250,14 +3330,15 @@ static PyObject *_wrap_wxBrush_GetStyle(PyObject *self, PyObject *args) { } #define wxBrush_Ok(_swigobj) (_swigobj->Ok()) -static PyObject *_wrap_wxBrush_Ok(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBrush_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxBrush * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxBrush_Ok",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBrush_Ok",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3276,15 +3357,16 @@ static PyObject *_wrap_wxBrush_Ok(PyObject *self, PyObject *args) { } #define wxBrush_SetColour(_swigobj,_swigarg0) (_swigobj->SetColour(_swigarg0)) -static PyObject *_wrap_wxBrush_SetColour(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBrush_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBrush * _arg0; wxColour * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","colour", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxBrush_SetColour",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBrush_SetColour",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3311,15 +3393,16 @@ static PyObject *_wrap_wxBrush_SetColour(PyObject *self, PyObject *args) { } #define wxBrush_SetStipple(_swigobj,_swigarg0) (_swigobj->SetStipple(_swigarg0)) -static PyObject *_wrap_wxBrush_SetStipple(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBrush_SetStipple(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBrush * _arg0; wxBitmap * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","bitmap", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxBrush_SetStipple",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBrush_SetStipple",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3346,14 +3429,15 @@ static PyObject *_wrap_wxBrush_SetStipple(PyObject *self, PyObject *args) { } #define wxBrush_SetStyle(_swigobj,_swigarg0) (_swigobj->SetStyle(_swigarg0)) -static PyObject *_wrap_wxBrush_SetStyle(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxBrush_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBrush * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","style", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxBrush_SetStyle",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBrush_SetStyle",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3373,13 +3457,14 @@ static PyObject *_wrap_wxBrush_SetStyle(PyObject *self, PyObject *args) { } #define delete_wxDC(_swigobj) (delete _swigobj) -static PyObject *_wrap_delete_wxDC(PyObject *self, PyObject *args) { +static PyObject *_wrap_delete_wxDC(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:delete_wxDC",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxDC",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3399,13 +3484,14 @@ static PyObject *_wrap_delete_wxDC(PyObject *self, PyObject *args) { } #define wxDC_BeginDrawing(_swigobj) (_swigobj->BeginDrawing()) -static PyObject *_wrap_wxDC_BeginDrawing(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_BeginDrawing(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_BeginDrawing",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_BeginDrawing",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3425,7 +3511,7 @@ static PyObject *_wrap_wxDC_BeginDrawing(PyObject *self, PyObject *args) { } #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) { +static PyObject *_wrap_wxDC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxDC * _arg0; @@ -3440,9 +3526,10 @@ static PyObject *_wrap_wxDC_Blit(PyObject *self, PyObject *args) { int _arg9 = (int ) FALSE; PyObject * _argo0 = 0; PyObject * _argo5 = 0; + char *_kwnames[] = { "self","xdest","ydest","width","height","source","xsrc","ysrc","logicalFunc","useMask", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OllllOll|ii:wxDC_Blit",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5,&_arg6,&_arg7,&_arg8,&_arg9)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OllllOll|ii:wxDC_Blit",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5,&_arg6,&_arg7,&_arg8,&_arg9)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3468,13 +3555,14 @@ static PyObject *_wrap_wxDC_Blit(PyObject *self, PyObject *args) { } #define wxDC_Clear(_swigobj) (_swigobj->Clear()) -static PyObject *_wrap_wxDC_Clear(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_Clear(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_Clear",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_Clear",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3494,15 +3582,16 @@ static PyObject *_wrap_wxDC_Clear(PyObject *self, PyObject *args) { } #define wxDC_CrossHair(_swigobj,_swigarg0,_swigarg1) (_swigobj->CrossHair(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxDC_CrossHair(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_CrossHair(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; long _arg1; long _arg2; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oll:wxDC_CrossHair",&_argo0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxDC_CrossHair",_kwnames,&_argo0,&_arg1,&_arg2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3522,13 +3611,14 @@ static PyObject *_wrap_wxDC_CrossHair(PyObject *self, PyObject *args) { } #define wxDC_DestroyClippingRegion(_swigobj) (_swigobj->DestroyClippingRegion()) -static PyObject *_wrap_wxDC_DestroyClippingRegion(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DestroyClippingRegion(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_DestroyClippingRegion",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_DestroyClippingRegion",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3548,15 +3638,16 @@ static PyObject *_wrap_wxDC_DestroyClippingRegion(PyObject *self, PyObject *args } #define wxDC_DeviceToLogicalX(_swigobj,_swigarg0) (_swigobj->DeviceToLogicalX(_swigarg0)) -static PyObject *_wrap_wxDC_DeviceToLogicalX(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; long _result; wxDC * _arg0; long _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Ol:wxDC_DeviceToLogicalX",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxDC_DeviceToLogicalX",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3575,15 +3666,16 @@ static PyObject *_wrap_wxDC_DeviceToLogicalX(PyObject *self, PyObject *args) { } #define wxDC_DeviceToLogicalXRel(_swigobj,_swigarg0) (_swigobj->DeviceToLogicalXRel(_swigarg0)) -static PyObject *_wrap_wxDC_DeviceToLogicalXRel(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DeviceToLogicalXRel(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; long _result; wxDC * _arg0; long _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Ol:wxDC_DeviceToLogicalXRel",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxDC_DeviceToLogicalXRel",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3602,15 +3694,16 @@ static PyObject *_wrap_wxDC_DeviceToLogicalXRel(PyObject *self, PyObject *args) } #define wxDC_DeviceToLogicalY(_swigobj,_swigarg0) (_swigobj->DeviceToLogicalY(_swigarg0)) -static PyObject *_wrap_wxDC_DeviceToLogicalY(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; long _result; wxDC * _arg0; long _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","y", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Ol:wxDC_DeviceToLogicalY",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxDC_DeviceToLogicalY",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3629,15 +3722,16 @@ static PyObject *_wrap_wxDC_DeviceToLogicalY(PyObject *self, PyObject *args) { } #define wxDC_DeviceToLogicalYRel(_swigobj,_swigarg0) (_swigobj->DeviceToLogicalYRel(_swigarg0)) -static PyObject *_wrap_wxDC_DeviceToLogicalYRel(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DeviceToLogicalYRel(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; long _result; wxDC * _arg0; long _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","y", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Ol:wxDC_DeviceToLogicalYRel",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxDC_DeviceToLogicalYRel",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3656,7 +3750,7 @@ static PyObject *_wrap_wxDC_DeviceToLogicalYRel(PyObject *self, PyObject *args) } #define wxDC_DrawArc(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->DrawArc(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) -static PyObject *_wrap_wxDC_DrawArc(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DrawArc(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; long _arg1; @@ -3666,9 +3760,10 @@ static PyObject *_wrap_wxDC_DrawArc(PyObject *self, PyObject *args) { long _arg5; long _arg6; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x1","y1","x2","y2","xc","yc", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Ollllll:wxDC_DrawArc",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ollllll:wxDC_DrawArc",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3688,16 +3783,17 @@ static PyObject *_wrap_wxDC_DrawArc(PyObject *self, PyObject *args) { } #define wxDC_DrawCircle(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->DrawCircle(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxDC_DrawCircle(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DrawCircle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; long _arg1; long _arg2; long _arg3; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y","radius", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Olll:wxDC_DrawCircle",&_argo0,&_arg1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Olll:wxDC_DrawCircle",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3717,7 +3813,7 @@ static PyObject *_wrap_wxDC_DrawCircle(PyObject *self, PyObject *args) { } #define wxDC_DrawEllipse(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->DrawEllipse(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_wxDC_DrawEllipse(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DrawEllipse(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; long _arg1; @@ -3725,9 +3821,10 @@ static PyObject *_wrap_wxDC_DrawEllipse(PyObject *self, PyObject *args) { long _arg3; long _arg4; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y","width","height", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Ollll:wxDC_DrawEllipse",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ollll:wxDC_DrawEllipse",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3747,7 +3844,7 @@ static PyObject *_wrap_wxDC_DrawEllipse(PyObject *self, PyObject *args) { } #define wxDC_DrawEllipticArc(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->DrawEllipticArc(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) -static PyObject *_wrap_wxDC_DrawEllipticArc(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DrawEllipticArc(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; long _arg1; @@ -3757,9 +3854,10 @@ static PyObject *_wrap_wxDC_DrawEllipticArc(PyObject *self, PyObject *args) { long _arg5; long _arg6; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y","width","height","start","end", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Ollllll:wxDC_DrawEllipticArc",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ollllll:wxDC_DrawEllipticArc",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3779,7 +3877,7 @@ static PyObject *_wrap_wxDC_DrawEllipticArc(PyObject *self, PyObject *args) { } #define wxDC_DrawIcon(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->DrawIcon(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxDC_DrawIcon(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DrawIcon(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; wxIcon * _arg1; @@ -3787,9 +3885,10 @@ static PyObject *_wrap_wxDC_DrawIcon(PyObject *self, PyObject *args) { long _arg3; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","icon","x","y", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OOll:wxDC_DrawIcon",&_argo0,&_argo1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOll:wxDC_DrawIcon",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3816,7 +3915,7 @@ static PyObject *_wrap_wxDC_DrawIcon(PyObject *self, PyObject *args) { } #define wxDC_DrawLine(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->DrawLine(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_wxDC_DrawLine(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DrawLine(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; long _arg1; @@ -3824,9 +3923,10 @@ static PyObject *_wrap_wxDC_DrawLine(PyObject *self, PyObject *args) { long _arg3; long _arg4; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x1","y1","x2","y2", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Ollll:wxDC_DrawLine",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ollll:wxDC_DrawLine",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3846,7 +3946,7 @@ static PyObject *_wrap_wxDC_DrawLine(PyObject *self, PyObject *args) { } #define wxDC_DrawLines(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->DrawLines(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_wxDC_DrawLines(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DrawLines(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; int _arg1; @@ -3855,9 +3955,10 @@ static PyObject *_wrap_wxDC_DrawLines(PyObject *self, PyObject *args) { long _arg4 = (long ) 0; PyObject * _argo0 = 0; PyObject * _obj2 = 0; + char *_kwnames[] = { "self","LIST","xoffset","yoffset", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO|ll:wxDC_DrawLines",&_argo0,&_obj2,&_arg3,&_arg4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|ll:wxDC_DrawLines",_kwnames,&_argo0,&_obj2,&_arg3,&_arg4)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3895,7 +3996,7 @@ static PyObject *_wrap_wxDC_DrawLines(PyObject *self, PyObject *args) { } #define wxDC_DrawPolygon(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->DrawPolygon(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) -static PyObject *_wrap_wxDC_DrawPolygon(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DrawPolygon(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; int _arg1; @@ -3905,9 +4006,10 @@ static PyObject *_wrap_wxDC_DrawPolygon(PyObject *self, PyObject *args) { int _arg5 = (int ) wxODDEVEN_RULE; PyObject * _argo0 = 0; PyObject * _obj2 = 0; + char *_kwnames[] = { "self","LIST","xoffset","yoffset","fill_style", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO|lli:wxDC_DrawPolygon",&_argo0,&_obj2,&_arg3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|lli:wxDC_DrawPolygon",_kwnames,&_argo0,&_obj2,&_arg3,&_arg4,&_arg5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3945,15 +4047,16 @@ static PyObject *_wrap_wxDC_DrawPolygon(PyObject *self, PyObject *args) { } #define wxDC_DrawPoint(_swigobj,_swigarg0,_swigarg1) (_swigobj->DrawPoint(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxDC_DrawPoint(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DrawPoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; long _arg1; long _arg2; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oll:wxDC_DrawPoint",&_argo0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxDC_DrawPoint",_kwnames,&_argo0,&_arg1,&_arg2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3973,7 +4076,7 @@ static PyObject *_wrap_wxDC_DrawPoint(PyObject *self, PyObject *args) { } #define wxDC_DrawRectangle(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->DrawRectangle(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_wxDC_DrawRectangle(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DrawRectangle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; long _arg1; @@ -3981,9 +4084,10 @@ static PyObject *_wrap_wxDC_DrawRectangle(PyObject *self, PyObject *args) { long _arg3; long _arg4; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y","width","height", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Ollll:wxDC_DrawRectangle",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ollll:wxDC_DrawRectangle",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4003,7 +4107,7 @@ static PyObject *_wrap_wxDC_DrawRectangle(PyObject *self, PyObject *args) { } #define wxDC_DrawRoundedRectangle(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->DrawRoundedRectangle(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) -static PyObject *_wrap_wxDC_DrawRoundedRectangle(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DrawRoundedRectangle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; long _arg1; @@ -4012,9 +4116,10 @@ static PyObject *_wrap_wxDC_DrawRoundedRectangle(PyObject *self, PyObject *args) long _arg4; long _arg5 = (long ) 20; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y","width","height","radius", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Ollll|l:wxDC_DrawRoundedRectangle",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ollll|l:wxDC_DrawRoundedRectangle",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4034,16 +4139,17 @@ static PyObject *_wrap_wxDC_DrawRoundedRectangle(PyObject *self, PyObject *args) } #define wxDC_DrawSpline(_swigobj,_swigarg0,_swigarg1) (_swigobj->DrawSpline(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxDC_DrawSpline(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DrawSpline(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; int _arg1; wxPoint * _arg2; PyObject * _argo0 = 0; PyObject * _obj2 = 0; + char *_kwnames[] = { "self","LIST", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxDC_DrawSpline",&_argo0,&_obj2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDC_DrawSpline",_kwnames,&_argo0,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4081,7 +4187,7 @@ static PyObject *_wrap_wxDC_DrawSpline(PyObject *self, PyObject *args) { } #define wxDC_DrawText(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->DrawText(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxDC_DrawText(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DrawText(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; wxString * _arg1; @@ -4089,9 +4195,10 @@ static PyObject *_wrap_wxDC_DrawText(PyObject *self, PyObject *args) { long _arg3; PyObject * _argo0 = 0; PyObject * _obj1 = 0; + char *_kwnames[] = { "self","text","x","y", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OOll:wxDC_DrawText",&_argo0,&_obj1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOll:wxDC_DrawText",_kwnames,&_argo0,&_obj1,&_arg2,&_arg3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4122,13 +4229,14 @@ static PyObject *_wrap_wxDC_DrawText(PyObject *self, PyObject *args) { } #define wxDC_EndDoc(_swigobj) (_swigobj->EndDoc()) -static PyObject *_wrap_wxDC_EndDoc(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_EndDoc(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_EndDoc",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_EndDoc",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4148,13 +4256,14 @@ static PyObject *_wrap_wxDC_EndDoc(PyObject *self, PyObject *args) { } #define wxDC_EndDrawing(_swigobj) (_swigobj->EndDrawing()) -static PyObject *_wrap_wxDC_EndDrawing(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_EndDrawing(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_EndDrawing",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_EndDrawing",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4174,13 +4283,14 @@ static PyObject *_wrap_wxDC_EndDrawing(PyObject *self, PyObject *args) { } #define wxDC_EndPage(_swigobj) (_swigobj->EndPage()) -static PyObject *_wrap_wxDC_EndPage(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_EndPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_EndPage",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_EndPage",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4200,7 +4310,7 @@ static PyObject *_wrap_wxDC_EndPage(PyObject *self, PyObject *args) { } #define wxDC_FloodFill(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->FloodFill(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_wxDC_FloodFill(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_FloodFill(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; long _arg1; @@ -4209,9 +4319,10 @@ static PyObject *_wrap_wxDC_FloodFill(PyObject *self, PyObject *args) { int _arg4 = (int ) wxFLOOD_SURFACE; PyObject * _argo0 = 0; PyObject * _argo3 = 0; + char *_kwnames[] = { "self","x","y","colour","style", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OllO|i:wxDC_FloodFill",&_argo0,&_arg1,&_arg2,&_argo3,&_arg4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OllO|i:wxDC_FloodFill",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3,&_arg4)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4238,15 +4349,16 @@ static PyObject *_wrap_wxDC_FloodFill(PyObject *self, PyObject *args) { } #define wxDC_GetBackground(_swigobj) (_swigobj->GetBackground()) -static PyObject *_wrap_wxDC_GetBackground(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetBackground(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBrush * _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_GetBackground",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetBackground",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4272,15 +4384,16 @@ static PyObject *_wrap_wxDC_GetBackground(PyObject *self, PyObject *args) { } #define wxDC_GetBrush(_swigobj) (_swigobj->GetBrush()) -static PyObject *_wrap_wxDC_GetBrush(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetBrush(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxBrush * _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_GetBrush",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetBrush",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4306,14 +4419,15 @@ static PyObject *_wrap_wxDC_GetBrush(PyObject *self, PyObject *args) { } #define wxDC_GetCharHeight(_swigobj) (_swigobj->GetCharHeight()) -static PyObject *_wrap_wxDC_GetCharHeight(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetCharHeight(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; long _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_GetCharHeight",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetCharHeight",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4332,14 +4446,15 @@ static PyObject *_wrap_wxDC_GetCharHeight(PyObject *self, PyObject *args) { } #define wxDC_GetCharWidth(_swigobj) (_swigobj->GetCharWidth()) -static PyObject *_wrap_wxDC_GetCharWidth(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetCharWidth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; long _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_GetCharWidth",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetCharWidth",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4358,7 +4473,7 @@ static PyObject *_wrap_wxDC_GetCharWidth(PyObject *self, PyObject *args) { } #define wxDC_GetClippingBox(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->GetClippingBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_wxDC_GetClippingBox(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetClippingBox(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; long * _arg1; @@ -4370,6 +4485,7 @@ static PyObject *_wrap_wxDC_GetClippingBox(PyObject *self, PyObject *args) { long * _arg4; long temp2; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; { @@ -4384,7 +4500,7 @@ static PyObject *_wrap_wxDC_GetClippingBox(PyObject *self, PyObject *args) { { _arg4 = &temp2; } - if(!PyArg_ParseTuple(args,"O:wxDC_GetClippingBox",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetClippingBox",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4424,15 +4540,16 @@ static PyObject *_wrap_wxDC_GetClippingBox(PyObject *self, PyObject *args) { } #define wxDC_GetFont(_swigobj) (_swigobj->GetFont()) -static PyObject *_wrap_wxDC_GetFont(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxFont * _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_GetFont",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetFont",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4458,14 +4575,15 @@ static PyObject *_wrap_wxDC_GetFont(PyObject *self, PyObject *args) { } #define wxDC_GetLogicalFunction(_swigobj) (_swigobj->GetLogicalFunction()) -static PyObject *_wrap_wxDC_GetLogicalFunction(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetLogicalFunction(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_GetLogicalFunction",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetLogicalFunction",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4484,14 +4602,15 @@ static PyObject *_wrap_wxDC_GetLogicalFunction(PyObject *self, PyObject *args) { } #define wxDC_GetMapMode(_swigobj) (_swigobj->GetMapMode()) -static PyObject *_wrap_wxDC_GetMapMode(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetMapMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_GetMapMode",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetMapMode",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4510,14 +4629,15 @@ static PyObject *_wrap_wxDC_GetMapMode(PyObject *self, PyObject *args) { } #define wxDC_GetOptimization(_swigobj) (_swigobj->GetOptimization()) -static PyObject *_wrap_wxDC_GetOptimization(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetOptimization(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_GetOptimization",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetOptimization",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4536,15 +4656,16 @@ static PyObject *_wrap_wxDC_GetOptimization(PyObject *self, PyObject *args) { } #define wxDC_GetPen(_swigobj) (_swigobj->GetPen()) -static PyObject *_wrap_wxDC_GetPen(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetPen(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPen * _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_GetPen",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetPen",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4574,17 +4695,18 @@ static wxColour * wxDC_GetPixel(wxDC *self,long x,long y) { self->GetPixel(x, y, wc); return wc; } -static PyObject *_wrap_wxDC_GetPixel(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetPixel(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxColour * _result; wxDC * _arg0; long _arg1; long _arg2; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"Oll:wxDC_GetPixel",&_argo0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxDC_GetPixel",_kwnames,&_argo0,&_arg1,&_arg2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4609,7 +4731,7 @@ static PyObject *_wrap_wxDC_GetPixel(PyObject *self, PyObject *args) { } #define wxDC_GetSizeTuple(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetSize(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxDC_GetSizeTuple(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetSizeTuple(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; int * _arg1; @@ -4617,6 +4739,7 @@ static PyObject *_wrap_wxDC_GetSizeTuple(PyObject *self, PyObject *args) { int * _arg2; int temp0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; { @@ -4625,7 +4748,7 @@ static PyObject *_wrap_wxDC_GetSizeTuple(PyObject *self, PyObject *args) { { _arg2 = &temp0; } - if(!PyArg_ParseTuple(args,"O:wxDC_GetSizeTuple",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetSizeTuple",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4655,15 +4778,16 @@ static PyObject *_wrap_wxDC_GetSizeTuple(PyObject *self, PyObject *args) { } #define wxDC_GetSize(_swigobj) (_swigobj->GetSize()) -static PyObject *_wrap_wxDC_GetSize(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxSize * _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_GetSize",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetSize",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4683,15 +4807,16 @@ static PyObject *_wrap_wxDC_GetSize(PyObject *self, PyObject *args) { } #define wxDC_GetTextBackground(_swigobj) (_swigobj->GetTextBackground()) -static PyObject *_wrap_wxDC_GetTextBackground(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetTextBackground(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxColour * _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_GetTextBackground",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetTextBackground",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4717,7 +4842,7 @@ static PyObject *_wrap_wxDC_GetTextBackground(PyObject *self, PyObject *args) { } #define wxDC_GetTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; wxString * _arg1; @@ -4727,6 +4852,7 @@ static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) { long temp0; PyObject * _argo0 = 0; PyObject * _obj1 = 0; + char *_kwnames[] = { "self","string", NULL }; self = self; { @@ -4735,7 +4861,7 @@ static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) { { _arg3 = &temp0; } - if(!PyArg_ParseTuple(args,"OO:wxDC_GetTextExtent",&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDC_GetTextExtent",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4776,7 +4902,7 @@ static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) { } #define wxDC_GetFullTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) -static PyObject *_wrap_wxDC_GetFullTextExtent(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetFullTextExtent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; wxString * _arg1; @@ -4792,6 +4918,7 @@ static PyObject *_wrap_wxDC_GetFullTextExtent(PyObject *self, PyObject *args) { PyObject * _argo0 = 0; PyObject * _obj1 = 0; PyObject * _argo6 = 0; + char *_kwnames[] = { "self","string","font", NULL }; self = self; { @@ -4806,7 +4933,7 @@ static PyObject *_wrap_wxDC_GetFullTextExtent(PyObject *self, PyObject *args) { { _arg5 = &temp2; } - if(!PyArg_ParseTuple(args,"OO|O:wxDC_GetFullTextExtent",&_argo0,&_obj1,&_argo6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:wxDC_GetFullTextExtent",_kwnames,&_argo0,&_obj1,&_argo6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4864,15 +4991,16 @@ static PyObject *_wrap_wxDC_GetFullTextExtent(PyObject *self, PyObject *args) { } #define wxDC_GetTextForeground(_swigobj) (_swigobj->GetTextForeground()) -static PyObject *_wrap_wxDC_GetTextForeground(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_GetTextForeground(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxColour * _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_GetTextForeground",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetTextForeground",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4898,15 +5026,16 @@ static PyObject *_wrap_wxDC_GetTextForeground(PyObject *self, PyObject *args) { } #define wxDC_LogicalToDeviceX(_swigobj,_swigarg0) (_swigobj->LogicalToDeviceX(_swigarg0)) -static PyObject *_wrap_wxDC_LogicalToDeviceX(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; long _result; wxDC * _arg0; long _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Ol:wxDC_LogicalToDeviceX",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxDC_LogicalToDeviceX",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4925,15 +5054,16 @@ static PyObject *_wrap_wxDC_LogicalToDeviceX(PyObject *self, PyObject *args) { } #define wxDC_LogicalToDeviceXRel(_swigobj,_swigarg0) (_swigobj->LogicalToDeviceXRel(_swigarg0)) -static PyObject *_wrap_wxDC_LogicalToDeviceXRel(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_LogicalToDeviceXRel(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; long _result; wxDC * _arg0; long _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Ol:wxDC_LogicalToDeviceXRel",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxDC_LogicalToDeviceXRel",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4952,15 +5082,16 @@ static PyObject *_wrap_wxDC_LogicalToDeviceXRel(PyObject *self, PyObject *args) } #define wxDC_LogicalToDeviceY(_swigobj,_swigarg0) (_swigobj->LogicalToDeviceY(_swigarg0)) -static PyObject *_wrap_wxDC_LogicalToDeviceY(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; long _result; wxDC * _arg0; long _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","y", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Ol:wxDC_LogicalToDeviceY",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxDC_LogicalToDeviceY",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4979,15 +5110,16 @@ static PyObject *_wrap_wxDC_LogicalToDeviceY(PyObject *self, PyObject *args) { } #define wxDC_LogicalToDeviceYRel(_swigobj,_swigarg0) (_swigobj->LogicalToDeviceYRel(_swigarg0)) -static PyObject *_wrap_wxDC_LogicalToDeviceYRel(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_LogicalToDeviceYRel(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; long _result; wxDC * _arg0; long _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","y", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Ol:wxDC_LogicalToDeviceYRel",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxDC_LogicalToDeviceYRel",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5006,14 +5138,15 @@ static PyObject *_wrap_wxDC_LogicalToDeviceYRel(PyObject *self, PyObject *args) } #define wxDC_MaxX(_swigobj) (_swigobj->MaxX()) -static PyObject *_wrap_wxDC_MaxX(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_MaxX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; long _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_MaxX",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_MaxX",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5032,14 +5165,15 @@ static PyObject *_wrap_wxDC_MaxX(PyObject *self, PyObject *args) { } #define wxDC_MaxY(_swigobj) (_swigobj->MaxY()) -static PyObject *_wrap_wxDC_MaxY(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_MaxY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; long _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_MaxY",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_MaxY",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5058,14 +5192,15 @@ static PyObject *_wrap_wxDC_MaxY(PyObject *self, PyObject *args) { } #define wxDC_MinX(_swigobj) (_swigobj->MinX()) -static PyObject *_wrap_wxDC_MinX(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_MinX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; long _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_MinX",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_MinX",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5084,14 +5219,15 @@ static PyObject *_wrap_wxDC_MinX(PyObject *self, PyObject *args) { } #define wxDC_MinY(_swigobj) (_swigobj->MinY()) -static PyObject *_wrap_wxDC_MinY(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_MinY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; long _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_MinY",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_MinY",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5110,14 +5246,15 @@ static PyObject *_wrap_wxDC_MinY(PyObject *self, PyObject *args) { } #define wxDC_Ok(_swigobj) (_swigobj->Ok()) -static PyObject *_wrap_wxDC_Ok(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_Ok",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_Ok",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5136,15 +5273,16 @@ static PyObject *_wrap_wxDC_Ok(PyObject *self, PyObject *args) { } #define wxDC_SetDeviceOrigin(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetDeviceOrigin(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxDC_SetDeviceOrigin(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_SetDeviceOrigin(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; long _arg1; long _arg2; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oll:wxDC_SetDeviceOrigin",&_argo0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxDC_SetDeviceOrigin",_kwnames,&_argo0,&_arg1,&_arg2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5164,15 +5302,16 @@ static PyObject *_wrap_wxDC_SetDeviceOrigin(PyObject *self, PyObject *args) { } #define wxDC_SetBackground(_swigobj,_swigarg0) (_swigobj->SetBackground(_swigarg0)) -static PyObject *_wrap_wxDC_SetBackground(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_SetBackground(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; wxBrush * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","brush", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxDC_SetBackground",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDC_SetBackground",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5199,14 +5338,15 @@ static PyObject *_wrap_wxDC_SetBackground(PyObject *self, PyObject *args) { } #define wxDC_SetBackgroundMode(_swigobj,_swigarg0) (_swigobj->SetBackgroundMode(_swigarg0)) -static PyObject *_wrap_wxDC_SetBackgroundMode(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_SetBackgroundMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","mode", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxDC_SetBackgroundMode",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxDC_SetBackgroundMode",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5226,7 +5366,7 @@ static PyObject *_wrap_wxDC_SetBackgroundMode(PyObject *self, PyObject *args) { } #define wxDC_SetClippingRegion(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->SetClippingRegion(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_wxDC_SetClippingRegion(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_SetClippingRegion(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; long _arg1; @@ -5234,9 +5374,10 @@ static PyObject *_wrap_wxDC_SetClippingRegion(PyObject *self, PyObject *args) { long _arg3; long _arg4; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y","width","height", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Ollll:wxDC_SetClippingRegion",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ollll:wxDC_SetClippingRegion",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5256,15 +5397,16 @@ static PyObject *_wrap_wxDC_SetClippingRegion(PyObject *self, PyObject *args) { } #define wxDC_SetPalette(_swigobj,_swigarg0) (_swigobj->SetPalette(_swigarg0)) -static PyObject *_wrap_wxDC_SetPalette(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_SetPalette(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; wxPalette * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","colourMap", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxDC_SetPalette",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDC_SetPalette",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5291,15 +5433,16 @@ static PyObject *_wrap_wxDC_SetPalette(PyObject *self, PyObject *args) { } #define wxDC_SetBrush(_swigobj,_swigarg0) (_swigobj->SetBrush(_swigarg0)) -static PyObject *_wrap_wxDC_SetBrush(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_SetBrush(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; wxBrush * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","brush", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxDC_SetBrush",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDC_SetBrush",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5326,15 +5469,16 @@ static PyObject *_wrap_wxDC_SetBrush(PyObject *self, PyObject *args) { } #define wxDC_SetFont(_swigobj,_swigarg0) (_swigobj->SetFont(_swigarg0)) -static PyObject *_wrap_wxDC_SetFont(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; wxFont * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","font", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxDC_SetFont",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDC_SetFont",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5361,14 +5505,15 @@ static PyObject *_wrap_wxDC_SetFont(PyObject *self, PyObject *args) { } #define wxDC_SetLogicalFunction(_swigobj,_swigarg0) (_swigobj->SetLogicalFunction(_swigarg0)) -static PyObject *_wrap_wxDC_SetLogicalFunction(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_SetLogicalFunction(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","function", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxDC_SetLogicalFunction",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxDC_SetLogicalFunction",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5388,14 +5533,15 @@ static PyObject *_wrap_wxDC_SetLogicalFunction(PyObject *self, PyObject *args) { } #define wxDC_SetMapMode(_swigobj,_swigarg0) (_swigobj->SetMapMode(_swigarg0)) -static PyObject *_wrap_wxDC_SetMapMode(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_SetMapMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","mode", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxDC_SetMapMode",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxDC_SetMapMode",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5415,15 +5561,16 @@ static PyObject *_wrap_wxDC_SetMapMode(PyObject *self, PyObject *args) { } #define wxDC_SetOptimization(_swigobj,_swigarg0) (_swigobj->SetOptimization(_swigarg0)) -static PyObject *_wrap_wxDC_SetOptimization(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_SetOptimization(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; bool _arg1; PyObject * _argo0 = 0; int tempbool1; + char *_kwnames[] = { "self","optimize", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxDC_SetOptimization",&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxDC_SetOptimization",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5444,15 +5591,16 @@ static PyObject *_wrap_wxDC_SetOptimization(PyObject *self, PyObject *args) { } #define wxDC_SetPen(_swigobj,_swigarg0) (_swigobj->SetPen(_swigarg0)) -static PyObject *_wrap_wxDC_SetPen(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_SetPen(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; wxPen * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","pen", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxDC_SetPen",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDC_SetPen",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5479,15 +5627,16 @@ static PyObject *_wrap_wxDC_SetPen(PyObject *self, PyObject *args) { } #define wxDC_SetTextBackground(_swigobj,_swigarg0) (_swigobj->SetTextBackground(_swigarg0)) -static PyObject *_wrap_wxDC_SetTextBackground(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_SetTextBackground(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; wxColour * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","colour", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxDC_SetTextBackground",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDC_SetTextBackground",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5514,15 +5663,16 @@ static PyObject *_wrap_wxDC_SetTextBackground(PyObject *self, PyObject *args) { } #define wxDC_SetTextForeground(_swigobj,_swigarg0) (_swigobj->SetTextForeground(_swigarg0)) -static PyObject *_wrap_wxDC_SetTextForeground(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_SetTextForeground(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; wxColour * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","colour", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxDC_SetTextForeground",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDC_SetTextForeground",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5549,15 +5699,16 @@ static PyObject *_wrap_wxDC_SetTextForeground(PyObject *self, PyObject *args) { } #define wxDC_SetUserScale(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetUserScale(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxDC_SetUserScale(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_SetUserScale(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; double _arg1; double _arg2; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x_scale","y_scale", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Odd:wxDC_SetUserScale",&_argo0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Odd:wxDC_SetUserScale",_kwnames,&_argo0,&_arg1,&_arg2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5577,16 +5728,17 @@ static PyObject *_wrap_wxDC_SetUserScale(PyObject *self, PyObject *args) { } #define wxDC_StartDoc(_swigobj,_swigarg0) (_swigobj->StartDoc(_swigarg0)) -static PyObject *_wrap_wxDC_StartDoc(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_StartDoc(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxDC * _arg0; wxString * _arg1; PyObject * _argo0 = 0; PyObject * _obj1 = 0; + char *_kwnames[] = { "self","message", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxDC_StartDoc",&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDC_StartDoc",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5616,13 +5768,14 @@ static PyObject *_wrap_wxDC_StartDoc(PyObject *self, PyObject *args) { } #define wxDC_StartPage(_swigobj) (_swigobj->StartPage()) -static PyObject *_wrap_wxDC_StartPage(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_StartPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxDC_StartPage",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_StartPage",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5642,7 +5795,7 @@ static PyObject *_wrap_wxDC_StartPage(PyObject *self, PyObject *args) { } #define wxDC_DrawBitmap(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->DrawBitmap(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_wxDC_DrawBitmap(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxDC_DrawBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxDC * _arg0; wxBitmap * _arg1; @@ -5651,9 +5804,10 @@ static PyObject *_wrap_wxDC_DrawBitmap(PyObject *self, PyObject *args) { int _arg4 = (int ) FALSE; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","bitmap","x","y","useMask", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OOll|i:wxDC_DrawBitmap",&_argo0,&_argo1,&_arg2,&_arg3,&_arg4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOll|i:wxDC_DrawBitmap",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5688,13 +5842,14 @@ static void *SwigwxMemoryDCTowxDC(void *ptr) { } #define new_wxMemoryDC() (new wxMemoryDC()) -static PyObject *_wrap_new_wxMemoryDC(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxMemoryDC(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxMemoryDC * _result; + char *_kwnames[] = { NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,":new_wxMemoryDC")) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxMemoryDC",_kwnames)) return NULL; { wxPy_BEGIN_ALLOW_THREADS; @@ -5712,15 +5867,16 @@ static PyObject *_wrap_new_wxMemoryDC(PyObject *self, PyObject *args) { } #define wxMemoryDC_SelectObject(_swigobj,_swigarg0) (_swigobj->SelectObject(_swigarg0)) -static PyObject *_wrap_wxMemoryDC_SelectObject(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxMemoryDC_SelectObject(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxMemoryDC * _arg0; wxBitmap * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","bitmap", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxMemoryDC_SelectObject",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMemoryDC_SelectObject",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5755,13 +5911,14 @@ static void *SwigwxScreenDCTowxDC(void *ptr) { } #define new_wxScreenDC() (new wxScreenDC()) -static PyObject *_wrap_new_wxScreenDC(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxScreenDC(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxScreenDC * _result; + char *_kwnames[] = { NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,":new_wxScreenDC")) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxScreenDC",_kwnames)) return NULL; { wxPy_BEGIN_ALLOW_THREADS; @@ -5779,16 +5936,17 @@ static PyObject *_wrap_new_wxScreenDC(PyObject *self, PyObject *args) { } #define wxScreenDC_StartDrawingOnTop(_swigobj,_swigarg0) (_swigobj->StartDrawingOnTop(_swigarg0)) -static PyObject *_wrap_wxScreenDC_StartDrawingOnTop(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxScreenDC_StartDrawingOnTop(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxScreenDC * _arg0; wxWindow * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","window", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxScreenDC_StartDrawingOnTop",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxScreenDC_StartDrawingOnTop",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5814,16 +5972,17 @@ static PyObject *_wrap_wxScreenDC_StartDrawingOnTop(PyObject *self, PyObject *ar } #define wxScreenDC_StartDrawingOnTopRect(_swigobj,_swigarg0) (_swigobj->StartDrawingOnTop(_swigarg0)) -static PyObject *_wrap_wxScreenDC_StartDrawingOnTopRect(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxScreenDC_StartDrawingOnTopRect(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxScreenDC * _arg0; wxRect * _arg1 = (wxRect *) NULL; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","rect", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O|O:wxScreenDC_StartDrawingOnTopRect",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxScreenDC_StartDrawingOnTopRect",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5849,14 +6008,15 @@ static PyObject *_wrap_wxScreenDC_StartDrawingOnTopRect(PyObject *self, PyObject } #define wxScreenDC_EndDrawingOnTop(_swigobj) (_swigobj->EndDrawingOnTop()) -static PyObject *_wrap_wxScreenDC_EndDrawingOnTop(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxScreenDC_EndDrawingOnTop(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxScreenDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxScreenDC_EndDrawingOnTop",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScreenDC_EndDrawingOnTop",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5883,15 +6043,16 @@ static void *SwigwxClientDCTowxDC(void *ptr) { } #define new_wxClientDC(_swigarg0) (new wxClientDC(_swigarg0)) -static PyObject *_wrap_new_wxClientDC(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxClientDC(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxClientDC * _result; wxWindow * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "win", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:new_wxClientDC",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxClientDC",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5924,15 +6085,16 @@ static void *SwigwxPaintDCTowxDC(void *ptr) { } #define new_wxPaintDC(_swigarg0) (new wxPaintDC(_swigarg0)) -static PyObject *_wrap_new_wxPaintDC(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxPaintDC(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPaintDC * _result; wxWindow * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "win", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:new_wxPaintDC",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxPaintDC",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5965,15 +6127,16 @@ static void *SwigwxWindowDCTowxDC(void *ptr) { } #define new_wxWindowDC(_swigarg0) (new wxWindowDC(_swigarg0)) -static PyObject *_wrap_new_wxWindowDC(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxWindowDC(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxWindowDC * _result; wxWindow * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "win", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:new_wxWindowDC",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxWindowDC",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6006,7 +6169,7 @@ static void *SwigwxPrinterDCTowxDC(void *ptr) { } #define new_wxPrinterDC(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxPrinterDC(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) -static PyObject *_wrap_new_wxPrinterDC(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxPrinterDC(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPrinterDC * _result; wxString * _arg0; @@ -6018,10 +6181,11 @@ static PyObject *_wrap_new_wxPrinterDC(PyObject *self, PyObject *args) { PyObject * _obj1 = 0; PyObject * _obj2 = 0; int tempbool3 = (int) TRUE; + char *_kwnames[] = { "driver","device","output","interactive","orientation", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"OOO|ii:new_wxPrinterDC",&_obj0,&_obj1,&_obj2,&tempbool3,&_arg4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|ii:new_wxPrinterDC",_kwnames,&_obj0,&_obj1,&_obj2,&tempbool3,&_arg4)) return NULL; { if (!PyString_Check(_obj0)) { @@ -6081,15 +6245,16 @@ static void *SwigwxMetaFileDCTowxDC(void *ptr) { } #define new_wxMetaFileDC(_swigarg0) (new wxMetaFileDC(_swigarg0)) -static PyObject *_wrap_new_wxMetaFileDC(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxMetaFileDC(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxMetaFileDC * _result; wxString * _arg0 = (wxString *) &wxPyEmptyStr; PyObject * _obj0 = 0; + char *_kwnames[] = { "filename", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"|O:new_wxMetaFileDC",&_obj0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|O:new_wxMetaFileDC",_kwnames,&_obj0)) return NULL; if (_obj0) { @@ -6119,15 +6284,16 @@ static PyObject *_wrap_new_wxMetaFileDC(PyObject *self, PyObject *args) { } #define wxMetaFileDC_Close(_swigobj) (_swigobj->Close()) -static PyObject *_wrap_wxMetaFileDC_Close(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxMetaFileDC_Close(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxMetaFile * _result; wxMetaFileDC * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"O:wxMetaFileDC_Close",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMetaFileDC_Close",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6152,7 +6318,7 @@ static PyObject *_wrap_wxMetaFileDC_Close(PyObject *self, PyObject *args) { } #define new_wxPalette(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxPalette(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_new_wxPalette(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxPalette(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPalette * _result; int _arg0; @@ -6162,10 +6328,11 @@ static PyObject *_wrap_new_wxPalette(PyObject *self, PyObject *args) { PyObject * _obj1 = 0; PyObject * _obj2 = 0; PyObject * _obj3 = 0; + char *_kwnames[] = { "LIST","LIST","LIST", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"OOO:new_wxPalette",&_obj1,&_obj2,&_obj3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:new_wxPalette",_kwnames,&_obj1,&_obj2,&_obj3)) return NULL; { _arg1 = byte_LIST_helper(_obj1); @@ -6219,13 +6386,14 @@ static PyObject *_wrap_new_wxPalette(PyObject *self, PyObject *args) { } #define delete_wxPalette(_swigobj) (delete _swigobj) -static PyObject *_wrap_delete_wxPalette(PyObject *self, PyObject *args) { +static PyObject *_wrap_delete_wxPalette(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPalette * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:delete_wxPalette",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPalette",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6245,7 +6413,7 @@ static PyObject *_wrap_delete_wxPalette(PyObject *self, PyObject *args) { } #define wxPalette_GetPixel(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->GetPixel(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxPalette_GetPixel(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPalette_GetPixel(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxPalette * _arg0; @@ -6253,9 +6421,10 @@ static PyObject *_wrap_wxPalette_GetPixel(PyObject *self, PyObject *args) { byte _arg2; byte _arg3; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","red","green","blue", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Obbb:wxPalette_GetPixel",&_argo0,&_arg1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Obbb:wxPalette_GetPixel",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6274,7 +6443,7 @@ static PyObject *_wrap_wxPalette_GetPixel(PyObject *self, PyObject *args) { } #define wxPalette_GetRGB(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->GetRGB(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_wxPalette_GetRGB(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPalette_GetRGB(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxPalette * _arg0; @@ -6286,9 +6455,10 @@ static PyObject *_wrap_wxPalette_GetRGB(PyObject *self, PyObject *args) { PyObject * _argo2 = 0; PyObject * _argo3 = 0; PyObject * _argo4 = 0; + char *_kwnames[] = { "self","pixel","OUTPUT","OUTPUT","OUTPUT", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OiOOO:wxPalette_GetRGB",&_argo0,&_arg1,&_argo2,&_argo3,&_argo4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOOO:wxPalette_GetRGB",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_argo4)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6328,14 +6498,15 @@ static PyObject *_wrap_wxPalette_GetRGB(PyObject *self, PyObject *args) { } #define wxPalette_Ok(_swigobj) (_swigobj->Ok()) -static PyObject *_wrap_wxPalette_Ok(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPalette_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxPalette * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxPalette_Ok",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPalette_Ok",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6354,7 +6525,7 @@ static PyObject *_wrap_wxPalette_Ok(PyObject *self, PyObject *args) { } #define new_wxImageList(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxImageList(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_new_wxImageList(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_wxImageList(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxImageList * _result; int _arg0; @@ -6362,10 +6533,11 @@ static PyObject *_wrap_new_wxImageList(PyObject *self, PyObject *args) { bool _arg2 = (bool ) TRUE; int _arg3 = (int ) 1; int tempbool2 = (int) TRUE; + char *_kwnames[] = { "width","height","mask","initialCount", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"ii|ii:new_wxImageList",&_arg0,&_arg1,&tempbool2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii|ii:new_wxImageList",_kwnames,&_arg0,&_arg1,&tempbool2,&_arg3)) return NULL; _arg2 = (bool ) tempbool2; { @@ -6384,13 +6556,14 @@ static PyObject *_wrap_new_wxImageList(PyObject *self, PyObject *args) { } #define delete_wxImageList(_swigobj) (delete _swigobj) -static PyObject *_wrap_delete_wxImageList(PyObject *self, PyObject *args) { +static PyObject *_wrap_delete_wxImageList(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxImageList * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:delete_wxImageList",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxImageList",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6410,7 +6583,7 @@ static PyObject *_wrap_delete_wxImageList(PyObject *self, PyObject *args) { } #define wxImageList_Add(_swigobj,_swigarg0,_swigarg1) (_swigobj->Add(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxImageList_Add(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxImageList_Add(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxImageList * _arg0; @@ -6419,9 +6592,10 @@ static PyObject *_wrap_wxImageList_Add(PyObject *self, PyObject *args) { PyObject * _argo0 = 0; PyObject * _argo1 = 0; PyObject * _argo2 = 0; + char *_kwnames[] = { "self","bitmap","mask", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO|O:wxImageList_Add",&_argo0,&_argo1,&_argo2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:wxImageList_Add",_kwnames,&_argo0,&_argo1,&_argo2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6454,7 +6628,7 @@ static PyObject *_wrap_wxImageList_Add(PyObject *self, PyObject *args) { } #define wxImageList_AddWithColourMask(_swigobj,_swigarg0,_swigarg1) (_swigobj->Add(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxImageList_AddWithColourMask(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxImageList_AddWithColourMask(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxImageList * _arg0; @@ -6463,9 +6637,10 @@ static PyObject *_wrap_wxImageList_AddWithColourMask(PyObject *self, PyObject *a PyObject * _argo0 = 0; PyObject * _argo1 = 0; PyObject * _argo2 = 0; + char *_kwnames[] = { "self","bitmap","maskColour", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OOO:wxImageList_AddWithColourMask",&_argo0,&_argo1,&_argo2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxImageList_AddWithColourMask",_kwnames,&_argo0,&_argo1,&_argo2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6498,16 +6673,17 @@ static PyObject *_wrap_wxImageList_AddWithColourMask(PyObject *self, PyObject *a } #define wxImageList_AddIcon(_swigobj,_swigarg0) (_swigobj->Add(_swigarg0)) -static PyObject *_wrap_wxImageList_AddIcon(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxImageList_AddIcon(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxImageList * _arg0; wxIcon * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; + char *_kwnames[] = { "self","icon", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OO:wxImageList_AddIcon",&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxImageList_AddIcon",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6533,7 +6709,7 @@ static PyObject *_wrap_wxImageList_AddIcon(PyObject *self, PyObject *args) { } #define wxImageList_Replace(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->Replace(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxImageList_Replace(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxImageList_Replace(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxImageList * _arg0; @@ -6543,9 +6719,10 @@ static PyObject *_wrap_wxImageList_Replace(PyObject *self, PyObject *args) { PyObject * _argo0 = 0; PyObject * _argo2 = 0; PyObject * _argo3 = 0; + char *_kwnames[] = { "self","index","bitmap","mask", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OiO|O:wxImageList_Replace",&_argo0,&_arg1,&_argo2,&_argo3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|O:wxImageList_Replace",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6578,7 +6755,7 @@ static PyObject *_wrap_wxImageList_Replace(PyObject *self, PyObject *args) { } #define wxImageList_ReplaceIcon(_swigobj,_swigarg0,_swigarg1) (_swigobj->Replace(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxImageList_ReplaceIcon(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxImageList_ReplaceIcon(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxImageList * _arg0; @@ -6586,9 +6763,10 @@ static PyObject *_wrap_wxImageList_ReplaceIcon(PyObject *self, PyObject *args) { wxIcon * _arg2; PyObject * _argo0 = 0; PyObject * _argo2 = 0; + char *_kwnames[] = { "self","index","icon", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OiO:wxImageList_ReplaceIcon",&_argo0,&_arg1,&_argo2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxImageList_ReplaceIcon",_kwnames,&_argo0,&_arg1,&_argo2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6614,7 +6792,7 @@ static PyObject *_wrap_wxImageList_ReplaceIcon(PyObject *self, PyObject *args) { } #define wxImageList_Draw(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->Draw(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) -static PyObject *_wrap_wxImageList_Draw(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxImageList_Draw(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxImageList * _arg0; @@ -6627,9 +6805,10 @@ static PyObject *_wrap_wxImageList_Draw(PyObject *self, PyObject *args) { PyObject * _argo0 = 0; PyObject * _argo2 = 0; int tempbool6 = (int) FALSE; + char *_kwnames[] = { "self","index","dc","x","x","flags","solidBackground", NULL }; self = self; - if(!PyArg_ParseTuple(args,"OiOii|ii:wxImageList_Draw",&_argo0,&_arg1,&_argo2,&_arg3,&_arg4,&_arg5,&tempbool6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOii|ii:wxImageList_Draw",_kwnames,&_argo0,&_arg1,&_argo2,&_arg3,&_arg4,&_arg5,&tempbool6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6656,14 +6835,15 @@ static PyObject *_wrap_wxImageList_Draw(PyObject *self, PyObject *args) { } #define wxImageList_GetImageCount(_swigobj) (_swigobj->GetImageCount()) -static PyObject *_wrap_wxImageList_GetImageCount(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxImageList_GetImageCount(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; wxImageList * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxImageList_GetImageCount",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImageList_GetImageCount",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6682,15 +6862,16 @@ static PyObject *_wrap_wxImageList_GetImageCount(PyObject *self, PyObject *args) } #define wxImageList_Remove(_swigobj,_swigarg0) (_swigobj->Remove(_swigarg0)) -static PyObject *_wrap_wxImageList_Remove(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxImageList_Remove(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxImageList * _arg0; int _arg1; PyObject * _argo0 = 0; + char *_kwnames[] = { "self","index", NULL }; self = self; - if(!PyArg_ParseTuple(args,"Oi:wxImageList_Remove",&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxImageList_Remove",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6709,14 +6890,15 @@ static PyObject *_wrap_wxImageList_Remove(PyObject *self, PyObject *args) { } #define wxImageList_RemoveAll(_swigobj) (_swigobj->RemoveAll()) -static PyObject *_wrap_wxImageList_RemoveAll(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxImageList_RemoveAll(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxImageList * _arg0; PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTuple(args,"O:wxImageList_RemoveAll",&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImageList_RemoveAll",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6735,188 +6917,188 @@ static PyObject *_wrap_wxImageList_RemoveAll(PyObject *self, PyObject *args) { } static PyMethodDef gdicMethods[] = { - { "wxImageList_RemoveAll", _wrap_wxImageList_RemoveAll, METH_VARARGS }, - { "wxImageList_Remove", _wrap_wxImageList_Remove, METH_VARARGS }, - { "wxImageList_GetImageCount", _wrap_wxImageList_GetImageCount, METH_VARARGS }, - { "wxImageList_Draw", _wrap_wxImageList_Draw, METH_VARARGS }, - { "wxImageList_ReplaceIcon", _wrap_wxImageList_ReplaceIcon, METH_VARARGS }, - { "wxImageList_Replace", _wrap_wxImageList_Replace, METH_VARARGS }, - { "wxImageList_AddIcon", _wrap_wxImageList_AddIcon, METH_VARARGS }, - { "wxImageList_AddWithColourMask", _wrap_wxImageList_AddWithColourMask, METH_VARARGS }, - { "wxImageList_Add", _wrap_wxImageList_Add, METH_VARARGS }, - { "delete_wxImageList", _wrap_delete_wxImageList, METH_VARARGS }, - { "new_wxImageList", _wrap_new_wxImageList, METH_VARARGS }, - { "wxPalette_Ok", _wrap_wxPalette_Ok, METH_VARARGS }, - { "wxPalette_GetRGB", _wrap_wxPalette_GetRGB, METH_VARARGS }, - { "wxPalette_GetPixel", _wrap_wxPalette_GetPixel, METH_VARARGS }, - { "delete_wxPalette", _wrap_delete_wxPalette, METH_VARARGS }, - { "new_wxPalette", _wrap_new_wxPalette, METH_VARARGS }, - { "wxMetaFileDC_Close", _wrap_wxMetaFileDC_Close, METH_VARARGS }, - { "new_wxMetaFileDC", _wrap_new_wxMetaFileDC, METH_VARARGS }, - { "new_wxPrinterDC", _wrap_new_wxPrinterDC, METH_VARARGS }, - { "new_wxWindowDC", _wrap_new_wxWindowDC, METH_VARARGS }, - { "new_wxPaintDC", _wrap_new_wxPaintDC, METH_VARARGS }, - { "new_wxClientDC", _wrap_new_wxClientDC, METH_VARARGS }, - { "wxScreenDC_EndDrawingOnTop", _wrap_wxScreenDC_EndDrawingOnTop, METH_VARARGS }, - { "wxScreenDC_StartDrawingOnTopRect", _wrap_wxScreenDC_StartDrawingOnTopRect, METH_VARARGS }, - { "wxScreenDC_StartDrawingOnTop", _wrap_wxScreenDC_StartDrawingOnTop, METH_VARARGS }, - { "new_wxScreenDC", _wrap_new_wxScreenDC, METH_VARARGS }, - { "wxMemoryDC_SelectObject", _wrap_wxMemoryDC_SelectObject, METH_VARARGS }, - { "new_wxMemoryDC", _wrap_new_wxMemoryDC, METH_VARARGS }, - { "wxDC_DrawBitmap", _wrap_wxDC_DrawBitmap, METH_VARARGS }, - { "wxDC_StartPage", _wrap_wxDC_StartPage, METH_VARARGS }, - { "wxDC_StartDoc", _wrap_wxDC_StartDoc, METH_VARARGS }, - { "wxDC_SetUserScale", _wrap_wxDC_SetUserScale, METH_VARARGS }, - { "wxDC_SetTextForeground", _wrap_wxDC_SetTextForeground, METH_VARARGS }, - { "wxDC_SetTextBackground", _wrap_wxDC_SetTextBackground, METH_VARARGS }, - { "wxDC_SetPen", _wrap_wxDC_SetPen, METH_VARARGS }, - { "wxDC_SetOptimization", _wrap_wxDC_SetOptimization, METH_VARARGS }, - { "wxDC_SetMapMode", _wrap_wxDC_SetMapMode, METH_VARARGS }, - { "wxDC_SetLogicalFunction", _wrap_wxDC_SetLogicalFunction, METH_VARARGS }, - { "wxDC_SetFont", _wrap_wxDC_SetFont, METH_VARARGS }, - { "wxDC_SetBrush", _wrap_wxDC_SetBrush, METH_VARARGS }, - { "wxDC_SetPalette", _wrap_wxDC_SetPalette, METH_VARARGS }, - { "wxDC_SetClippingRegion", _wrap_wxDC_SetClippingRegion, METH_VARARGS }, - { "wxDC_SetBackgroundMode", _wrap_wxDC_SetBackgroundMode, METH_VARARGS }, - { "wxDC_SetBackground", _wrap_wxDC_SetBackground, METH_VARARGS }, - { "wxDC_SetDeviceOrigin", _wrap_wxDC_SetDeviceOrigin, METH_VARARGS }, - { "wxDC_Ok", _wrap_wxDC_Ok, METH_VARARGS }, - { "wxDC_MinY", _wrap_wxDC_MinY, METH_VARARGS }, - { "wxDC_MinX", _wrap_wxDC_MinX, METH_VARARGS }, - { "wxDC_MaxY", _wrap_wxDC_MaxY, METH_VARARGS }, - { "wxDC_MaxX", _wrap_wxDC_MaxX, METH_VARARGS }, - { "wxDC_LogicalToDeviceYRel", _wrap_wxDC_LogicalToDeviceYRel, METH_VARARGS }, - { "wxDC_LogicalToDeviceY", _wrap_wxDC_LogicalToDeviceY, METH_VARARGS }, - { "wxDC_LogicalToDeviceXRel", _wrap_wxDC_LogicalToDeviceXRel, METH_VARARGS }, - { "wxDC_LogicalToDeviceX", _wrap_wxDC_LogicalToDeviceX, METH_VARARGS }, - { "wxDC_GetTextForeground", _wrap_wxDC_GetTextForeground, METH_VARARGS }, - { "wxDC_GetFullTextExtent", _wrap_wxDC_GetFullTextExtent, METH_VARARGS }, - { "wxDC_GetTextExtent", _wrap_wxDC_GetTextExtent, METH_VARARGS }, - { "wxDC_GetTextBackground", _wrap_wxDC_GetTextBackground, METH_VARARGS }, - { "wxDC_GetSize", _wrap_wxDC_GetSize, METH_VARARGS }, - { "wxDC_GetSizeTuple", _wrap_wxDC_GetSizeTuple, METH_VARARGS }, - { "wxDC_GetPixel", _wrap_wxDC_GetPixel, METH_VARARGS }, - { "wxDC_GetPen", _wrap_wxDC_GetPen, METH_VARARGS }, - { "wxDC_GetOptimization", _wrap_wxDC_GetOptimization, METH_VARARGS }, - { "wxDC_GetMapMode", _wrap_wxDC_GetMapMode, METH_VARARGS }, - { "wxDC_GetLogicalFunction", _wrap_wxDC_GetLogicalFunction, METH_VARARGS }, - { "wxDC_GetFont", _wrap_wxDC_GetFont, METH_VARARGS }, - { "wxDC_GetClippingBox", _wrap_wxDC_GetClippingBox, METH_VARARGS }, - { "wxDC_GetCharWidth", _wrap_wxDC_GetCharWidth, METH_VARARGS }, - { "wxDC_GetCharHeight", _wrap_wxDC_GetCharHeight, METH_VARARGS }, - { "wxDC_GetBrush", _wrap_wxDC_GetBrush, METH_VARARGS }, - { "wxDC_GetBackground", _wrap_wxDC_GetBackground, METH_VARARGS }, - { "wxDC_FloodFill", _wrap_wxDC_FloodFill, METH_VARARGS }, - { "wxDC_EndPage", _wrap_wxDC_EndPage, METH_VARARGS }, - { "wxDC_EndDrawing", _wrap_wxDC_EndDrawing, METH_VARARGS }, - { "wxDC_EndDoc", _wrap_wxDC_EndDoc, METH_VARARGS }, - { "wxDC_DrawText", _wrap_wxDC_DrawText, METH_VARARGS }, - { "wxDC_DrawSpline", _wrap_wxDC_DrawSpline, METH_VARARGS }, - { "wxDC_DrawRoundedRectangle", _wrap_wxDC_DrawRoundedRectangle, METH_VARARGS }, - { "wxDC_DrawRectangle", _wrap_wxDC_DrawRectangle, METH_VARARGS }, - { "wxDC_DrawPoint", _wrap_wxDC_DrawPoint, METH_VARARGS }, - { "wxDC_DrawPolygon", _wrap_wxDC_DrawPolygon, METH_VARARGS }, - { "wxDC_DrawLines", _wrap_wxDC_DrawLines, METH_VARARGS }, - { "wxDC_DrawLine", _wrap_wxDC_DrawLine, METH_VARARGS }, - { "wxDC_DrawIcon", _wrap_wxDC_DrawIcon, METH_VARARGS }, - { "wxDC_DrawEllipticArc", _wrap_wxDC_DrawEllipticArc, METH_VARARGS }, - { "wxDC_DrawEllipse", _wrap_wxDC_DrawEllipse, METH_VARARGS }, - { "wxDC_DrawCircle", _wrap_wxDC_DrawCircle, METH_VARARGS }, - { "wxDC_DrawArc", _wrap_wxDC_DrawArc, METH_VARARGS }, - { "wxDC_DeviceToLogicalYRel", _wrap_wxDC_DeviceToLogicalYRel, METH_VARARGS }, - { "wxDC_DeviceToLogicalY", _wrap_wxDC_DeviceToLogicalY, METH_VARARGS }, - { "wxDC_DeviceToLogicalXRel", _wrap_wxDC_DeviceToLogicalXRel, METH_VARARGS }, - { "wxDC_DeviceToLogicalX", _wrap_wxDC_DeviceToLogicalX, METH_VARARGS }, - { "wxDC_DestroyClippingRegion", _wrap_wxDC_DestroyClippingRegion, METH_VARARGS }, - { "wxDC_CrossHair", _wrap_wxDC_CrossHair, METH_VARARGS }, - { "wxDC_Clear", _wrap_wxDC_Clear, METH_VARARGS }, - { "wxDC_Blit", _wrap_wxDC_Blit, METH_VARARGS }, - { "wxDC_BeginDrawing", _wrap_wxDC_BeginDrawing, METH_VARARGS }, - { "delete_wxDC", _wrap_delete_wxDC, METH_VARARGS }, - { "wxBrush_SetStyle", _wrap_wxBrush_SetStyle, METH_VARARGS }, - { "wxBrush_SetStipple", _wrap_wxBrush_SetStipple, METH_VARARGS }, - { "wxBrush_SetColour", _wrap_wxBrush_SetColour, METH_VARARGS }, - { "wxBrush_Ok", _wrap_wxBrush_Ok, METH_VARARGS }, - { "wxBrush_GetStyle", _wrap_wxBrush_GetStyle, METH_VARARGS }, - { "wxBrush_GetStipple", _wrap_wxBrush_GetStipple, METH_VARARGS }, - { "wxBrush_GetColour", _wrap_wxBrush_GetColour, METH_VARARGS }, - { "new_wxBrush", _wrap_new_wxBrush, METH_VARARGS }, - { "wxPen_SetStipple", _wrap_wxPen_SetStipple, METH_VARARGS }, - { "wxPen_SetDashes", _wrap_wxPen_SetDashes, METH_VARARGS }, - { "wxPen_GetStipple", _wrap_wxPen_GetStipple, METH_VARARGS }, - { "wxPen_GetDashes", _wrap_wxPen_GetDashes, METH_VARARGS }, - { "wxPen_SetWidth", _wrap_wxPen_SetWidth, METH_VARARGS }, - { "wxPen_SetStyle", _wrap_wxPen_SetStyle, METH_VARARGS }, - { "wxPen_SetJoin", _wrap_wxPen_SetJoin, METH_VARARGS }, - { "wxPen_SetColour", _wrap_wxPen_SetColour, METH_VARARGS }, - { "wxPen_SetCap", _wrap_wxPen_SetCap, METH_VARARGS }, - { "wxPen_Ok", _wrap_wxPen_Ok, METH_VARARGS }, - { "wxPen_GetWidth", _wrap_wxPen_GetWidth, METH_VARARGS }, - { "wxPen_GetStyle", _wrap_wxPen_GetStyle, METH_VARARGS }, - { "wxPen_GetJoin", _wrap_wxPen_GetJoin, METH_VARARGS }, - { "wxPen_GetColour", _wrap_wxPen_GetColour, METH_VARARGS }, - { "wxPen_GetCap", _wrap_wxPen_GetCap, METH_VARARGS }, - { "new_wxPen", _wrap_new_wxPen, METH_VARARGS }, - { "wxColour_Get", _wrap_wxColour_Get, METH_VARARGS }, - { "wxColour_Set", _wrap_wxColour_Set, METH_VARARGS }, - { "wxColour_Ok", _wrap_wxColour_Ok, METH_VARARGS }, - { "wxColour_Blue", _wrap_wxColour_Blue, METH_VARARGS }, - { "wxColour_Green", _wrap_wxColour_Green, METH_VARARGS }, - { "wxColour_Red", _wrap_wxColour_Red, METH_VARARGS }, - { "delete_wxColour", _wrap_delete_wxColour, METH_VARARGS }, - { "new_wxColour", _wrap_new_wxColour, METH_VARARGS }, - { "wxFont_SetWeight", _wrap_wxFont_SetWeight, METH_VARARGS }, - { "wxFont_SetUnderlined", _wrap_wxFont_SetUnderlined, METH_VARARGS }, - { "wxFont_SetStyle", _wrap_wxFont_SetStyle, METH_VARARGS }, - { "wxFont_SetPointSize", _wrap_wxFont_SetPointSize, METH_VARARGS }, - { "wxFont_SetFamily", _wrap_wxFont_SetFamily, METH_VARARGS }, - { "wxFont_SetFaceName", _wrap_wxFont_SetFaceName, METH_VARARGS }, - { "wxFont_GetWeight", _wrap_wxFont_GetWeight, METH_VARARGS }, - { "wxFont_GetUnderlined", _wrap_wxFont_GetUnderlined, METH_VARARGS }, - { "wxFont_GetStyle", _wrap_wxFont_GetStyle, METH_VARARGS }, - { "wxFont_GetPointSize", _wrap_wxFont_GetPointSize, METH_VARARGS }, - { "wxFont_GetFontId", _wrap_wxFont_GetFontId, METH_VARARGS }, - { "wxFont_GetFamily", _wrap_wxFont_GetFamily, METH_VARARGS }, - { "wxFont_GetFaceName", _wrap_wxFont_GetFaceName, METH_VARARGS }, - { "new_wxFont", _wrap_new_wxFont, METH_VARARGS }, - { "wxCursor_Ok", _wrap_wxCursor_Ok, METH_VARARGS }, - { "delete_wxCursor", _wrap_delete_wxCursor, METH_VARARGS }, - { "new_wxCursor", _wrap_new_wxCursor, METH_VARARGS }, - { "wxIcon_SetWidth", _wrap_wxIcon_SetWidth, METH_VARARGS }, - { "wxIcon_SetHeight", _wrap_wxIcon_SetHeight, METH_VARARGS }, - { "wxIcon_SetDepth", _wrap_wxIcon_SetDepth, METH_VARARGS }, - { "wxIcon_Ok", _wrap_wxIcon_Ok, METH_VARARGS }, - { "wxIcon_LoadFile", _wrap_wxIcon_LoadFile, METH_VARARGS }, - { "wxIcon_GetWidth", _wrap_wxIcon_GetWidth, METH_VARARGS }, - { "wxIcon_GetHeight", _wrap_wxIcon_GetHeight, METH_VARARGS }, - { "wxIcon_GetDepth", _wrap_wxIcon_GetDepth, METH_VARARGS }, - { "delete_wxIcon", _wrap_delete_wxIcon, METH_VARARGS }, - { "new_wxIcon", _wrap_new_wxIcon, METH_VARARGS }, - { "delete_wxMask", _wrap_delete_wxMask, METH_VARARGS }, - { "new_wxMask", _wrap_new_wxMask, METH_VARARGS }, - { "wxBitmap_SetWidth", _wrap_wxBitmap_SetWidth, METH_VARARGS }, - { "wxBitmap_SetPalette", _wrap_wxBitmap_SetPalette, METH_VARARGS }, - { "wxBitmap_SetMask", _wrap_wxBitmap_SetMask, METH_VARARGS }, - { "wxBitmap_SetHeight", _wrap_wxBitmap_SetHeight, METH_VARARGS }, - { "wxBitmap_SetDepth", _wrap_wxBitmap_SetDepth, METH_VARARGS }, - { "wxBitmap_SaveFile", _wrap_wxBitmap_SaveFile, METH_VARARGS }, - { "wxBitmap_Ok", _wrap_wxBitmap_Ok, METH_VARARGS }, - { "wxBitmap_LoadFile", _wrap_wxBitmap_LoadFile, METH_VARARGS }, - { "wxBitmap_GetWidth", _wrap_wxBitmap_GetWidth, METH_VARARGS }, - { "wxBitmap_GetMask", _wrap_wxBitmap_GetMask, METH_VARARGS }, - { "wxBitmap_GetPalette", _wrap_wxBitmap_GetPalette, METH_VARARGS }, - { "wxBitmap_GetHeight", _wrap_wxBitmap_GetHeight, METH_VARARGS }, - { "wxBitmap_GetDepth", _wrap_wxBitmap_GetDepth, METH_VARARGS }, - { "wxBitmap_Create", _wrap_wxBitmap_Create, METH_VARARGS }, - { "delete_wxBitmap", _wrap_delete_wxBitmap, METH_VARARGS }, - { "new_wxBitmap", _wrap_new_wxBitmap, METH_VARARGS }, - { "wxMemoryDCFromDC", _wrap_wxMemoryDCFromDC, METH_VARARGS }, - { "wxNamedColour", _wrap_wxNamedColour, METH_VARARGS }, - { "wxStockCursor", _wrap_wxStockCursor, METH_VARARGS }, - { "wxMaskColour", _wrap_wxMaskColour, METH_VARARGS }, - { "wxBitmapFromData", _wrap_wxBitmapFromData, METH_VARARGS }, - { "wxNoRefBitmap", _wrap_wxNoRefBitmap, METH_VARARGS }, - { "wxEmptyBitmap", _wrap_wxEmptyBitmap, METH_VARARGS }, + { "wxImageList_RemoveAll", (PyCFunction) _wrap_wxImageList_RemoveAll, METH_VARARGS | METH_KEYWORDS }, + { "wxImageList_Remove", (PyCFunction) _wrap_wxImageList_Remove, METH_VARARGS | METH_KEYWORDS }, + { "wxImageList_GetImageCount", (PyCFunction) _wrap_wxImageList_GetImageCount, METH_VARARGS | METH_KEYWORDS }, + { "wxImageList_Draw", (PyCFunction) _wrap_wxImageList_Draw, METH_VARARGS | METH_KEYWORDS }, + { "wxImageList_ReplaceIcon", (PyCFunction) _wrap_wxImageList_ReplaceIcon, METH_VARARGS | METH_KEYWORDS }, + { "wxImageList_Replace", (PyCFunction) _wrap_wxImageList_Replace, METH_VARARGS | METH_KEYWORDS }, + { "wxImageList_AddIcon", (PyCFunction) _wrap_wxImageList_AddIcon, METH_VARARGS | METH_KEYWORDS }, + { "wxImageList_AddWithColourMask", (PyCFunction) _wrap_wxImageList_AddWithColourMask, METH_VARARGS | METH_KEYWORDS }, + { "wxImageList_Add", (PyCFunction) _wrap_wxImageList_Add, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxImageList", (PyCFunction) _wrap_delete_wxImageList, METH_VARARGS | METH_KEYWORDS }, + { "new_wxImageList", (PyCFunction) _wrap_new_wxImageList, METH_VARARGS | METH_KEYWORDS }, + { "wxPalette_Ok", (PyCFunction) _wrap_wxPalette_Ok, METH_VARARGS | METH_KEYWORDS }, + { "wxPalette_GetRGB", (PyCFunction) _wrap_wxPalette_GetRGB, METH_VARARGS | METH_KEYWORDS }, + { "wxPalette_GetPixel", (PyCFunction) _wrap_wxPalette_GetPixel, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxPalette", (PyCFunction) _wrap_delete_wxPalette, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPalette", (PyCFunction) _wrap_new_wxPalette, METH_VARARGS | METH_KEYWORDS }, + { "wxMetaFileDC_Close", (PyCFunction) _wrap_wxMetaFileDC_Close, METH_VARARGS | METH_KEYWORDS }, + { "new_wxMetaFileDC", (PyCFunction) _wrap_new_wxMetaFileDC, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPrinterDC", (PyCFunction) _wrap_new_wxPrinterDC, METH_VARARGS | METH_KEYWORDS }, + { "new_wxWindowDC", (PyCFunction) _wrap_new_wxWindowDC, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPaintDC", (PyCFunction) _wrap_new_wxPaintDC, METH_VARARGS | METH_KEYWORDS }, + { "new_wxClientDC", (PyCFunction) _wrap_new_wxClientDC, METH_VARARGS | METH_KEYWORDS }, + { "wxScreenDC_EndDrawingOnTop", (PyCFunction) _wrap_wxScreenDC_EndDrawingOnTop, METH_VARARGS | METH_KEYWORDS }, + { "wxScreenDC_StartDrawingOnTopRect", (PyCFunction) _wrap_wxScreenDC_StartDrawingOnTopRect, METH_VARARGS | METH_KEYWORDS }, + { "wxScreenDC_StartDrawingOnTop", (PyCFunction) _wrap_wxScreenDC_StartDrawingOnTop, METH_VARARGS | METH_KEYWORDS }, + { "new_wxScreenDC", (PyCFunction) _wrap_new_wxScreenDC, METH_VARARGS | METH_KEYWORDS }, + { "wxMemoryDC_SelectObject", (PyCFunction) _wrap_wxMemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS }, + { "new_wxMemoryDC", (PyCFunction) _wrap_new_wxMemoryDC, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DrawBitmap", (PyCFunction) _wrap_wxDC_DrawBitmap, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_StartPage", (PyCFunction) _wrap_wxDC_StartPage, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_StartDoc", (PyCFunction) _wrap_wxDC_StartDoc, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_SetUserScale", (PyCFunction) _wrap_wxDC_SetUserScale, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_SetTextForeground", (PyCFunction) _wrap_wxDC_SetTextForeground, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_SetTextBackground", (PyCFunction) _wrap_wxDC_SetTextBackground, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_SetPen", (PyCFunction) _wrap_wxDC_SetPen, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_SetOptimization", (PyCFunction) _wrap_wxDC_SetOptimization, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_SetMapMode", (PyCFunction) _wrap_wxDC_SetMapMode, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_SetLogicalFunction", (PyCFunction) _wrap_wxDC_SetLogicalFunction, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_SetFont", (PyCFunction) _wrap_wxDC_SetFont, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_SetBrush", (PyCFunction) _wrap_wxDC_SetBrush, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_SetPalette", (PyCFunction) _wrap_wxDC_SetPalette, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_SetClippingRegion", (PyCFunction) _wrap_wxDC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_SetBackgroundMode", (PyCFunction) _wrap_wxDC_SetBackgroundMode, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_SetBackground", (PyCFunction) _wrap_wxDC_SetBackground, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_SetDeviceOrigin", (PyCFunction) _wrap_wxDC_SetDeviceOrigin, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_Ok", (PyCFunction) _wrap_wxDC_Ok, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_MinY", (PyCFunction) _wrap_wxDC_MinY, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_MinX", (PyCFunction) _wrap_wxDC_MinX, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_MaxY", (PyCFunction) _wrap_wxDC_MaxY, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_MaxX", (PyCFunction) _wrap_wxDC_MaxX, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_LogicalToDeviceYRel", (PyCFunction) _wrap_wxDC_LogicalToDeviceYRel, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_LogicalToDeviceY", (PyCFunction) _wrap_wxDC_LogicalToDeviceY, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_LogicalToDeviceXRel", (PyCFunction) _wrap_wxDC_LogicalToDeviceXRel, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_LogicalToDeviceX", (PyCFunction) _wrap_wxDC_LogicalToDeviceX, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetTextForeground", (PyCFunction) _wrap_wxDC_GetTextForeground, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetFullTextExtent", (PyCFunction) _wrap_wxDC_GetFullTextExtent, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetTextExtent", (PyCFunction) _wrap_wxDC_GetTextExtent, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetTextBackground", (PyCFunction) _wrap_wxDC_GetTextBackground, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetSize", (PyCFunction) _wrap_wxDC_GetSize, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetSizeTuple", (PyCFunction) _wrap_wxDC_GetSizeTuple, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetPixel", (PyCFunction) _wrap_wxDC_GetPixel, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetPen", (PyCFunction) _wrap_wxDC_GetPen, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetOptimization", (PyCFunction) _wrap_wxDC_GetOptimization, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetMapMode", (PyCFunction) _wrap_wxDC_GetMapMode, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetLogicalFunction", (PyCFunction) _wrap_wxDC_GetLogicalFunction, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetFont", (PyCFunction) _wrap_wxDC_GetFont, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetClippingBox", (PyCFunction) _wrap_wxDC_GetClippingBox, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetCharWidth", (PyCFunction) _wrap_wxDC_GetCharWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetCharHeight", (PyCFunction) _wrap_wxDC_GetCharHeight, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetBrush", (PyCFunction) _wrap_wxDC_GetBrush, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetBackground", (PyCFunction) _wrap_wxDC_GetBackground, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_FloodFill", (PyCFunction) _wrap_wxDC_FloodFill, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_EndPage", (PyCFunction) _wrap_wxDC_EndPage, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_EndDrawing", (PyCFunction) _wrap_wxDC_EndDrawing, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_EndDoc", (PyCFunction) _wrap_wxDC_EndDoc, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DrawText", (PyCFunction) _wrap_wxDC_DrawText, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DrawSpline", (PyCFunction) _wrap_wxDC_DrawSpline, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DrawRoundedRectangle", (PyCFunction) _wrap_wxDC_DrawRoundedRectangle, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DrawRectangle", (PyCFunction) _wrap_wxDC_DrawRectangle, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DrawPoint", (PyCFunction) _wrap_wxDC_DrawPoint, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DrawPolygon", (PyCFunction) _wrap_wxDC_DrawPolygon, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DrawLines", (PyCFunction) _wrap_wxDC_DrawLines, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DrawLine", (PyCFunction) _wrap_wxDC_DrawLine, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DrawIcon", (PyCFunction) _wrap_wxDC_DrawIcon, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DrawEllipticArc", (PyCFunction) _wrap_wxDC_DrawEllipticArc, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DrawEllipse", (PyCFunction) _wrap_wxDC_DrawEllipse, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DrawCircle", (PyCFunction) _wrap_wxDC_DrawCircle, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DrawArc", (PyCFunction) _wrap_wxDC_DrawArc, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DeviceToLogicalYRel", (PyCFunction) _wrap_wxDC_DeviceToLogicalYRel, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DeviceToLogicalY", (PyCFunction) _wrap_wxDC_DeviceToLogicalY, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DeviceToLogicalXRel", (PyCFunction) _wrap_wxDC_DeviceToLogicalXRel, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DeviceToLogicalX", (PyCFunction) _wrap_wxDC_DeviceToLogicalX, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_DestroyClippingRegion", (PyCFunction) _wrap_wxDC_DestroyClippingRegion, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_CrossHair", (PyCFunction) _wrap_wxDC_CrossHair, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_Clear", (PyCFunction) _wrap_wxDC_Clear, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_Blit", (PyCFunction) _wrap_wxDC_Blit, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_BeginDrawing", (PyCFunction) _wrap_wxDC_BeginDrawing, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxDC", (PyCFunction) _wrap_delete_wxDC, METH_VARARGS | METH_KEYWORDS }, + { "wxBrush_SetStyle", (PyCFunction) _wrap_wxBrush_SetStyle, METH_VARARGS | METH_KEYWORDS }, + { "wxBrush_SetStipple", (PyCFunction) _wrap_wxBrush_SetStipple, METH_VARARGS | METH_KEYWORDS }, + { "wxBrush_SetColour", (PyCFunction) _wrap_wxBrush_SetColour, METH_VARARGS | METH_KEYWORDS }, + { "wxBrush_Ok", (PyCFunction) _wrap_wxBrush_Ok, METH_VARARGS | METH_KEYWORDS }, + { "wxBrush_GetStyle", (PyCFunction) _wrap_wxBrush_GetStyle, METH_VARARGS | METH_KEYWORDS }, + { "wxBrush_GetStipple", (PyCFunction) _wrap_wxBrush_GetStipple, METH_VARARGS | METH_KEYWORDS }, + { "wxBrush_GetColour", (PyCFunction) _wrap_wxBrush_GetColour, METH_VARARGS | METH_KEYWORDS }, + { "new_wxBrush", (PyCFunction) _wrap_new_wxBrush, METH_VARARGS | METH_KEYWORDS }, + { "wxPen_SetStipple", (PyCFunction) _wrap_wxPen_SetStipple, METH_VARARGS | METH_KEYWORDS }, + { "wxPen_SetDashes", (PyCFunction) _wrap_wxPen_SetDashes, METH_VARARGS | METH_KEYWORDS }, + { "wxPen_GetStipple", (PyCFunction) _wrap_wxPen_GetStipple, METH_VARARGS | METH_KEYWORDS }, + { "wxPen_GetDashes", (PyCFunction) _wrap_wxPen_GetDashes, METH_VARARGS | METH_KEYWORDS }, + { "wxPen_SetWidth", (PyCFunction) _wrap_wxPen_SetWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxPen_SetStyle", (PyCFunction) _wrap_wxPen_SetStyle, METH_VARARGS | METH_KEYWORDS }, + { "wxPen_SetJoin", (PyCFunction) _wrap_wxPen_SetJoin, METH_VARARGS | METH_KEYWORDS }, + { "wxPen_SetColour", (PyCFunction) _wrap_wxPen_SetColour, METH_VARARGS | METH_KEYWORDS }, + { "wxPen_SetCap", (PyCFunction) _wrap_wxPen_SetCap, METH_VARARGS | METH_KEYWORDS }, + { "wxPen_Ok", (PyCFunction) _wrap_wxPen_Ok, METH_VARARGS | METH_KEYWORDS }, + { "wxPen_GetWidth", (PyCFunction) _wrap_wxPen_GetWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxPen_GetStyle", (PyCFunction) _wrap_wxPen_GetStyle, METH_VARARGS | METH_KEYWORDS }, + { "wxPen_GetJoin", (PyCFunction) _wrap_wxPen_GetJoin, METH_VARARGS | METH_KEYWORDS }, + { "wxPen_GetColour", (PyCFunction) _wrap_wxPen_GetColour, METH_VARARGS | METH_KEYWORDS }, + { "wxPen_GetCap", (PyCFunction) _wrap_wxPen_GetCap, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPen", (PyCFunction) _wrap_new_wxPen, METH_VARARGS | METH_KEYWORDS }, + { "wxColour_Get", (PyCFunction) _wrap_wxColour_Get, METH_VARARGS | METH_KEYWORDS }, + { "wxColour_Set", (PyCFunction) _wrap_wxColour_Set, METH_VARARGS | METH_KEYWORDS }, + { "wxColour_Ok", (PyCFunction) _wrap_wxColour_Ok, METH_VARARGS | METH_KEYWORDS }, + { "wxColour_Blue", (PyCFunction) _wrap_wxColour_Blue, METH_VARARGS | METH_KEYWORDS }, + { "wxColour_Green", (PyCFunction) _wrap_wxColour_Green, METH_VARARGS | METH_KEYWORDS }, + { "wxColour_Red", (PyCFunction) _wrap_wxColour_Red, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxColour", (PyCFunction) _wrap_delete_wxColour, METH_VARARGS | METH_KEYWORDS }, + { "new_wxColour", (PyCFunction) _wrap_new_wxColour, METH_VARARGS | METH_KEYWORDS }, + { "wxFont_SetWeight", (PyCFunction) _wrap_wxFont_SetWeight, METH_VARARGS | METH_KEYWORDS }, + { "wxFont_SetUnderlined", (PyCFunction) _wrap_wxFont_SetUnderlined, METH_VARARGS | METH_KEYWORDS }, + { "wxFont_SetStyle", (PyCFunction) _wrap_wxFont_SetStyle, METH_VARARGS | METH_KEYWORDS }, + { "wxFont_SetPointSize", (PyCFunction) _wrap_wxFont_SetPointSize, METH_VARARGS | METH_KEYWORDS }, + { "wxFont_SetFamily", (PyCFunction) _wrap_wxFont_SetFamily, METH_VARARGS | METH_KEYWORDS }, + { "wxFont_SetFaceName", (PyCFunction) _wrap_wxFont_SetFaceName, METH_VARARGS | METH_KEYWORDS }, + { "wxFont_GetWeight", (PyCFunction) _wrap_wxFont_GetWeight, METH_VARARGS | METH_KEYWORDS }, + { "wxFont_GetUnderlined", (PyCFunction) _wrap_wxFont_GetUnderlined, METH_VARARGS | METH_KEYWORDS }, + { "wxFont_GetStyle", (PyCFunction) _wrap_wxFont_GetStyle, METH_VARARGS | METH_KEYWORDS }, + { "wxFont_GetPointSize", (PyCFunction) _wrap_wxFont_GetPointSize, METH_VARARGS | METH_KEYWORDS }, + { "wxFont_GetFontId", (PyCFunction) _wrap_wxFont_GetFontId, METH_VARARGS | METH_KEYWORDS }, + { "wxFont_GetFamily", (PyCFunction) _wrap_wxFont_GetFamily, METH_VARARGS | METH_KEYWORDS }, + { "wxFont_GetFaceName", (PyCFunction) _wrap_wxFont_GetFaceName, METH_VARARGS | METH_KEYWORDS }, + { "new_wxFont", (PyCFunction) _wrap_new_wxFont, METH_VARARGS | METH_KEYWORDS }, + { "wxCursor_Ok", (PyCFunction) _wrap_wxCursor_Ok, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxCursor", (PyCFunction) _wrap_delete_wxCursor, METH_VARARGS | METH_KEYWORDS }, + { "new_wxCursor", (PyCFunction) _wrap_new_wxCursor, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_SetWidth", (PyCFunction) _wrap_wxIcon_SetWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_SetHeight", (PyCFunction) _wrap_wxIcon_SetHeight, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_SetDepth", (PyCFunction) _wrap_wxIcon_SetDepth, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_Ok", (PyCFunction) _wrap_wxIcon_Ok, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_LoadFile", (PyCFunction) _wrap_wxIcon_LoadFile, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_GetWidth", (PyCFunction) _wrap_wxIcon_GetWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_GetHeight", (PyCFunction) _wrap_wxIcon_GetHeight, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_GetDepth", (PyCFunction) _wrap_wxIcon_GetDepth, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxIcon", (PyCFunction) _wrap_delete_wxIcon, METH_VARARGS | METH_KEYWORDS }, + { "new_wxIcon", (PyCFunction) _wrap_new_wxIcon, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxMask", (PyCFunction) _wrap_delete_wxMask, METH_VARARGS | METH_KEYWORDS }, + { "new_wxMask", (PyCFunction) _wrap_new_wxMask, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_SetWidth", (PyCFunction) _wrap_wxBitmap_SetWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_SetPalette", (PyCFunction) _wrap_wxBitmap_SetPalette, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_SetMask", (PyCFunction) _wrap_wxBitmap_SetMask, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_SetHeight", (PyCFunction) _wrap_wxBitmap_SetHeight, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_SetDepth", (PyCFunction) _wrap_wxBitmap_SetDepth, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_SaveFile", (PyCFunction) _wrap_wxBitmap_SaveFile, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_Ok", (PyCFunction) _wrap_wxBitmap_Ok, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_LoadFile", (PyCFunction) _wrap_wxBitmap_LoadFile, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_GetWidth", (PyCFunction) _wrap_wxBitmap_GetWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_GetMask", (PyCFunction) _wrap_wxBitmap_GetMask, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_GetPalette", (PyCFunction) _wrap_wxBitmap_GetPalette, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_GetHeight", (PyCFunction) _wrap_wxBitmap_GetHeight, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_GetDepth", (PyCFunction) _wrap_wxBitmap_GetDepth, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_Create", (PyCFunction) _wrap_wxBitmap_Create, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxBitmap", (PyCFunction) _wrap_delete_wxBitmap, METH_VARARGS | METH_KEYWORDS }, + { "new_wxBitmap", (PyCFunction) _wrap_new_wxBitmap, METH_VARARGS | METH_KEYWORDS }, + { "wxMemoryDCFromDC", (PyCFunction) _wrap_wxMemoryDCFromDC, METH_VARARGS | METH_KEYWORDS }, + { "wxNamedColour", (PyCFunction) _wrap_wxNamedColour, METH_VARARGS | METH_KEYWORDS }, + { "wxStockCursor", (PyCFunction) _wrap_wxStockCursor, METH_VARARGS | METH_KEYWORDS }, + { "wxMaskColour", (PyCFunction) _wrap_wxMaskColour, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmapFromData", (PyCFunction) _wrap_wxBitmapFromData, METH_VARARGS | METH_KEYWORDS }, + { "wxNoRefBitmap", (PyCFunction) _wrap_wxNoRefBitmap, METH_VARARGS | METH_KEYWORDS }, + { "wxEmptyBitmap", (PyCFunction) _wrap_wxEmptyBitmap, METH_VARARGS | METH_KEYWORDS }, { NULL, NULL } }; #ifdef __cplusplus diff --git a/utils/wxPython/src/msw/image.cpp b/utils/wxPython/src/msw/image.cpp index fd3eeb330b..5a06e006d0 100644 --- a/utils/wxPython/src/msw/image.cpp +++ b/utils/wxPython/src/msw/image.cpp @@ -3,7 +3,7 @@ * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 794) + * Version 1.1 (Build 810) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -104,14 +104,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } -extern byte* byte_LIST_helper(PyObject* source); -extern int* int_LIST_helper(PyObject* source); -extern long* long_LIST_helper(PyObject* source); -extern char** string_LIST_helper(PyObject* source); -extern wxPoint* wxPoint_LIST_helper(PyObject* source); -extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); -extern wxString* wxString_LIST_helper(PyObject* source); -extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; diff --git a/utils/wxPython/src/msw/mdi.cpp b/utils/wxPython/src/msw/mdi.cpp index c199bb36ce..f1d6ce6b9f 100644 --- a/utils/wxPython/src/msw/mdi.cpp +++ b/utils/wxPython/src/msw/mdi.cpp @@ -3,7 +3,7 @@ * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 794) + * Version 1.1 (Build 810) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -103,14 +103,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } -extern byte* byte_LIST_helper(PyObject* source); -extern int* int_LIST_helper(PyObject* source); -extern long* long_LIST_helper(PyObject* source); -extern char** string_LIST_helper(PyObject* source); -extern wxPoint* wxPoint_LIST_helper(PyObject* source); -extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); -extern wxString* wxString_LIST_helper(PyObject* source); -extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; diff --git a/utils/wxPython/src/msw/misc.cpp b/utils/wxPython/src/msw/misc.cpp index a1e7938464..a4fa4df7d0 100644 --- a/utils/wxPython/src/msw/misc.cpp +++ b/utils/wxPython/src/msw/misc.cpp @@ -3,7 +3,7 @@ * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 802) + * Version 1.1 (Build 810) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -105,14 +105,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } -extern byte* byte_LIST_helper(PyObject* source); -extern int* int_LIST_helper(PyObject* source); -extern long* long_LIST_helper(PyObject* source); -extern char** string_LIST_helper(PyObject* source); -extern wxPoint* wxPoint_LIST_helper(PyObject* source); -extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); -extern wxString* wxString_LIST_helper(PyObject* source); -extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; diff --git a/utils/wxPython/src/msw/misc2.cpp b/utils/wxPython/src/msw/misc2.cpp index f815ff1b5f..bd6b8ae5b9 100644 --- a/utils/wxPython/src/msw/misc2.cpp +++ b/utils/wxPython/src/msw/misc2.cpp @@ -3,7 +3,7 @@ * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 794) + * Version 1.1 (Build 810) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -105,14 +105,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } -extern byte* byte_LIST_helper(PyObject* source); -extern int* int_LIST_helper(PyObject* source); -extern long* long_LIST_helper(PyObject* source); -extern char** string_LIST_helper(PyObject* source); -extern wxPoint* wxPoint_LIST_helper(PyObject* source); -extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); -extern wxString* wxString_LIST_helper(PyObject* source); -extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; diff --git a/utils/wxPython/src/msw/printfw.cpp b/utils/wxPython/src/msw/printfw.cpp index 6f6a947122..f43b257e7e 100644 --- a/utils/wxPython/src/msw/printfw.cpp +++ b/utils/wxPython/src/msw/printfw.cpp @@ -3,7 +3,7 @@ * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 802) + * Version 1.1 (Build 810) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -105,14 +105,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } -extern byte* byte_LIST_helper(PyObject* source); -extern int* int_LIST_helper(PyObject* source); -extern long* long_LIST_helper(PyObject* source); -extern char** string_LIST_helper(PyObject* source); -extern wxPoint* wxPoint_LIST_helper(PyObject* source); -extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); -extern wxString* wxString_LIST_helper(PyObject* source); -extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; @@ -121,19 +121,20 @@ class wxPyPrintout : public wxPrintout { public: wxPyPrintout(const wxString& title) : wxPrintout(title) {} - PYCALLBACK_BOOL_INTINT(wxPrintout, OnBeginDocument); - PYCALLBACK__(wxPrintout, OnEndDocument); - PYCALLBACK__(wxPrintout, OnBeginPrinting); - PYCALLBACK__(wxPrintout, OnEndPrinting); - PYCALLBACK__(wxPrintout, OnPreparePrinting); - PYCALLBACK_BOOL_INT_pure(wxPrintout, OnPrintPage); - PYCALLBACK_BOOL_INT(wxPrintout, HasPage); + DEC_PYCALLBACK_BOOL_INTINT(OnBeginDocument); + DEC_PYCALLBACK__(OnEndDocument); + DEC_PYCALLBACK__(OnBeginPrinting); + DEC_PYCALLBACK__(OnEndPrinting); + DEC_PYCALLBACK__(OnPreparePrinting); + DEC_PYCALLBACK_BOOL_INT_pure(OnPrintPage); + DEC_PYCALLBACK_BOOL_INT(HasPage); // Since this one would be tough and ugly to do with the Macros... void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) { bool hadErr = false; + bool doSave = wxPyRestoreThread(); if (m_myInst.findCallback("GetPageInfo")) { PyObject* result = m_myInst.callCallbackObj(Py_BuildValue("()")); if (result && PyTuple_Check(result) && PyTuple_Size(result) == 4) { @@ -163,19 +164,29 @@ public: PyErr_Print(); } Py_DECREF(result); -#ifdef WXP_WITH_THREAD - PyEval_SaveThread(); -#endif } else wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo); + + wxPySaveThread(doSave); } + void base_GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) { wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo); } PYPRIVATE; }; + +IMP_PYCALLBACK_BOOL_INTINT(wxPyPrintout, wxPrintout, OnBeginDocument); +IMP_PYCALLBACK__(wxPyPrintout, wxPrintout, OnEndDocument); +IMP_PYCALLBACK__(wxPyPrintout, wxPrintout, OnBeginPrinting); +IMP_PYCALLBACK__(wxPyPrintout, wxPrintout, OnEndPrinting); +IMP_PYCALLBACK__(wxPyPrintout, wxPrintout, OnPreparePrinting); +IMP_PYCALLBACK_BOOL_INT_pure(wxPyPrintout, wxPrintout, OnPrintPage); +IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage); + + #ifdef __cplusplus extern "C" { #endif diff --git a/utils/wxPython/src/msw/stattool.cpp b/utils/wxPython/src/msw/stattool.cpp index 90d1adac98..7857a38bb0 100644 --- a/utils/wxPython/src/msw/stattool.cpp +++ b/utils/wxPython/src/msw/stattool.cpp @@ -3,7 +3,7 @@ * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 794) + * Version 1.1 (Build 810) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -105,14 +105,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } -extern byte* byte_LIST_helper(PyObject* source); -extern int* int_LIST_helper(PyObject* source); -extern long* long_LIST_helper(PyObject* source); -extern char** string_LIST_helper(PyObject* source); -extern wxPoint* wxPoint_LIST_helper(PyObject* source); -extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); -extern wxString* wxString_LIST_helper(PyObject* source); -extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; diff --git a/utils/wxPython/src/msw/windows.cpp b/utils/wxPython/src/msw/windows.cpp index 7514134500..42319e4354 100644 --- a/utils/wxPython/src/msw/windows.cpp +++ b/utils/wxPython/src/msw/windows.cpp @@ -3,7 +3,7 @@ * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 802) + * Version 1.1 (Build 810) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -104,14 +104,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } -extern byte* byte_LIST_helper(PyObject* source); -extern int* int_LIST_helper(PyObject* source); -extern long* long_LIST_helper(PyObject* source); -extern char** string_LIST_helper(PyObject* source); -extern wxPoint* wxPoint_LIST_helper(PyObject* source); -extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); -extern wxString* wxString_LIST_helper(PyObject* source); -extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; @@ -990,6 +990,40 @@ static PyObject *_wrap_wxWindow_GetConstraints(PyObject *self, PyObject *args, P return _resultobj; } +#define wxWindow_GetEventHandler(_swigobj) (_swigobj->GetEventHandler()) +static PyObject *_wrap_wxWindow_GetEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxEvtHandler * _result; + wxWindow * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetEventHandler",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetEventHandler. Expected _wxWindow_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxEvtHandler *)wxWindow_GetEventHandler(_arg0); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxEvtHandler_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + #define wxWindow_GetFont(_swigobj) (_swigobj->GetFont()) static PyObject *_wrap_wxWindow_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -2124,6 +2158,79 @@ static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args, PyObject *k return _resultobj; } +#define wxWindow_PopEventHandler(_swigobj,_swigarg0) (_swigobj->PopEventHandler(_swigarg0)) +static PyObject *_wrap_wxWindow_PopEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxEvtHandler * _result; + wxWindow * _arg0; + bool _arg1 = (bool ) FALSE; + PyObject * _argo0 = 0; + int tempbool1 = (int) FALSE; + char *_kwnames[] = { "self","deleteHandler", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxWindow_PopEventHandler",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_PopEventHandler. Expected _wxWindow_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxEvtHandler *)wxWindow_PopEventHandler(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxEvtHandler_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxWindow_PushEventHandler(_swigobj,_swigarg0) (_swigobj->PushEventHandler(_swigarg0)) +static PyObject *_wrap_wxWindow_PushEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxWindow * _arg0; + wxEvtHandler * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","handler", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_PushEventHandler",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_PushEventHandler. Expected _wxWindow_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxEvtHandler_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_PushEventHandler. Expected _wxEvtHandler_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxWindow_PushEventHandler(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxWindow_PopupMenuXY(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->PopupMenu(_swigarg0,_swigarg1,_swigarg2)) static PyObject *_wrap_wxWindow_PopupMenuXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -3076,6 +3183,42 @@ static PyObject *_wrap_wxWindow_SetCursor(PyObject *self, PyObject *args, PyObje return _resultobj; } +#define wxWindow_SetEventHandler(_swigobj,_swigarg0) (_swigobj->SetEventHandler(_swigarg0)) +static PyObject *_wrap_wxWindow_SetEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxWindow * _arg0; + wxEvtHandler * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","handler", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetEventHandler",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetEventHandler. Expected _wxWindow_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxEvtHandler_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetEventHandler. Expected _wxEvtHandler_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxWindow_SetEventHandler(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxWindow_SetTitle(_swigobj,_swigarg0) (_swigobj->SetTitle(_swigarg0)) static PyObject *_wrap_wxWindow_SetTitle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -6772,6 +6915,7 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_TransferDataFromWindow", (PyCFunction) _wrap_wxWindow_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_Show", (PyCFunction) _wrap_wxWindow_Show, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_SetTitle", (PyCFunction) _wrap_wxWindow_SetTitle, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_SetEventHandler", (PyCFunction) _wrap_wxWindow_SetEventHandler, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_SetCursor", (PyCFunction) _wrap_wxWindow_SetCursor, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_SetClientSize", (PyCFunction) _wrap_wxWindow_SetClientSize, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_SetClientSizeWH", (PyCFunction) _wrap_wxWindow_SetClientSizeWH, METH_VARARGS | METH_KEYWORDS }, @@ -6799,6 +6943,8 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_Raise", (PyCFunction) _wrap_wxWindow_Raise, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_PopupMenu", (PyCFunction) _wrap_wxWindow_PopupMenu, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_PopupMenuXY", (PyCFunction) _wrap_wxWindow_PopupMenuXY, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_PushEventHandler", (PyCFunction) _wrap_wxWindow_PushEventHandler, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_PopEventHandler", (PyCFunction) _wrap_wxWindow_PopEventHandler, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_Move", (PyCFunction) _wrap_wxWindow_Move, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_MoveXY", (PyCFunction) _wrap_wxWindow_MoveXY, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_MakeModal", (PyCFunction) _wrap_wxWindow_MakeModal, METH_VARARGS | METH_KEYWORDS }, @@ -6832,6 +6978,7 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_GetGrandParent", (PyCFunction) _wrap_wxWindow_GetGrandParent, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetForegroundColour", (PyCFunction) _wrap_wxWindow_GetForegroundColour, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetFont", (PyCFunction) _wrap_wxWindow_GetFont, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_GetEventHandler", (PyCFunction) _wrap_wxWindow_GetEventHandler, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetConstraints", (PyCFunction) _wrap_wxWindow_GetConstraints, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetClientSize", (PyCFunction) _wrap_wxWindow_GetClientSize, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetClientSizeTuple", (PyCFunction) _wrap_wxWindow_GetClientSizeTuple, METH_VARARGS | METH_KEYWORDS }, diff --git a/utils/wxPython/src/msw/windows.py b/utils/wxPython/src/msw/windows.py index bb24768aee..0ad03d7763 100644 --- a/utils/wxPython/src/msw/windows.py +++ b/utils/wxPython/src/msw/windows.py @@ -110,6 +110,10 @@ class wxWindowPtr(wxEvtHandlerPtr): val = apply(windowsc.wxWindow_GetConstraints,(self,) + _args, _kwargs) if val: val = wxLayoutConstraintsPtr(val) return val + def GetEventHandler(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_GetEventHandler,(self,) + _args, _kwargs) + if val: val = wxEvtHandlerPtr(val) + return val def GetFont(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_GetFont,(self,) + _args, _kwargs) if val: val = wxFontPtr(val) @@ -217,6 +221,13 @@ class wxWindowPtr(wxEvtHandlerPtr): def Move(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_Move,(self,) + _args, _kwargs) return val + def PopEventHandler(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_PopEventHandler,(self,) + _args, _kwargs) + if val: val = wxEvtHandlerPtr(val) + return val + def PushEventHandler(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_PushEventHandler,(self,) + _args, _kwargs) + return val def PopupMenuXY(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_PopupMenuXY,(self,) + _args, _kwargs) return val @@ -299,6 +310,9 @@ class wxWindowPtr(wxEvtHandlerPtr): def SetCursor(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_SetCursor,(self,) + _args, _kwargs) return val + def SetEventHandler(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_SetEventHandler,(self,) + _args, _kwargs) + return val def SetTitle(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_SetTitle,(self,) + _args, _kwargs) return val diff --git a/utils/wxPython/src/msw/windows2.cpp b/utils/wxPython/src/msw/windows2.cpp index 179cd19ec6..2ec454e786 100644 --- a/utils/wxPython/src/msw/windows2.cpp +++ b/utils/wxPython/src/msw/windows2.cpp @@ -3,7 +3,7 @@ * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 794) + * Version 1.1 (Build 810) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -109,14 +109,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } -extern byte* byte_LIST_helper(PyObject* source); -extern int* int_LIST_helper(PyObject* source); -extern long* long_LIST_helper(PyObject* source); -extern char** string_LIST_helper(PyObject* source); -extern wxPoint* wxPoint_LIST_helper(PyObject* source); -extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); -extern wxString* wxString_LIST_helper(PyObject* source); -extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; @@ -1213,15 +1213,9 @@ static PyObject * wxGrid_GetCells(wxGrid *self) { for (col=0; col < self->GetCols(); col++) { wxGridCell* cell = self->GetCell(row, col); -#ifdef WXP_WITH_THREAD - PyEval_RestoreThread(wxPyEventThreadState); - wxPyInEvent = true; -#endif + bool doSave = wxPyRestoreThread(); PyObject* pyCell = wxPyConstructObject(cell, "wxGridCell"); -#ifdef WXP_WITH_THREAD - PyEval_SaveThread(); - wxPyInEvent = false; -#endif + wxPySaveThread(doSave); if (PyList_Append(rowList, pyCell) == -1) return NULL; diff --git a/utils/wxPython/src/msw/windows3.cpp b/utils/wxPython/src/msw/windows3.cpp index e227039a48..1a8f604bec 100644 --- a/utils/wxPython/src/msw/windows3.cpp +++ b/utils/wxPython/src/msw/windows3.cpp @@ -3,7 +3,7 @@ * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 794) + * Version 1.1 (Build 810) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -105,14 +105,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } -extern byte* byte_LIST_helper(PyObject* source); -extern int* int_LIST_helper(PyObject* source); -extern long* long_LIST_helper(PyObject* source); -extern char** string_LIST_helper(PyObject* source); -extern wxPoint* wxPoint_LIST_helper(PyObject* source); -extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); -extern wxString* wxString_LIST_helper(PyObject* source); -extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; diff --git a/utils/wxPython/src/msw/wx.cpp b/utils/wxPython/src/msw/wx.cpp index edb359c2da..ffbf960e91 100644 --- a/utils/wxPython/src/msw/wx.cpp +++ b/utils/wxPython/src/msw/wx.cpp @@ -3,7 +3,7 @@ * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) - * Version 1.1 (Build 794) + * Version 1.1 (Build 810) * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. @@ -103,14 +103,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } -extern byte* byte_LIST_helper(PyObject* source); -extern int* int_LIST_helper(PyObject* source); -extern long* long_LIST_helper(PyObject* source); -extern char** string_LIST_helper(PyObject* source); -extern wxPoint* wxPoint_LIST_helper(PyObject* source); -extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); -extern wxString* wxString_LIST_helper(PyObject* source); -extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; @@ -2052,10 +2052,13 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxUSER_COLOURS", PyInt_FromLong((long) wxUSER_COLOURS)); PyDict_SetItemString(d,"wxNO_3D", PyInt_FromLong((long) wxNO_3D)); PyDict_SetItemString(d,"wxTAB_TRAVERSAL", PyInt_FromLong((long) wxTAB_TRAVERSAL)); + PyDict_SetItemString(d,"wxWANTS_CHARS", PyInt_FromLong((long) wxWANTS_CHARS)); PyDict_SetItemString(d,"wxHORIZONTAL", PyInt_FromLong((long) wxHORIZONTAL)); PyDict_SetItemString(d,"wxVERTICAL", PyInt_FromLong((long) wxVERTICAL)); PyDict_SetItemString(d,"wxBOTH", PyInt_FromLong((long) wxBOTH)); PyDict_SetItemString(d,"wxCENTER_FRAME", PyInt_FromLong((long) wxCENTER_FRAME)); + PyDict_SetItemString(d,"wxCENTRE_ON_SCREEN", PyInt_FromLong((long) wxCENTRE_ON_SCREEN)); + PyDict_SetItemString(d,"wxCENTER_ON_SCREEN", PyInt_FromLong((long) wxCENTER_ON_SCREEN)); PyDict_SetItemString(d,"wxSTAY_ON_TOP", PyInt_FromLong((long) wxSTAY_ON_TOP)); PyDict_SetItemString(d,"wxICONIZE", PyInt_FromLong((long) wxICONIZE)); PyDict_SetItemString(d,"wxMINIMIZE", PyInt_FromLong((long) wxMINIMIZE)); @@ -2074,6 +2077,11 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxDEFAULT_DIALOG_STYLE", PyInt_FromLong((long) wxDEFAULT_DIALOG_STYLE)); PyDict_SetItemString(d,"wxFRAME_TOOL_WINDOW", PyInt_FromLong((long) wxFRAME_TOOL_WINDOW)); PyDict_SetItemString(d,"wxFRAME_FLOAT_ON_PARENT", PyInt_FromLong((long) wxFRAME_FLOAT_ON_PARENT)); + PyDict_SetItemString(d,"wxED_CLIENT_MARGIN", PyInt_FromLong((long) wxED_CLIENT_MARGIN)); + PyDict_SetItemString(d,"wxED_BUTTONS_BOTTOM", PyInt_FromLong((long) wxED_BUTTONS_BOTTOM)); + PyDict_SetItemString(d,"wxED_BUTTONS_RIGHT", PyInt_FromLong((long) wxED_BUTTONS_RIGHT)); + PyDict_SetItemString(d,"wxED_STATIC_LINE", PyInt_FromLong((long) wxED_STATIC_LINE)); + PyDict_SetItemString(d,"wxEXT_DIALOG_STYLE", PyInt_FromLong((long) wxEXT_DIALOG_STYLE)); PyDict_SetItemString(d,"wxCLIP_CHILDREN", PyInt_FromLong((long) wxCLIP_CHILDREN)); PyDict_SetItemString(d,"wxRETAINED", PyInt_FromLong((long) wxRETAINED)); PyDict_SetItemString(d,"wxBACKINGSTORE", PyInt_FromLong((long) wxBACKINGSTORE)); @@ -2134,6 +2142,7 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxTR_EDIT_LABELS", PyInt_FromLong((long) wxTR_EDIT_LABELS)); PyDict_SetItemString(d,"wxTR_LINES_AT_ROOT", PyInt_FromLong((long) wxTR_LINES_AT_ROOT)); PyDict_SetItemString(d,"wxTR_MULTIPLE", PyInt_FromLong((long) wxTR_MULTIPLE)); + PyDict_SetItemString(d,"wxTR_SINGLE", PyInt_FromLong((long) wxTR_SINGLE)); PyDict_SetItemString(d,"wxTR_HAS_VARIABLE_ROW_HEIGHT", PyInt_FromLong((long) wxTR_HAS_VARIABLE_ROW_HEIGHT)); PyDict_SetItemString(d,"wxLC_ICON", PyInt_FromLong((long) wxLC_ICON)); PyDict_SetItemString(d,"wxLC_SMALL_ICON", PyInt_FromLong((long) wxLC_SMALL_ICON)); @@ -2172,6 +2181,8 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxCANCEL", PyInt_FromLong((long) wxCANCEL)); PyDict_SetItemString(d,"wxYES", PyInt_FromLong((long) wxYES)); PyDict_SetItemString(d,"wxNO", PyInt_FromLong((long) wxNO)); + PyDict_SetItemString(d,"wxNO_DEFAULT", PyInt_FromLong((long) wxNO_DEFAULT)); + PyDict_SetItemString(d,"wxYES_DEFAULT", PyInt_FromLong((long) wxYES_DEFAULT)); PyDict_SetItemString(d,"wxICON_EXCLAMATION", PyInt_FromLong((long) wxICON_EXCLAMATION)); PyDict_SetItemString(d,"wxICON_HAND", PyInt_FromLong((long) wxICON_HAND)); PyDict_SetItemString(d,"wxICON_QUESTION", PyInt_FromLong((long) wxICON_QUESTION)); @@ -2179,6 +2190,14 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxICON_STOP", PyInt_FromLong((long) wxICON_STOP)); PyDict_SetItemString(d,"wxICON_ASTERISK", PyInt_FromLong((long) wxICON_ASTERISK)); PyDict_SetItemString(d,"wxICON_MASK", PyInt_FromLong((long) wxICON_MASK)); + PyDict_SetItemString(d,"wxICON_WARNING", PyInt_FromLong((long) wxICON_WARNING)); + PyDict_SetItemString(d,"wxICON_ERROR", PyInt_FromLong((long) wxICON_ERROR)); + PyDict_SetItemString(d,"wxFORWARD", PyInt_FromLong((long) wxFORWARD)); + PyDict_SetItemString(d,"wxBACKWARD", PyInt_FromLong((long) wxBACKWARD)); + PyDict_SetItemString(d,"wxRESET", PyInt_FromLong((long) wxRESET)); + PyDict_SetItemString(d,"wxHELP", PyInt_FromLong((long) wxHELP)); + PyDict_SetItemString(d,"wxMORE", PyInt_FromLong((long) wxMORE)); + PyDict_SetItemString(d,"wxSETUP", PyInt_FromLong((long) wxSETUP)); PyDict_SetItemString(d,"wxCENTRE", PyInt_FromLong((long) wxCENTRE)); PyDict_SetItemString(d,"wxCENTER", PyInt_FromLong((long) wxCENTER)); PyDict_SetItemString(d,"wxSIZE_AUTO_WIDTH", PyInt_FromLong((long) wxSIZE_AUTO_WIDTH)); @@ -2268,9 +2287,29 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxPD_ELAPSED_TIME", PyInt_FromLong((long) wxPD_ELAPSED_TIME)); PyDict_SetItemString(d,"wxPD_ESTIMATED_TIME", PyInt_FromLong((long) wxPD_ESTIMATED_TIME)); PyDict_SetItemString(d,"wxPD_REMAINING_TIME", PyInt_FromLong((long) wxPD_REMAINING_TIME)); - PyDict_SetItemString(d,"wxNO_DEFAULT", PyInt_FromLong((long) wxNO_DEFAULT)); PyDict_SetItemString(d,"wxMENU_TEAROFF", PyInt_FromLong((long) wxMENU_TEAROFF)); + PyDict_SetItemString(d,"wxMB_DOCKABLE", PyInt_FromLong((long) wxMB_DOCKABLE)); PyDict_SetItemString(d,"wxNO_FULL_REPAINT_ON_RESIZE", PyInt_FromLong((long) wxNO_FULL_REPAINT_ON_RESIZE)); + PyDict_SetItemString(d,"wxLEFT", PyInt_FromLong((long) wxLEFT)); + PyDict_SetItemString(d,"wxRIGHT", PyInt_FromLong((long) wxRIGHT)); + PyDict_SetItemString(d,"wxUP", PyInt_FromLong((long) wxUP)); + PyDict_SetItemString(d,"wxDOWN", PyInt_FromLong((long) wxDOWN)); + PyDict_SetItemString(d,"wxALL", PyInt_FromLong((long) wxALL)); + PyDict_SetItemString(d,"wxTOP", PyInt_FromLong((long) wxTOP)); + PyDict_SetItemString(d,"wxBOTTOM", PyInt_FromLong((long) wxBOTTOM)); + PyDict_SetItemString(d,"wxNORTH", PyInt_FromLong((long) wxNORTH)); + PyDict_SetItemString(d,"wxSOUTH", PyInt_FromLong((long) wxSOUTH)); + PyDict_SetItemString(d,"wxEAST", PyInt_FromLong((long) wxEAST)); + PyDict_SetItemString(d,"wxWEST", PyInt_FromLong((long) wxWEST)); + PyDict_SetItemString(d,"wxSTRETCH_NOT", PyInt_FromLong((long) wxSTRETCH_NOT)); + PyDict_SetItemString(d,"wxSHRINK", PyInt_FromLong((long) wxSHRINK)); + PyDict_SetItemString(d,"wxGROW", PyInt_FromLong((long) wxGROW)); + PyDict_SetItemString(d,"wxEXPAND", PyInt_FromLong((long) wxEXPAND)); + PyDict_SetItemString(d,"wxNB_FIXEDWIDTH", PyInt_FromLong((long) wxNB_FIXEDWIDTH)); + PyDict_SetItemString(d,"wxLI_HORIZONTAL", PyInt_FromLong((long) wxLI_HORIZONTAL)); + PyDict_SetItemString(d,"wxLI_VERTICAL", PyInt_FromLong((long) wxLI_VERTICAL)); + PyDict_SetItemString(d,"wxHW_SCROLLBAR_NEVER", PyInt_FromLong((long) wxHW_SCROLLBAR_NEVER)); + PyDict_SetItemString(d,"wxHW_SCROLLBAR_AUTO", PyInt_FromLong((long) wxHW_SCROLLBAR_AUTO)); PyDict_SetItemString(d,"wxDEFAULT", PyInt_FromLong((long) wxDEFAULT)); PyDict_SetItemString(d,"wxDECORATIVE", PyInt_FromLong((long) wxDECORATIVE)); PyDict_SetItemString(d,"wxROMAN", PyInt_FromLong((long) wxROMAN)); @@ -2644,7 +2683,7 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED)); PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_UNSPLIT", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_UNSPLIT)); PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_DOUBLECLICKED", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_DOUBLECLICKED)); - PyDict_SetItemString(d,"__version__", PyString_FromString("2.1b3")); + PyDict_SetItemString(d,"__version__", PyString_FromString("2.1b4")); PyDict_SetItemString(d,"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set); SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set); diff --git a/utils/wxPython/src/msw/wx.py b/utils/wxPython/src/msw/wx.py index 30d9b78758..7c2779a4e5 100644 --- a/utils/wxPython/src/msw/wx.py +++ b/utils/wxPython/src/msw/wx.py @@ -173,10 +173,13 @@ wxNO_BORDER = wxc.wxNO_BORDER wxUSER_COLOURS = wxc.wxUSER_COLOURS wxNO_3D = wxc.wxNO_3D wxTAB_TRAVERSAL = wxc.wxTAB_TRAVERSAL +wxWANTS_CHARS = wxc.wxWANTS_CHARS wxHORIZONTAL = wxc.wxHORIZONTAL wxVERTICAL = wxc.wxVERTICAL wxBOTH = wxc.wxBOTH wxCENTER_FRAME = wxc.wxCENTER_FRAME +wxCENTRE_ON_SCREEN = wxc.wxCENTRE_ON_SCREEN +wxCENTER_ON_SCREEN = wxc.wxCENTER_ON_SCREEN wxSTAY_ON_TOP = wxc.wxSTAY_ON_TOP wxICONIZE = wxc.wxICONIZE wxMINIMIZE = wxc.wxMINIMIZE @@ -195,6 +198,11 @@ wxDEFAULT_FRAME_STYLE = wxc.wxDEFAULT_FRAME_STYLE wxDEFAULT_DIALOG_STYLE = wxc.wxDEFAULT_DIALOG_STYLE wxFRAME_TOOL_WINDOW = wxc.wxFRAME_TOOL_WINDOW wxFRAME_FLOAT_ON_PARENT = wxc.wxFRAME_FLOAT_ON_PARENT +wxED_CLIENT_MARGIN = wxc.wxED_CLIENT_MARGIN +wxED_BUTTONS_BOTTOM = wxc.wxED_BUTTONS_BOTTOM +wxED_BUTTONS_RIGHT = wxc.wxED_BUTTONS_RIGHT +wxED_STATIC_LINE = wxc.wxED_STATIC_LINE +wxEXT_DIALOG_STYLE = wxc.wxEXT_DIALOG_STYLE wxCLIP_CHILDREN = wxc.wxCLIP_CHILDREN wxRETAINED = wxc.wxRETAINED wxBACKINGSTORE = wxc.wxBACKINGSTORE @@ -255,6 +263,7 @@ wxTR_HAS_BUTTONS = wxc.wxTR_HAS_BUTTONS wxTR_EDIT_LABELS = wxc.wxTR_EDIT_LABELS wxTR_LINES_AT_ROOT = wxc.wxTR_LINES_AT_ROOT wxTR_MULTIPLE = wxc.wxTR_MULTIPLE +wxTR_SINGLE = wxc.wxTR_SINGLE wxTR_HAS_VARIABLE_ROW_HEIGHT = wxc.wxTR_HAS_VARIABLE_ROW_HEIGHT wxLC_ICON = wxc.wxLC_ICON wxLC_SMALL_ICON = wxc.wxLC_SMALL_ICON @@ -293,6 +302,8 @@ wxYES_NO = wxc.wxYES_NO wxCANCEL = wxc.wxCANCEL wxYES = wxc.wxYES wxNO = wxc.wxNO +wxNO_DEFAULT = wxc.wxNO_DEFAULT +wxYES_DEFAULT = wxc.wxYES_DEFAULT wxICON_EXCLAMATION = wxc.wxICON_EXCLAMATION wxICON_HAND = wxc.wxICON_HAND wxICON_QUESTION = wxc.wxICON_QUESTION @@ -300,6 +311,14 @@ wxICON_INFORMATION = wxc.wxICON_INFORMATION wxICON_STOP = wxc.wxICON_STOP wxICON_ASTERISK = wxc.wxICON_ASTERISK wxICON_MASK = wxc.wxICON_MASK +wxICON_WARNING = wxc.wxICON_WARNING +wxICON_ERROR = wxc.wxICON_ERROR +wxFORWARD = wxc.wxFORWARD +wxBACKWARD = wxc.wxBACKWARD +wxRESET = wxc.wxRESET +wxHELP = wxc.wxHELP +wxMORE = wxc.wxMORE +wxSETUP = wxc.wxSETUP wxCENTRE = wxc.wxCENTRE wxCENTER = wxc.wxCENTER wxSIZE_AUTO_WIDTH = wxc.wxSIZE_AUTO_WIDTH @@ -389,9 +408,29 @@ wxPD_CAN_ABORT = wxc.wxPD_CAN_ABORT wxPD_ELAPSED_TIME = wxc.wxPD_ELAPSED_TIME wxPD_ESTIMATED_TIME = wxc.wxPD_ESTIMATED_TIME wxPD_REMAINING_TIME = wxc.wxPD_REMAINING_TIME -wxNO_DEFAULT = wxc.wxNO_DEFAULT wxMENU_TEAROFF = wxc.wxMENU_TEAROFF +wxMB_DOCKABLE = wxc.wxMB_DOCKABLE wxNO_FULL_REPAINT_ON_RESIZE = wxc.wxNO_FULL_REPAINT_ON_RESIZE +wxLEFT = wxc.wxLEFT +wxRIGHT = wxc.wxRIGHT +wxUP = wxc.wxUP +wxDOWN = wxc.wxDOWN +wxALL = wxc.wxALL +wxTOP = wxc.wxTOP +wxBOTTOM = wxc.wxBOTTOM +wxNORTH = wxc.wxNORTH +wxSOUTH = wxc.wxSOUTH +wxEAST = wxc.wxEAST +wxWEST = wxc.wxWEST +wxSTRETCH_NOT = wxc.wxSTRETCH_NOT +wxSHRINK = wxc.wxSHRINK +wxGROW = wxc.wxGROW +wxEXPAND = wxc.wxEXPAND +wxNB_FIXEDWIDTH = wxc.wxNB_FIXEDWIDTH +wxLI_HORIZONTAL = wxc.wxLI_HORIZONTAL +wxLI_VERTICAL = wxc.wxLI_VERTICAL +wxHW_SCROLLBAR_NEVER = wxc.wxHW_SCROLLBAR_NEVER +wxHW_SCROLLBAR_AUTO = wxc.wxHW_SCROLLBAR_AUTO wxDEFAULT = wxc.wxDEFAULT wxDECORATIVE = wxc.wxDECORATIVE wxROMAN = wxc.wxROMAN diff --git a/utils/wxPython/src/printfw.i b/utils/wxPython/src/printfw.i index 20148f2287..479f5a7989 100644 --- a/utils/wxPython/src/printfw.i +++ b/utils/wxPython/src/printfw.i @@ -202,19 +202,20 @@ class wxPyPrintout : public wxPrintout { public: wxPyPrintout(const wxString& title) : wxPrintout(title) {} - PYCALLBACK_BOOL_INTINT(wxPrintout, OnBeginDocument); - PYCALLBACK__(wxPrintout, OnEndDocument); - PYCALLBACK__(wxPrintout, OnBeginPrinting); - PYCALLBACK__(wxPrintout, OnEndPrinting); - PYCALLBACK__(wxPrintout, OnPreparePrinting); - PYCALLBACK_BOOL_INT_pure(wxPrintout, OnPrintPage); - PYCALLBACK_BOOL_INT(wxPrintout, HasPage); + DEC_PYCALLBACK_BOOL_INTINT(OnBeginDocument); + DEC_PYCALLBACK__(OnEndDocument); + DEC_PYCALLBACK__(OnBeginPrinting); + DEC_PYCALLBACK__(OnEndPrinting); + DEC_PYCALLBACK__(OnPreparePrinting); + DEC_PYCALLBACK_BOOL_INT_pure(OnPrintPage); + DEC_PYCALLBACK_BOOL_INT(HasPage); // Since this one would be tough and ugly to do with the Macros... void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) { bool hadErr = false; + bool doSave = wxPyRestoreThread(); if (m_myInst.findCallback("GetPageInfo")) { PyObject* result = m_myInst.callCallbackObj(Py_BuildValue("()")); if (result && PyTuple_Check(result) && PyTuple_Size(result) == 4) { @@ -244,19 +245,29 @@ public: PyErr_Print(); } Py_DECREF(result); -#ifdef WXP_WITH_THREAD - PyEval_SaveThread(); -#endif } else wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo); + + wxPySaveThread(doSave); } + void base_GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) { wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo); } PYPRIVATE; }; + +IMP_PYCALLBACK_BOOL_INTINT(wxPyPrintout, wxPrintout, OnBeginDocument); +IMP_PYCALLBACK__(wxPyPrintout, wxPrintout, OnEndDocument); +IMP_PYCALLBACK__(wxPyPrintout, wxPrintout, OnBeginPrinting); +IMP_PYCALLBACK__(wxPyPrintout, wxPrintout, OnEndPrinting); +IMP_PYCALLBACK__(wxPyPrintout, wxPrintout, OnPreparePrinting); +IMP_PYCALLBACK_BOOL_INT_pure(wxPyPrintout, wxPrintout, OnPrintPage); +IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage); + + %} diff --git a/utils/wxPython/src/windows2.i b/utils/wxPython/src/windows2.i index 0ae660088c..6aa7c46e7c 100644 --- a/utils/wxPython/src/windows2.i +++ b/utils/wxPython/src/windows2.i @@ -131,15 +131,9 @@ public: for (col=0; col < self->GetCols(); col++) { wxGridCell* cell = self->GetCell(row, col); -#ifdef WXP_WITH_THREAD - PyEval_RestoreThread(wxPyEventThreadState); - wxPyInEvent = true; -#endif + bool doSave = wxPyRestoreThread(); PyObject* pyCell = wxPyConstructObject(cell, "wxGridCell"); -#ifdef WXP_WITH_THREAD - PyEval_SaveThread(); - wxPyInEvent = false; -#endif + wxPySaveThread(doSave); if (PyList_Append(rowList, pyCell) == -1) return NULL; diff --git a/utils/wxPython/src/wx.i b/utils/wxPython/src/wx.i index a4f37d1d4f..05d4860286 100644 --- a/utils/wxPython/src/wx.i +++ b/utils/wxPython/src/wx.i @@ -49,7 +49,7 @@ //--------------------------------------------------------------------------- -#define __version__ "2.1b3" +#define __version__ "2.1b4" wxPoint wxPyDefaultPosition; wxSize wxPyDefaultSize; -- 2.45.2