X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..05fd1c9e8e20e959f894ecc300ee40232de38377:/wxPython/src/mac/gdi_wrap.cpp diff --git a/wxPython/src/mac/gdi_wrap.cpp b/wxPython/src/mac/gdi_wrap.cpp index f33bd634d5..9d26d712be 100644 --- a/wxPython/src/mac/gdi_wrap.cpp +++ b/wxPython/src/mac/gdi_wrap.cpp @@ -45,6 +45,8 @@ private: #define SWIG_TypeName SWIG_Python_TypeName #define SWIG_TypeQuery SWIG_Python_TypeQuery #define SWIG_TypeClientData SWIG_Python_TypeClientData +#define SWIG_PackData SWIG_Python_PackData +#define SWIG_UnpackData SWIG_Python_UnpackData /*********************************************************************** @@ -59,36 +61,35 @@ private: #include -#if defined(_WIN32) || defined(__WIN32__) -# if defined(_MSC_VER) -# if defined(STATIC_LINKED) -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) extern a -# else -# define SWIGEXPORT(a) __declspec(dllexport) a -# define SWIGIMPORT(a) extern a -# endif -# else -# if defined(__BORLANDC__) -# define SWIGEXPORT(a) a _export -# define SWIGIMPORT(a) a _export -# else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a -# endif -# endif +#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(_MSC_VER) || defined(__GNUC__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) extern a +# else +# define SWIGEXPORT(a) __declspec(dllexport) a +# define SWIGIMPORT(a) extern a +# endif +# else +# if defined(__BORLANDC__) +# define SWIGEXPORT(a) a _export +# define SWIGIMPORT(a) a _export +# else +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) a +# endif +# endif #else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) a #endif #ifdef SWIG_GLOBAL -#define SWIGRUNTIME(a) SWIGEXPORT(a) +# define SWIGRUNTIME(a) SWIGEXPORT(a) #else -#define SWIGRUNTIME(a) static a +# define SWIGRUNTIME(a) static a #endif - #ifdef __cplusplus extern "C" { #endif @@ -114,12 +115,16 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **); SWIGIMPORT(const char *) SWIG_TypeName(const swig_type_info *); SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *); SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); +SWIGIMPORT(char *) SWIG_PackData(char *, void *, int); +SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } + #endif + /*********************************************************************** * pyrun.swg for wxPython * @@ -130,7 +135,6 @@ SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); * ************************************************************************/ - #include "Python.h" #ifdef __cplusplus @@ -161,8 +165,6 @@ typedef struct swig_const_info { swig_type_info **ptype; } swig_const_info; - - /* Common SWIG API */ #define SWIG_ConvertPtr(obj, pp, type, flags) \ SWIG_Python_ConvertPtr(obj, pp, type, flags) @@ -178,40 +180,26 @@ typedef struct swig_const_info { SWIG_Python_addvarlink(p, name, get_attr, set_attr) #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \ SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) -#define SWIG_PackData(c, ptr, sz) \ - SWIG_Python_PackData(c, ptr, sz) -#define SWIG_UnpackData(c, ptr, sz) \ - SWIG_Python_UnpackData(c, ptr, sz) #define SWIG_NewPackedObj(ptr, sz, type) \ SWIG_Python_NewPackedObj(ptr, sz, type) #define SWIG_InstallConstants(d, constants) \ SWIG_Python_InstallConstants(d, constants) -SWIGEXPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); -SWIGEXPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); -SWIGEXPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); +SWIGIMPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); +SWIGIMPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); +SWIGIMPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); +SWIGIMPORT(PyObject *) SWIG_Python_newvarlink(void); +SWIGIMPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); +SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); +SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); +SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); -SWIGEXPORT(PyObject *) SWIG_Python_newvarlink(void); -SWIGEXPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); -SWIGEXPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); -SWIGEXPORT(char *) SWIG_Python_PackData(char *c, void *, int); -SWIGEXPORT(char *) SWIG_Python_UnpackData(char *c, void *, int); -SWIGEXPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); -SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); /* Contract support */ -#define SWIG_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else - -#define SWIG_inherit_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_inherit_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else - -#define SWIG_invariant(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_begin(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_end(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else +#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else #ifdef __cplusplus } @@ -222,66 +210,61 @@ SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con /* -------- TYPES TABLE (BEGIN) -------- */ #define SWIGTYPE_p_wxPostScriptDC swig_types[0] -#define SWIGTYPE_p_wxGenericDragImage swig_types[1] -#define SWIGTYPE_p_wxBrush swig_types[2] -#define SWIGTYPE_p_wxColour swig_types[3] -#define SWIGTYPE_p_wxCoord swig_types[4] -#define SWIGTYPE_p_wxDC swig_types[5] -#define SWIGTYPE_p_wxMirrorDC swig_types[6] -#define SWIGTYPE_p_byte swig_types[7] -#define SWIGTYPE_p_wxPyFontEnumerator swig_types[8] -#define SWIGTYPE_p_wxIconLocation swig_types[9] -#define SWIGTYPE_p_wxImage swig_types[10] -#define SWIGTYPE_p_wxMetaFileDC swig_types[11] -#define SWIGTYPE_p_wxMask swig_types[12] -#define SWIGTYPE_p_wxFont swig_types[13] -#define SWIGTYPE_p_wxWindow swig_types[14] -#define SWIGTYPE_p_wxSize swig_types[15] -#define SWIGTYPE_p_double swig_types[16] -#define SWIGTYPE_p_wxMemoryDC swig_types[17] -#define SWIGTYPE_p_wxFontMapper swig_types[18] -#define SWIGTYPE_p_wxListCtrl swig_types[19] -#define SWIGTYPE_p_wxEffects swig_types[20] -#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[21] -#define SWIGTYPE_p_wxPalette swig_types[22] -#define SWIGTYPE_p_wxBitmap swig_types[23] -#define SWIGTYPE_p_wxObject swig_types[24] -#define SWIGTYPE_p_wxRegionIterator swig_types[25] -#define SWIGTYPE_p_wxRect swig_types[26] -#define SWIGTYPE_p_wxString swig_types[27] -#define SWIGTYPE_p_wxPrinterDC swig_types[28] -#define SWIGTYPE_p_wxIconBundle swig_types[29] -#define SWIGTYPE_p_wxPoint swig_types[30] -#define SWIGTYPE_p_wxDash swig_types[31] -#define SWIGTYPE_p_wxScreenDC swig_types[32] -#define SWIGTYPE_p_wxCursor swig_types[33] -#define SWIGTYPE_p_wxClientDC swig_types[34] -#define SWIGTYPE_p_wxTreeCtrl swig_types[35] -#define SWIGTYPE_p_wxBufferedDC swig_types[36] -#define SWIGTYPE_p_wxImageList swig_types[37] -#define SWIGTYPE_p_unsigned_char swig_types[38] -#define SWIGTYPE_p_wxGDIObject swig_types[39] -#define SWIGTYPE_p_wxLocale swig_types[40] -#define SWIGTYPE_p_wxIcon swig_types[41] -#define SWIGTYPE_p_wxRegion swig_types[42] -#define SWIGTYPE_p_wxLanguageInfo swig_types[43] -#define SWIGTYPE_p_wxConfigBase swig_types[44] -#define SWIGTYPE_p_wxWindowDC swig_types[45] -#define SWIGTYPE_p_wxPrintData swig_types[46] -#define SWIGTYPE_p_wxBrushList swig_types[47] -#define SWIGTYPE_p_wxFontList swig_types[48] -#define SWIGTYPE_p_wxPen swig_types[49] -#define SWIGTYPE_p_wxBufferedPaintDC swig_types[50] -#define SWIGTYPE_p_wxPaintDC swig_types[51] -#define SWIGTYPE_p_wxPenList swig_types[52] -#define SWIGTYPE_p_wxTreeItemId swig_types[53] -#define SWIGTYPE_p_wxPyPen swig_types[54] -#define SWIGTYPE_p_int swig_types[55] -#define SWIGTYPE_p_wxMetaFile swig_types[56] -#define SWIGTYPE_p_wxNativeFontInfo swig_types[57] -#define SWIGTYPE_p_wxEncodingConverter swig_types[58] -#define SWIGTYPE_p_wxColourDatabase swig_types[59] -static swig_type_info *swig_types[61]; +#define SWIGTYPE_p_wxBrush swig_types[1] +#define SWIGTYPE_p_wxColour swig_types[2] +#define SWIGTYPE_p_wxDC swig_types[3] +#define SWIGTYPE_p_wxMirrorDC swig_types[4] +#define SWIGTYPE_p_byte swig_types[5] +#define SWIGTYPE_p_wxPyFontEnumerator swig_types[6] +#define SWIGTYPE_p_wxIconLocation swig_types[7] +#define SWIGTYPE_p_wxImage swig_types[8] +#define SWIGTYPE_p_wxMetaFileDC swig_types[9] +#define SWIGTYPE_p_wxMask swig_types[10] +#define SWIGTYPE_p_wxFont swig_types[11] +#define SWIGTYPE_p_wxWindow swig_types[12] +#define SWIGTYPE_p_wxSize swig_types[13] +#define SWIGTYPE_p_double swig_types[14] +#define SWIGTYPE_p_wxMemoryDC swig_types[15] +#define SWIGTYPE_p_wxFontMapper swig_types[16] +#define SWIGTYPE_p_wxEffects swig_types[17] +#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[18] +#define SWIGTYPE_p_wxPalette swig_types[19] +#define SWIGTYPE_p_wxBitmap swig_types[20] +#define SWIGTYPE_p_wxObject swig_types[21] +#define SWIGTYPE_p_wxRegionIterator swig_types[22] +#define SWIGTYPE_p_wxRect swig_types[23] +#define SWIGTYPE_p_wxString swig_types[24] +#define SWIGTYPE_p_wxPrinterDC swig_types[25] +#define SWIGTYPE_p_wxIconBundle swig_types[26] +#define SWIGTYPE_p_wxPoint swig_types[27] +#define SWIGTYPE_p_wxDash swig_types[28] +#define SWIGTYPE_p_wxScreenDC swig_types[29] +#define SWIGTYPE_p_wxCursor swig_types[30] +#define SWIGTYPE_p_wxClientDC swig_types[31] +#define SWIGTYPE_p_wxBufferedDC swig_types[32] +#define SWIGTYPE_p_wxImageList swig_types[33] +#define SWIGTYPE_p_unsigned_char swig_types[34] +#define SWIGTYPE_p_wxGDIObject swig_types[35] +#define SWIGTYPE_p_wxLocale swig_types[36] +#define SWIGTYPE_p_wxIcon swig_types[37] +#define SWIGTYPE_p_wxRegion swig_types[38] +#define SWIGTYPE_p_wxLanguageInfo swig_types[39] +#define SWIGTYPE_p_wxConfigBase swig_types[40] +#define SWIGTYPE_p_wxWindowDC swig_types[41] +#define SWIGTYPE_p_wxPrintData swig_types[42] +#define SWIGTYPE_p_wxBrushList swig_types[43] +#define SWIGTYPE_p_wxFontList swig_types[44] +#define SWIGTYPE_p_wxPen swig_types[45] +#define SWIGTYPE_p_wxBufferedPaintDC swig_types[46] +#define SWIGTYPE_p_wxPaintDC swig_types[47] +#define SWIGTYPE_p_wxPenList swig_types[48] +#define SWIGTYPE_p_wxPyPen swig_types[49] +#define SWIGTYPE_p_int swig_types[50] +#define SWIGTYPE_p_wxMetaFile swig_types[51] +#define SWIGTYPE_p_wxNativeFontInfo swig_types[52] +#define SWIGTYPE_p_wxEncodingConverter swig_types[53] +#define SWIGTYPE_p_wxColourDatabase swig_types[54] +static swig_type_info *swig_types[56]; /* -------- TYPES TABLE (END) -------- */ @@ -296,8 +279,8 @@ static swig_type_info *swig_types[61]; #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" - DECLARE_DEF_STRING(EmptyString); + static const wxString wxPyEmptyString(wxEmptyString); PyObject *wxColour_Get(wxColour *self){ PyObject* rv = PyTuple_New(3); int red = -1; @@ -471,7 +454,7 @@ wxCursor *new_wxCursor(PyObject *bits,int width,int height,int hotSpotX,int hotS wxRegion *new_wxRegion(int points,wxPoint *points_array,int fillStyle){ - PyErr_SetNone(PyExc_NotImplementedError); + wxPyRaiseNotImplemented(); return NULL; } void wxRegionIterator_Next(wxRegionIterator *self){ @@ -543,7 +526,7 @@ PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){ #include "wx/wxPython/pydrawxxx.h" -wxColour wxDC_GetPixelXY(wxDC *self,wxCoord x,wxCoord y){ +wxColour wxDC_GetPixelXY(wxDC *self,int x,int y){ wxColour col; self->GetPixel(x, y, &col); return col; @@ -596,13 +579,13 @@ static void wxDC_GetBoundingBox(wxDC* dc, int* x1, int* y1, int* x2, int* y2) { class wxMetaFile : public wxObject { public: wxMetaFile(const wxString&) - { PyErr_SetNone(PyExc_NotImplementedError); } + { wxPyRaiseNotImplemented(); } }; class wxMetaFileDC : public wxClientDC { public: wxMetaFileDC(const wxString&, int, int, const wxString&) - { PyErr_SetNone(PyExc_NotImplementedError); } + { wxPyRaiseNotImplemented(); } }; @@ -612,9 +595,6 @@ void wxColourDatabase_Append(wxColourDatabase *self,wxString const &name,int red self->AddColour(name, wxColour(red, green, blue)); } -#include - - #include #ifdef __cplusplus @@ -819,7 +799,7 @@ static PyObject *_wrap_new_NamedColour(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxString *arg1 = 0 ; wxColour *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "colorName", NULL @@ -829,7 +809,7 @@ static PyObject *_wrap_new_NamedColour(PyObject *self, PyObject *args, PyObject { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1015,7 +995,7 @@ static PyObject *_wrap_Colour_Set(PyObject *self, PyObject *args, PyObject *kwar } -static PyObject *_wrap_Colour_SetRBG(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Colour_SetRGB(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxColour *arg1 = (wxColour *) 0 ; unsigned long arg2 ; @@ -1025,7 +1005,7 @@ static PyObject *_wrap_Colour_SetRBG(PyObject *self, PyObject *args, PyObject *k (char *) "self",(char *) "colRGB", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour_SetRBG",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour_SetRGB",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (unsigned long) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; @@ -1107,6 +1087,46 @@ static PyObject *_wrap_Colour___ne__(PyObject *self, PyObject *args, PyObject *k } +static PyObject *_wrap_Colour_InitFromName(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColour *arg1 = (wxColour *) 0 ; + wxString *arg2 = 0 ; + bool temp2 = False ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "colourName", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour_InitFromName",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->InitFromName((wxString const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp2) + delete arg2; + } + return resultobj; + fail: + { + if (temp2) + delete arg2; + } + return NULL; +} + + static PyObject *_wrap_Colour_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxColour *arg1 = (wxColour *) 0 ; @@ -2127,7 +2147,7 @@ static PyObject *_wrap_new_Bitmap(PyObject *self, PyObject *args, PyObject *kwar wxString *arg1 = 0 ; int arg2 = (int) wxBITMAP_TYPE_ANY ; wxBitmap *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "name",(char *) "type", NULL @@ -2137,7 +2157,7 @@ static PyObject *_wrap_new_Bitmap(PyObject *self, PyObject *args, PyObject *kwar { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2575,7 +2595,7 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject int arg3 ; wxPalette *arg4 = (wxPalette *) (wxPalette *) NULL ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj3 = 0 ; @@ -2588,7 +2608,7 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -2621,7 +2641,7 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *self, PyObject *args, PyObject wxString *arg2 = 0 ; int arg3 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -2633,7 +2653,7 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2847,7 +2867,7 @@ static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs int arg3 = (int) -1 ; int arg4 = (int) -1 ; wxIcon *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "name",(char *) "flags",(char *) "desiredWidth",(char *) "desiredHeight", NULL @@ -2857,7 +2877,7 @@ static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3225,6 +3245,7 @@ static PyObject *_wrap_new_IconLocation(PyObject *self, PyObject *args, PyObject wxString *arg1 = (wxString *) &wxPyEmptyString ; int arg2 = (int) 0 ; wxIconLocation *result; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "filename",(char *) "num", NULL @@ -3232,7 +3253,11 @@ static PyObject *_wrap_new_IconLocation(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Oi:new_IconLocation",kwnames,&obj0,&arg2)) goto fail; if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = True; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3242,8 +3267,16 @@ static PyObject *_wrap_new_IconLocation(PyObject *self, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxIconLocation, 1); + { + if (temp1) + delete arg1; + } return resultobj; fail: + { + if (temp1) + delete arg1; + } return NULL; } @@ -3301,7 +3334,7 @@ static PyObject *_wrap_IconLocation_SetFileName(PyObject *self, PyObject *args, PyObject *resultobj; wxIconLocation *arg1 = (wxIconLocation *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -3313,7 +3346,7 @@ static PyObject *_wrap_IconLocation_SetFileName(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3358,7 +3391,13 @@ static PyObject *_wrap_IconLocation_GetFileName(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -3449,7 +3488,7 @@ static PyObject *_wrap_new_IconBundleFromFile(PyObject *self, PyObject *args, Py wxString *arg1 = 0 ; long arg2 ; wxIconBundle *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "file",(char *) "type", NULL @@ -3459,7 +3498,7 @@ static PyObject *_wrap_new_IconBundleFromFile(PyObject *self, PyObject *args, Py { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3570,7 +3609,7 @@ static PyObject *_wrap_IconBundle_AddIconFromFile(PyObject *self, PyObject *args wxIconBundle *arg1 = (wxIconBundle *) 0 ; wxString *arg2 = 0 ; long arg3 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -3582,7 +3621,7 @@ static PyObject *_wrap_IconBundle_AddIconFromFile(PyObject *self, PyObject *args { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3655,13 +3694,18 @@ static PyObject *_wrap_new_Cursor(PyObject *self, PyObject *args, PyObject *kwar int arg3 = (int) 0 ; int arg4 = (int) 0 ; wxCursor *result; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "cursorName",(char *) "flags",(char *) "hotSpotX",(char *) "hotSpotY", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|ii:new_Cursor",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = True; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCursor *)new_wxCursor((wxString const *)arg1,arg2,arg3,arg4); @@ -3670,8 +3714,16 @@ static PyObject *_wrap_new_Cursor(PyObject *self, PyObject *args, PyObject *kwar if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxCursor, 1); + { + if (temp1) + delete arg1; + } return resultobj; fail: + { + if (temp1) + delete arg1; + } return NULL; } @@ -3819,10 +3871,10 @@ static PyObject * Cursor_swigregister(PyObject *self, PyObject *args) { } static PyObject *_wrap_new_Region(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxCoord arg1 = (wxCoord) 0 ; - wxCoord arg2 = (wxCoord) 0 ; - wxCoord arg3 = (wxCoord) 0 ; - wxCoord arg4 = (wxCoord) 0 ; + int arg1 = (int) 0 ; + int arg2 = (int) 0 ; + int arg3 = (int) 0 ; + int arg4 = (int) 0 ; wxRegion *result; char *kwnames[] = { (char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL @@ -3969,8 +4021,8 @@ static PyObject *_wrap_Region_Clear(PyObject *self, PyObject *args, PyObject *kw static PyObject *_wrap_Region_Contains(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRegion *arg1 = (wxRegion *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; int result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -4060,10 +4112,10 @@ static PyObject *_wrap_Region_ContainsRect(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_Region_ContainsRectDim(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRegion *arg1 = (wxRegion *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; - wxCoord arg4 ; - wxCoord arg5 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; int result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -4118,10 +4170,10 @@ static PyObject *_wrap_Region_GetBox(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_Region_Intersect(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRegion *arg1 = (wxRegion *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; - wxCoord arg4 ; - wxCoord arg5 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -4235,10 +4287,10 @@ static PyObject *_wrap_Region_IsEmpty(PyObject *self, PyObject *args, PyObject * static PyObject *_wrap_Region_Union(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRegion *arg1 = (wxRegion *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; - wxCoord arg4 ; - wxCoord arg5 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -4327,10 +4379,10 @@ static PyObject *_wrap_Region_UnionRegion(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_Region_Subtract(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRegion *arg1 = (wxRegion *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; - wxCoord arg4 ; - wxCoord arg5 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -4419,10 +4471,10 @@ static PyObject *_wrap_Region_SubtractRegion(PyObject *self, PyObject *args, PyO static PyObject *_wrap_Region_Xor(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRegion *arg1 = (wxRegion *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; - wxCoord arg4 ; - wxCoord arg5 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -4641,7 +4693,7 @@ static PyObject *_wrap_delete_RegionIterator(PyObject *self, PyObject *args, PyO static PyObject *_wrap_RegionIterator_GetX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRegionIterator *arg1 = (wxRegionIterator *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -4651,7 +4703,7 @@ static PyObject *_wrap_RegionIterator_GetX(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)(arg1)->GetX(); + result = (int)(arg1)->GetX(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -4666,7 +4718,7 @@ static PyObject *_wrap_RegionIterator_GetX(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_RegionIterator_GetY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRegionIterator *arg1 = (wxRegionIterator *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -4676,7 +4728,7 @@ static PyObject *_wrap_RegionIterator_GetY(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)(arg1)->GetY(); + result = (int)(arg1)->GetY(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -4691,7 +4743,7 @@ static PyObject *_wrap_RegionIterator_GetY(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_RegionIterator_GetW(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRegionIterator *arg1 = (wxRegionIterator *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -4701,7 +4753,7 @@ static PyObject *_wrap_RegionIterator_GetW(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)(arg1)->GetW(); + result = (int)(arg1)->GetW(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -4716,7 +4768,7 @@ static PyObject *_wrap_RegionIterator_GetW(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_RegionIterator_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRegionIterator *arg1 = (wxRegionIterator *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -4726,7 +4778,7 @@ static PyObject *_wrap_RegionIterator_GetWidth(PyObject *self, PyObject *args, P if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)(arg1)->GetWidth(); + result = (int)(arg1)->GetWidth(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -4741,7 +4793,7 @@ static PyObject *_wrap_RegionIterator_GetWidth(PyObject *self, PyObject *args, P static PyObject *_wrap_RegionIterator_GetH(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRegionIterator *arg1 = (wxRegionIterator *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -4751,7 +4803,7 @@ static PyObject *_wrap_RegionIterator_GetH(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)(arg1)->GetH(); + result = (int)(arg1)->GetH(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -4766,7 +4818,7 @@ static PyObject *_wrap_RegionIterator_GetH(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_RegionIterator_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRegionIterator *arg1 = (wxRegionIterator *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -4776,7 +4828,7 @@ static PyObject *_wrap_RegionIterator_GetHeight(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)(arg1)->GetHeight(); + result = (int)(arg1)->GetHeight(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -5310,7 +5362,6 @@ static PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *self, PyObject *args PyObject *resultobj; wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; wxString arg2 ; - wxString *argp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5319,8 +5370,12 @@ static PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetFaceName",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; + { + wxString* sptr = wxString_in_helper(obj1); + if (sptr == NULL) SWIG_fail; + arg2 = *sptr; + delete sptr; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFaceName(arg2); @@ -5390,7 +5445,7 @@ static PyObject *_wrap_NativeFontInfo_FromString(PyObject *self, PyObject *args, wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5402,7 +5457,7 @@ static PyObject *_wrap_NativeFontInfo_FromString(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5493,7 +5548,7 @@ static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *self, PyObject *a wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5505,7 +5560,7 @@ static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *self, PyObject *a { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5570,8 +5625,8 @@ static PyObject * NativeFontInfo_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ; - wxString arg2 ; - wxString *argp2 ; + wxString *arg2 = (wxString *) 0 ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5580,13 +5635,24 @@ static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeEncodingInfo_facename_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; - if (arg1) (arg1)->facename = arg2; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + if (arg1) (arg1)->facename = *arg2; Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp2) + delete arg2; + } return resultobj; fail: + { + if (temp2) + delete arg2; + } return NULL; } @@ -5594,7 +5660,7 @@ static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject static PyObject *_wrap_NativeEncodingInfo_facename_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ; - wxString result; + wxString *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -5602,13 +5668,13 @@ static PyObject *_wrap_NativeEncodingInfo_facename_get(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeEncodingInfo_facename_get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = ((arg1)->facename); + result = (wxString *)& ((arg1)->facename); { #if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); #else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); #endif } return resultobj; @@ -5708,7 +5774,7 @@ static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *self, PyObject *a wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5720,7 +5786,7 @@ static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *self, PyObject *a { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5930,9 +5996,9 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *self, PyObject *ar PyObject *resultobj; wxFontMapper *arg1 = (wxFontMapper *) 0 ; wxString *arg2 = 0 ; - bool arg3 = (bool) true ; + bool arg3 = (bool) True ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -5945,7 +6011,7 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *self, PyObject *ar { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } if (obj2) { arg3 = PyInt_AsLong(obj2) ? true : false; @@ -6110,7 +6176,7 @@ static PyObject *_wrap_FontMapper_SetConfigPath(PyObject *self, PyObject *args, PyObject *resultobj; wxFontMapper *arg1 = (wxFontMapper *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6122,7 +6188,7 @@ static PyObject *_wrap_FontMapper_SetConfigPath(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6180,9 +6246,9 @@ static PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *self, PyObject *ar int arg2 ; wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; - bool arg4 = (bool) TRUE ; + bool arg4 = (bool) True ; PyObject *result; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -6196,7 +6262,7 @@ static PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *self, PyObject *ar { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } if (obj3) { @@ -6232,7 +6298,7 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *self, PyObject * wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; bool result; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { @@ -6245,7 +6311,7 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *self, PyObject * { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } { @@ -6301,7 +6367,7 @@ static PyObject *_wrap_FontMapper_SetDialogTitle(PyObject *self, PyObject *args, PyObject *resultobj; wxFontMapper *arg1 = (wxFontMapper *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6313,7 +6379,7 @@ static PyObject *_wrap_FontMapper_SetDialogTitle(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6350,12 +6416,12 @@ static PyObject *_wrap_new_Font(PyObject *self, PyObject *args, PyObject *kwargs int arg2 ; int arg3 ; int arg4 ; - bool arg5 = (bool) FALSE ; + bool arg5 = (bool) False ; wxString const &arg6_defvalue = wxPyEmptyString ; wxString *arg6 = (wxString *) &arg6_defvalue ; int arg7 = (int) wxFONTENCODING_DEFAULT ; wxFont *result; - bool temp6 = false ; + bool temp6 = False ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { @@ -6371,7 +6437,7 @@ static PyObject *_wrap_new_Font(PyObject *self, PyObject *args, PyObject *kwargs { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -6452,7 +6518,7 @@ static PyObject *_wrap_new_FontFromNativeInfoString(PyObject *self, PyObject *ar PyObject *resultobj; wxString *arg1 = 0 ; wxFont *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "info", NULL @@ -6462,7 +6528,7 @@ static PyObject *_wrap_new_FontFromNativeInfoString(PyObject *self, PyObject *ar { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6495,7 +6561,7 @@ static PyObject *_wrap_new_Font2(PyObject *self, PyObject *args, PyObject *kwarg wxString *arg4 = (wxString *) &arg4_defvalue ; int arg5 = (int) wxFONTENCODING_DEFAULT ; wxFont *result; - bool temp4 = false ; + bool temp4 = False ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "pointSize",(char *) "family",(char *) "flags",(char *) "face",(char *) "encoding", NULL @@ -6506,7 +6572,7 @@ static PyObject *_wrap_new_Font2(PyObject *self, PyObject *args, PyObject *kwarg { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { @@ -7015,7 +7081,7 @@ static PyObject *_wrap_Font_SetFaceName(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7027,7 +7093,7 @@ static PyObject *_wrap_Font_SetFaceName(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7138,7 +7204,7 @@ static PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *self, PyObject PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7150,7 +7216,7 @@ static PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *self, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7178,7 +7244,7 @@ static PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *self, PyObject * PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7190,7 +7256,7 @@ static PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *self, PyObject * { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7310,7 +7376,7 @@ static PyObject *_wrap_Font_GetWeightString(PyObject *self, PyObject *args, PyOb static PyObject *_wrap_Font_SetNoAntiAliasing(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7497,7 +7563,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *self, PyObjec PyObject *resultobj; wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ; int arg2 = (int) wxFONTENCODING_SYSTEM ; - bool arg3 = (bool) FALSE ; + bool arg3 = (bool) False ; bool result; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; @@ -7531,7 +7597,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *self, PyObjec wxString const &arg2_defvalue = wxPyEmptyString ; wxString *arg2 = (wxString *) &arg2_defvalue ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7544,7 +7610,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *self, PyObjec { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } } { @@ -7669,8 +7735,8 @@ static PyObject *_wrap_LanguageInfo_Language_get(PyObject *self, PyObject *args, static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ; - wxString arg2 ; - wxString *argp2 ; + wxString *arg2 = (wxString *) 0 ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7679,13 +7745,24 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_CanonicalName_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; - if (arg1) (arg1)->CanonicalName = arg2; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + if (arg1) (arg1)->CanonicalName = *arg2; Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp2) + delete arg2; + } return resultobj; fail: + { + if (temp2) + delete arg2; + } return NULL; } @@ -7693,7 +7770,7 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject * static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ; - wxString result; + wxString *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -7701,13 +7778,13 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LanguageInfo_CanonicalName_get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = ((arg1)->CanonicalName); + result = (wxString *)& ((arg1)->CanonicalName); { #if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); #else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); #endif } return resultobj; @@ -7719,8 +7796,8 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject * static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ; - wxString arg2 ; - wxString *argp2 ; + wxString *arg2 = (wxString *) 0 ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7729,13 +7806,24 @@ static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_Description_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; - if (arg1) (arg1)->Description = arg2; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + if (arg1) (arg1)->Description = *arg2; Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp2) + delete arg2; + } return resultobj; fail: + { + if (temp2) + delete arg2; + } return NULL; } @@ -7743,7 +7831,7 @@ static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *ar static PyObject *_wrap_LanguageInfo_Description_get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ; - wxString result; + wxString *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -7751,13 +7839,13 @@ static PyObject *_wrap_LanguageInfo_Description_get(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LanguageInfo_Description_get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = ((arg1)->Description); + result = (wxString *)& ((arg1)->Description); { #if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); #else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); #endif } return resultobj; @@ -7829,12 +7917,12 @@ static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kw wxString *arg3 = (wxString *) &arg3_defvalue ; wxString const &arg4_defvalue = wxPyEmptyString ; wxString *arg4 = (wxString *) &arg4_defvalue ; - bool arg5 = (bool) TRUE ; - bool arg6 = (bool) FALSE ; + bool arg5 = (bool) True ; + bool arg6 = (bool) False ; bool result; - bool temp2 = false ; - bool temp3 = false ; - bool temp4 = false ; + bool temp2 = False ; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -7850,20 +7938,20 @@ static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kw { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } if (obj4) { @@ -8157,7 +8245,7 @@ static PyObject *_wrap_Locale_GetCanonicalName(PyObject *self, PyObject *args, P static PyObject *_wrap_Locale_AddCatalogLookupPathPrefix(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "prefix", NULL @@ -8167,7 +8255,7 @@ static PyObject *_wrap_Locale_AddCatalogLookupPathPrefix(PyObject *self, PyObjec { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8196,7 +8284,7 @@ static PyObject *_wrap_Locale_AddCatalog(PyObject *self, PyObject *args, PyObjec wxLocale *arg1 = (wxLocale *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8208,7 +8296,7 @@ static PyObject *_wrap_Locale_AddCatalog(PyObject *self, PyObject *args, PyObjec { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8237,7 +8325,7 @@ static PyObject *_wrap_Locale_IsLoaded(PyObject *self, PyObject *args, PyObject wxLocale *arg1 = (wxLocale *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8249,7 +8337,7 @@ static PyObject *_wrap_Locale_IsLoaded(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8329,7 +8417,7 @@ static PyObject *_wrap_Locale_FindLanguageInfo(PyObject *self, PyObject *args, P PyObject *resultobj; wxString *arg1 = 0 ; wxLanguageInfo *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "locale", NULL @@ -8339,7 +8427,7 @@ static PyObject *_wrap_Locale_FindLanguageInfo(PyObject *self, PyObject *args, P { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8397,8 +8485,8 @@ static PyObject *_wrap_Locale_GetString(PyObject *self, PyObject *args, PyObject wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; wxString result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -8411,13 +8499,13 @@ static PyObject *_wrap_Locale_GetString(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } { @@ -8477,7 +8565,13 @@ static PyObject *_wrap_Locale_GetName(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -8517,14 +8611,14 @@ static PyObject *_wrap_GetTranslation__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; wxString *arg1 = 0 ; wxString result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:GetTranslation",&obj0)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8560,8 +8654,8 @@ static PyObject *_wrap_GetTranslation__SWIG_1(PyObject *self, PyObject *args) { wxString *arg2 = 0 ; size_t arg3 ; wxString result; - bool temp1 = false ; - bool temp2 = false ; + bool temp1 = False ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -8570,12 +8664,12 @@ static PyObject *_wrap_GetTranslation__SWIG_1(PyObject *self, PyObject *args) { { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } arg3 = (size_t) PyInt_AsLong(obj2); if (PyErr_Occurred()) SWIG_fail; @@ -8755,7 +8849,7 @@ static PyObject *_wrap_EncodingConverter_Convert(PyObject *self, PyObject *args, wxEncodingConverter *arg1 = (wxEncodingConverter *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -8767,7 +8861,7 @@ static PyObject *_wrap_EncodingConverter_Convert(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8964,8 +9058,8 @@ static PyObject *_wrap_DC_EndDrawing(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_DC_FloodFillXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; wxColour *arg4 = 0 ; int arg5 = (int) wxFLOOD_SURFACE ; bool result; @@ -9039,8 +9133,8 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw static PyObject *_wrap_DC_GetPixelXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; wxColour result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -9106,10 +9200,10 @@ static PyObject *_wrap_DC_GetPixel(PyObject *self, PyObject *args, PyObject *kwa static PyObject *_wrap_DC_DrawLineXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; - wxCoord arg4 ; - wxCoord arg5 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL @@ -9172,8 +9266,8 @@ static PyObject *_wrap_DC_DrawLine(PyObject *self, PyObject *args, PyObject *kwa static PyObject *_wrap_DC_CrossHairXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL @@ -9229,12 +9323,12 @@ static PyObject *_wrap_DC_CrossHair(PyObject *self, PyObject *args, PyObject *kw static PyObject *_wrap_DC_DrawArcXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; - wxCoord arg4 ; - wxCoord arg5 ; - wxCoord arg6 ; - wxCoord arg7 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; + int arg6 ; + int arg7 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2",(char *) "xc",(char *) "yc", NULL @@ -9304,10 +9398,10 @@ static PyObject *_wrap_DC_DrawArc(PyObject *self, PyObject *args, PyObject *kwar static PyObject *_wrap_DC_DrawCheckMarkXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; - wxCoord arg4 ; - wxCoord arg5 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL @@ -9363,10 +9457,10 @@ static PyObject *_wrap_DC_DrawCheckMark(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_DC_DrawEllipticArcXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; - wxCoord arg4 ; - wxCoord arg5 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; double arg6 ; double arg7 ; PyObject * obj0 = 0 ; @@ -9433,8 +9527,8 @@ static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_DC_DrawPointXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL @@ -9490,10 +9584,10 @@ static PyObject *_wrap_DC_DrawPoint(PyObject *self, PyObject *args, PyObject *kw static PyObject *_wrap_DC_DrawRectangleXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; - wxCoord arg4 ; - wxCoord arg5 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL @@ -9587,10 +9681,10 @@ static PyObject *_wrap_DC_DrawRectangleRect(PyObject *self, PyObject *args, PyOb static PyObject *_wrap_DC_DrawRoundedRectangleXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; - wxCoord arg4 ; - wxCoord arg5 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; double arg6 ; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -9687,9 +9781,9 @@ static PyObject *_wrap_DC_DrawRoundedRectangleRect(PyObject *self, PyObject *arg static PyObject *_wrap_DC_DrawCircleXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; - wxCoord arg4 ; + int arg2 ; + int arg3 ; + int arg4 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "radius", NULL @@ -9715,7 +9809,7 @@ static PyObject *_wrap_DC_DrawCircle(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxPoint *arg2 = 0 ; - wxCoord arg3 ; + int arg3 ; wxPoint temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -9746,10 +9840,10 @@ static PyObject *_wrap_DC_DrawCircle(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_DC_DrawEllipseXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; - wxCoord arg4 ; - wxCoord arg5 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL @@ -9844,8 +9938,8 @@ static PyObject *_wrap_DC_DrawIconXY(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxIcon *arg2 = 0 ; - wxCoord arg3 ; - wxCoord arg4 ; + int arg3 ; + int arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -9913,9 +10007,9 @@ static PyObject *_wrap_DC_DrawBitmapXY(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxBitmap *arg2 = 0 ; - wxCoord arg3 ; - wxCoord arg4 ; - bool arg5 = (bool) FALSE ; + int arg3 ; + int arg4 ; + bool arg5 = (bool) False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj4 = 0 ; @@ -9952,7 +10046,7 @@ static PyObject *_wrap_DC_DrawBitmap(PyObject *self, PyObject *args, PyObject *k wxDC *arg1 = (wxDC *) 0 ; wxBitmap *arg2 = 0 ; wxPoint *arg3 = 0 ; - bool arg4 = (bool) FALSE ; + bool arg4 = (bool) False ; wxPoint temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -9994,9 +10088,9 @@ static PyObject *_wrap_DC_DrawTextXY(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxString *arg2 = 0 ; - wxCoord arg3 ; - wxCoord arg4 ; - bool temp2 = false ; + int arg3 ; + int arg4 ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10008,7 +10102,7 @@ static PyObject *_wrap_DC_DrawTextXY(PyObject *self, PyObject *args, PyObject *k { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10037,7 +10131,7 @@ static PyObject *_wrap_DC_DrawText(PyObject *self, PyObject *args, PyObject *kwa wxDC *arg1 = (wxDC *) 0 ; wxString *arg2 = 0 ; wxPoint *arg3 = 0 ; - bool temp2 = false ; + bool temp2 = False ; wxPoint temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -10051,7 +10145,7 @@ static PyObject *_wrap_DC_DrawText(PyObject *self, PyObject *args, PyObject *kwa { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = &temp3; @@ -10083,10 +10177,10 @@ static PyObject *_wrap_DC_DrawRotatedTextXY(PyObject *self, PyObject *args, PyOb PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxString *arg2 = 0 ; - wxCoord arg3 ; - wxCoord arg4 ; + int arg3 ; + int arg4 ; double arg5 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10098,7 +10192,7 @@ static PyObject *_wrap_DC_DrawRotatedTextXY(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10128,7 +10222,7 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObje wxString *arg2 = 0 ; wxPoint *arg3 = 0 ; double arg4 ; - bool temp2 = false ; + bool temp2 = False ; wxPoint temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -10142,7 +10236,7 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObje { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = &temp3; @@ -10173,17 +10267,17 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_DC_BlitXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; - wxCoord arg4 ; - wxCoord arg5 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; wxDC *arg6 = (wxDC *) 0 ; - wxCoord arg7 ; - wxCoord arg8 ; + int arg7 ; + int arg8 ; int arg9 = (int) wxCOPY ; - bool arg10 = (bool) FALSE ; - wxCoord arg11 = (wxCoord) -1 ; - wxCoord arg12 = (wxCoord) -1 ; + bool arg10 = (bool) False ; + int arg11 = (int) -1 ; + int arg12 = (int) -1 ; bool result; PyObject * obj0 = 0 ; PyObject * obj5 = 0 ; @@ -10221,7 +10315,7 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) wxDC *arg4 = (wxDC *) 0 ; wxPoint *arg5 = 0 ; int arg6 = (int) wxCOPY ; - bool arg7 = (bool) FALSE ; + bool arg7 = (bool) False ; wxPoint const &arg8_defvalue = wxDefaultPosition ; wxPoint *arg8 = (wxPoint *) &arg8_defvalue ; bool result; @@ -10284,8 +10378,8 @@ static PyObject *_wrap_DC_DrawLines(PyObject *self, PyObject *args, PyObject *kw wxDC *arg1 = (wxDC *) 0 ; int arg2 ; wxPoint *arg3 = (wxPoint *) 0 ; - wxCoord arg4 = (wxCoord) 0 ; - wxCoord arg5 = (wxCoord) 0 ; + int arg4 = (int) 0 ; + int arg5 = (int) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10323,8 +10417,8 @@ static PyObject *_wrap_DC_DrawPolygon(PyObject *self, PyObject *args, PyObject * wxDC *arg1 = (wxDC *) 0 ; int arg2 ; wxPoint *arg3 = (wxPoint *) 0 ; - wxCoord arg4 = (wxCoord) 0 ; - wxCoord arg5 = (wxCoord) 0 ; + int arg4 = (int) 0 ; + int arg5 = (int) 0 ; int arg6 = (int) wxODDEVEN_RULE ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -10365,7 +10459,7 @@ static PyObject *_wrap_DC_DrawLabel(PyObject *self, PyObject *args, PyObject *kw wxRect *arg3 = 0 ; int arg4 = (int) wxALIGN_LEFT|wxALIGN_TOP ; int arg5 = (int) -1 ; - bool temp2 = false ; + bool temp2 = False ; wxRect temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -10379,7 +10473,7 @@ static PyObject *_wrap_DC_DrawLabel(PyObject *self, PyObject *args, PyObject *kw { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = &temp3; @@ -10416,7 +10510,7 @@ static PyObject *_wrap_DC_DrawImageLabel(PyObject *self, PyObject *args, PyObjec int arg5 = (int) wxALIGN_LEFT|wxALIGN_TOP ; int arg6 = (int) -1 ; wxRect result; - bool temp2 = false ; + bool temp2 = False ; wxRect temp4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -10431,7 +10525,7 @@ static PyObject *_wrap_DC_DrawImageLabel(PyObject *self, PyObject *args, PyObjec { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { @@ -10533,7 +10627,7 @@ static PyObject *_wrap_DC_StartDoc(PyObject *self, PyObject *args, PyObject *kwa wxDC *arg1 = (wxDC *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10545,7 +10639,7 @@ static PyObject *_wrap_DC_StartDoc(PyObject *self, PyObject *args, PyObject *kwa { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10816,19 +10910,19 @@ static PyObject *_wrap_DC_SetPalette(PyObject *self, PyObject *args, PyObject *k } -static PyObject *_wrap_DC_SetClippingRegion(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_SetClippingRegionXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; - wxCoord arg4 ; - wxCoord arg5 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_SetClippingRegion",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_SetClippingRegionXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10844,26 +10938,33 @@ static PyObject *_wrap_DC_SetClippingRegion(PyObject *self, PyObject *args, PyOb } -static PyObject *_wrap_DC_SetClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_SetClippingRegion(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxRect *arg2 = 0 ; - wxRect temp2 ; + wxPoint *arg2 = 0 ; + wxSize *arg3 = 0 ; + wxPoint temp2 ; + wxSize temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "rect", NULL + (char *) "self",(char *) "pt",(char *) "sz", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetClippingRect",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetClippingRegion",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; - if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetClippingRegion((wxRect const &)*arg2); + (arg1)->SetClippingRegion((wxPoint const &)*arg2,(wxSize const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -10875,24 +10976,55 @@ static PyObject *_wrap_DC_SetClippingRect(PyObject *self, PyObject *args, PyObje } -static PyObject *_wrap_DC_SetClippingRegionAsRegion(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_SetClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxRegion *arg2 = 0 ; + wxRect *arg2 = 0 ; + wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "region", NULL + (char *) "self",(char *) "rect", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetClippingRegionAsRegion",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetClippingRect",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { - PyThreadState* __tstate = wxPyBeginAllowThreads(); + arg2 = &temp2; + if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetClippingRegion((wxRect const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_DC_SetClippingRegionAsRegion(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxDC *arg1 = (wxDC *) 0 ; + wxRegion *arg2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "region", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetClippingRegionAsRegion",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg2 == NULL) { + PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetClippingRegion((wxRegion const &)*arg2); wxPyEndAllowThreads(__tstate); @@ -10932,14 +11064,14 @@ static PyObject *_wrap_DC_DestroyClippingRegion(PyObject *self, PyObject *args, static PyObject *_wrap_DC_GetClippingBox(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord *arg2 = (wxCoord *) 0 ; - wxCoord *arg3 = (wxCoord *) 0 ; - wxCoord *arg4 = (wxCoord *) 0 ; - wxCoord *arg5 = (wxCoord *) 0 ; - wxCoord temp2 ; - wxCoord temp3 ; - wxCoord temp4 ; - wxCoord temp5 ; + int *arg2 = (int *) 0 ; + int *arg3 = (int *) 0 ; + int *arg4 = (int *) 0 ; + int *arg5 = (int *) 0 ; + int temp2 ; + int temp3 ; + int temp4 ; + int temp5 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -11013,7 +11145,7 @@ static PyObject *_wrap_DC_GetClippingRect(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_DC_GetCharHeight(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -11023,7 +11155,7 @@ static PyObject *_wrap_DC_GetCharHeight(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxDC const *)arg1)->GetCharHeight(); + result = (int)((wxDC const *)arg1)->GetCharHeight(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11038,7 +11170,7 @@ static PyObject *_wrap_DC_GetCharHeight(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_DC_GetCharWidth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -11048,7 +11180,7 @@ static PyObject *_wrap_DC_GetCharWidth(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxDC const *)arg1)->GetCharWidth(); + result = (int)((wxDC const *)arg1)->GetCharWidth(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11064,11 +11196,11 @@ static PyObject *_wrap_DC_GetTextExtent(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxString *arg2 = 0 ; - wxCoord *arg3 = (wxCoord *) 0 ; - wxCoord *arg4 = (wxCoord *) 0 ; - bool temp2 = false ; - wxCoord temp3 ; - wxCoord temp4 ; + int *arg3 = (int *) 0 ; + int *arg4 = (int *) 0 ; + bool temp2 = False ; + int temp3 ; + int temp4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -11082,7 +11214,7 @@ static PyObject *_wrap_DC_GetTextExtent(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11118,16 +11250,16 @@ static PyObject *_wrap_DC_GetFullTextExtent(PyObject *self, PyObject *args, PyOb PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxString *arg2 = 0 ; - wxCoord *arg3 = (wxCoord *) 0 ; - wxCoord *arg4 = (wxCoord *) 0 ; - wxCoord *arg5 = (wxCoord *) 0 ; - wxCoord *arg6 = (wxCoord *) 0 ; + int *arg3 = (int *) 0 ; + int *arg4 = (int *) 0 ; + int *arg5 = (int *) 0 ; + int *arg6 = (int *) 0 ; wxFont *arg7 = (wxFont *) NULL ; - bool temp2 = false ; - wxCoord temp3 ; - wxCoord temp4 ; - wxCoord temp5 ; - wxCoord temp6 ; + bool temp2 = False ; + int temp3 ; + int temp4 ; + int temp5 ; + int temp6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11144,7 +11276,7 @@ static PyObject *_wrap_DC_GetFullTextExtent(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } if (obj2) { if ((SWIG_ConvertPtr(obj2,(void **) &arg7, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -11191,14 +11323,14 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args, PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxString *arg2 = 0 ; - wxCoord *arg3 = (wxCoord *) 0 ; - wxCoord *arg4 = (wxCoord *) 0 ; - wxCoord *arg5 = (wxCoord *) 0 ; + int *arg3 = (int *) 0 ; + int *arg4 = (int *) 0 ; + int *arg5 = (int *) 0 ; wxFont *arg6 = (wxFont *) NULL ; - bool temp2 = false ; - wxCoord temp3 ; - wxCoord temp4 ; - wxCoord temp5 ; + bool temp2 = False ; + int temp3 ; + int temp4 ; + int temp5 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11214,7 +11346,7 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } if (obj2) { if ((SWIG_ConvertPtr(obj2,(void **) &arg6, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -11253,6 +11385,35 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args, } +static PyObject *_wrap_DC_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxDC *arg1 = (wxDC *) 0 ; + wxSize result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetSize",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->GetSize(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxSize * resultptr; + resultptr = new wxSize((wxSize &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_DC_GetSizeTuple(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; @@ -11291,7 +11452,7 @@ static PyObject *_wrap_DC_GetSizeTuple(PyObject *self, PyObject *args, PyObject } -static PyObject *_wrap_DC_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_GetSizeMM(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxSize result; @@ -11300,11 +11461,11 @@ static PyObject *_wrap_DC_GetSize(PyObject *self, PyObject *args, PyObject *kwar (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetSizeMM",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetSize(); + result = ((wxDC const *)arg1)->GetSizeMM(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11320,7 +11481,7 @@ static PyObject *_wrap_DC_GetSize(PyObject *self, PyObject *args, PyObject *kwar } -static PyObject *_wrap_DC_GetSizeMMWH(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_GetSizeMMTuple(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; int *arg2 = (int *) 0 ; @@ -11334,7 +11495,7 @@ static PyObject *_wrap_DC_GetSizeMMWH(PyObject *self, PyObject *args, PyObject * arg2 = &temp2; arg3 = &temp3; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetSizeMMWH",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetSizeMMTuple",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11358,40 +11519,11 @@ static PyObject *_wrap_DC_GetSizeMMWH(PyObject *self, PyObject *args, PyObject * } -static PyObject *_wrap_DC_GetSizeMM(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxDC *arg1 = (wxDC *) 0 ; - wxSize result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetSizeMM",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxDC const *)arg1)->GetSizeMM(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - wxSize * resultptr; - resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); - } - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord result; + int arg2 ; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL @@ -11401,7 +11533,7 @@ static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxDC const *)arg1)->DeviceToLogicalX(arg2); + result = (int)((wxDC const *)arg1)->DeviceToLogicalX(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11416,8 +11548,8 @@ static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord result; + int arg2 ; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL @@ -11427,7 +11559,7 @@ static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxDC const *)arg1)->DeviceToLogicalY(arg2); + result = (int)((wxDC const *)arg1)->DeviceToLogicalY(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11442,8 +11574,8 @@ static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord result; + int arg2 ; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL @@ -11453,7 +11585,7 @@ static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxDC const *)arg1)->DeviceToLogicalXRel(arg2); + result = (int)((wxDC const *)arg1)->DeviceToLogicalXRel(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11468,8 +11600,8 @@ static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *self, PyObject *args, Py static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord result; + int arg2 ; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL @@ -11479,7 +11611,7 @@ static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxDC const *)arg1)->DeviceToLogicalYRel(arg2); + result = (int)((wxDC const *)arg1)->DeviceToLogicalYRel(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11494,8 +11626,8 @@ static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *self, PyObject *args, Py static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord result; + int arg2 ; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL @@ -11505,7 +11637,7 @@ static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxDC const *)arg1)->LogicalToDeviceX(arg2); + result = (int)((wxDC const *)arg1)->LogicalToDeviceX(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11520,8 +11652,8 @@ static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord result; + int arg2 ; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL @@ -11531,7 +11663,7 @@ static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxDC const *)arg1)->LogicalToDeviceY(arg2); + result = (int)((wxDC const *)arg1)->LogicalToDeviceY(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11546,8 +11678,8 @@ static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord result; + int arg2 ; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL @@ -11557,7 +11689,7 @@ static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxDC const *)arg1)->LogicalToDeviceXRel(arg2); + result = (int)((wxDC const *)arg1)->LogicalToDeviceXRel(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11572,8 +11704,8 @@ static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *self, PyObject *args, Py static PyObject *_wrap_DC_LogicalToDeviceYRel(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord result; + int arg2 ; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL @@ -11583,7 +11715,7 @@ static PyObject *_wrap_DC_LogicalToDeviceYRel(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxDC const *)arg1)->LogicalToDeviceYRel(arg2); + result = (int)((wxDC const *)arg1)->LogicalToDeviceYRel(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12157,37 +12289,28 @@ static PyObject *_wrap_DC_SetLogicalScale(PyObject *self, PyObject *args, PyObje } -static PyObject *_wrap_DC_GetLogicalOriginTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_GetLogicalOrigin(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord *arg2 = (wxCoord *) 0 ; - wxCoord *arg3 = (wxCoord *) 0 ; - wxCoord temp2 ; - wxCoord temp3 ; + wxPoint result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - arg2 = &temp2; - arg3 = &temp3; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetLogicalOriginTuple",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetLogicalOrigin",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxDC const *)arg1)->GetLogicalOrigin(arg2,arg3); + result = ((wxDC const *)arg1)->GetLogicalOrigin(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyInt_FromLong((long) (*arg2)); - resultobj = t_output_helper(resultobj,o); - } { - PyObject *o = PyInt_FromLong((long) (*arg3)); - resultobj = t_output_helper(resultobj,o); + wxPoint * resultptr; + resultptr = new wxPoint((wxPoint &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -12195,28 +12318,37 @@ static PyObject *_wrap_DC_GetLogicalOriginTuple(PyObject *self, PyObject *args, } -static PyObject *_wrap_DC_GetLogicalOrigin(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_GetLogicalOriginTuple(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxPoint result; + int *arg2 = (int *) 0 ; + int *arg3 = (int *) 0 ; + int temp2 ; + int temp3 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetLogicalOrigin",kwnames,&obj0)) goto fail; + arg2 = &temp2; + arg3 = &temp3; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetLogicalOriginTuple",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxDC const *)arg1)->GetLogicalOrigin(); + ((wxDC const *)arg1)->GetLogicalOrigin(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } + Py_INCREF(Py_None); resultobj = Py_None; { - wxPoint * resultptr; - resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + PyObject *o = PyInt_FromLong((long) (*arg2)); + resultobj = t_output_helper(resultobj,o); + } + { + PyObject *o = PyInt_FromLong((long) (*arg3)); + resultobj = t_output_helper(resultobj,o); } return resultobj; fail: @@ -12227,8 +12359,8 @@ static PyObject *_wrap_DC_GetLogicalOrigin(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_DC_SetLogicalOrigin(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL @@ -12250,37 +12382,28 @@ static PyObject *_wrap_DC_SetLogicalOrigin(PyObject *self, PyObject *args, PyObj } -static PyObject *_wrap_DC_GetDeviceOriginTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_GetDeviceOrigin(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord *arg2 = (wxCoord *) 0 ; - wxCoord *arg3 = (wxCoord *) 0 ; - wxCoord temp2 ; - wxCoord temp3 ; + wxPoint result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - arg2 = &temp2; - arg3 = &temp3; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetDeviceOriginTuple",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetDeviceOrigin",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxDC const *)arg1)->GetDeviceOrigin(arg2,arg3); + result = ((wxDC const *)arg1)->GetDeviceOrigin(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyInt_FromLong((long) (*arg2)); - resultobj = t_output_helper(resultobj,o); - } { - PyObject *o = PyInt_FromLong((long) (*arg3)); - resultobj = t_output_helper(resultobj,o); + wxPoint * resultptr; + resultptr = new wxPoint((wxPoint &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -12288,28 +12411,37 @@ static PyObject *_wrap_DC_GetDeviceOriginTuple(PyObject *self, PyObject *args, P } -static PyObject *_wrap_DC_GetDeviceOrigin(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_GetDeviceOriginTuple(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxPoint result; + int *arg2 = (int *) 0 ; + int *arg3 = (int *) 0 ; + int temp2 ; + int temp3 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetDeviceOrigin",kwnames,&obj0)) goto fail; + arg2 = &temp2; + arg3 = &temp3; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetDeviceOriginTuple",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxDC const *)arg1)->GetDeviceOrigin(); + ((wxDC const *)arg1)->GetDeviceOrigin(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } + Py_INCREF(Py_None); resultobj = Py_None; { - wxPoint * resultptr; - resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + PyObject *o = PyInt_FromLong((long) (*arg2)); + resultobj = t_output_helper(resultobj,o); + } + { + PyObject *o = PyInt_FromLong((long) (*arg3)); + resultobj = t_output_helper(resultobj,o); } return resultobj; fail: @@ -12320,8 +12452,8 @@ static PyObject *_wrap_DC_GetDeviceOrigin(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_DC_SetDeviceOrigin(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL @@ -12481,8 +12613,8 @@ static PyObject *_wrap_DC_GetOptimization(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_DC_CalcBoundingBox(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL @@ -12531,7 +12663,7 @@ static PyObject *_wrap_DC_ResetBoundingBox(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_DC_MinX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -12541,7 +12673,7 @@ static PyObject *_wrap_DC_MinX(PyObject *self, PyObject *args, PyObject *kwargs) if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxDC const *)arg1)->MinX(); + result = (int)((wxDC const *)arg1)->MinX(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12556,7 +12688,7 @@ static PyObject *_wrap_DC_MinX(PyObject *self, PyObject *args, PyObject *kwargs) static PyObject *_wrap_DC_MaxX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -12566,7 +12698,7 @@ static PyObject *_wrap_DC_MaxX(PyObject *self, PyObject *args, PyObject *kwargs) if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxDC const *)arg1)->MaxX(); + result = (int)((wxDC const *)arg1)->MaxX(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12581,7 +12713,7 @@ static PyObject *_wrap_DC_MaxX(PyObject *self, PyObject *args, PyObject *kwargs) static PyObject *_wrap_DC_MinY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -12591,7 +12723,7 @@ static PyObject *_wrap_DC_MinY(PyObject *self, PyObject *args, PyObject *kwargs) if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxDC const *)arg1)->MinY(); + result = (int)((wxDC const *)arg1)->MinY(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12606,7 +12738,7 @@ static PyObject *_wrap_DC_MinY(PyObject *self, PyObject *args, PyObject *kwargs) static PyObject *_wrap_DC_MaxY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - wxCoord result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -12616,7 +12748,7 @@ static PyObject *_wrap_DC_MaxY(PyObject *self, PyObject *args, PyObject *kwargs) if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCoord)((wxDC const *)arg1)->MaxY(); + result = (int)((wxDC const *)arg1)->MaxY(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -13502,7 +13634,7 @@ static PyObject *_wrap_new_MetaFile(PyObject *self, PyObject *args, PyObject *kw wxString const &arg1_defvalue = wxPyEmptyString ; wxString *arg1 = (wxString *) &arg1_defvalue ; wxMetaFile *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "filename", NULL @@ -13513,7 +13645,7 @@ static PyObject *_wrap_new_MetaFile(PyObject *self, PyObject *args, PyObject *kw { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } } { @@ -13554,8 +13686,8 @@ static PyObject *_wrap_new_MetaFileDC(PyObject *self, PyObject *args, PyObject * wxString const &arg4_defvalue = wxPyEmptyString ; wxString *arg4 = (wxString *) &arg4_defvalue ; wxMetaFileDC *result; - bool temp1 = false ; - bool temp4 = false ; + bool temp1 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { @@ -13567,14 +13699,14 @@ static PyObject *_wrap_new_MetaFileDC(PyObject *self, PyObject *args, PyObject * { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { @@ -13653,7 +13785,7 @@ static PyObject *_wrap_new_ImageList(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; int arg1 ; int arg2 ; - int arg3 = (int) TRUE ; + int arg3 = (int) True ; int arg4 = (int) 1 ; wxImageList *result; char *kwnames[] = { @@ -13850,7 +13982,7 @@ static PyObject *_wrap_ImageList_Draw(PyObject *self, PyObject *args, PyObject * int arg4 ; int arg5 ; int arg6 = (int) wxIMAGELIST_DRAW_NORMAL ; - bool arg7 = (bool) (bool)FALSE ; + bool arg7 = (bool) (bool)False ; bool result; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; @@ -14295,7 +14427,7 @@ static PyObject *_wrap_ColourDatabase_Find(PyObject *self, PyObject *args, PyObj wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; wxString *arg2 = 0 ; wxColour result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -14307,7 +14439,7 @@ static PyObject *_wrap_ColourDatabase_Find(PyObject *self, PyObject *args, PyObj { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14378,7 +14510,7 @@ static PyObject *_wrap_ColourDatabase_AddColour(PyObject *self, PyObject *args, wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; wxString *arg2 = 0 ; wxColour *arg3 = 0 ; - bool temp2 = false ; + bool temp2 = False ; wxColour temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -14392,7 +14524,7 @@ static PyObject *_wrap_ColourDatabase_AddColour(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = &temp3; @@ -14427,7 +14559,7 @@ static PyObject *_wrap_ColourDatabase_Append(PyObject *self, PyObject *args, PyO int arg3 ; int arg4 ; int arg5 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -14439,7 +14571,7 @@ static PyObject *_wrap_ColourDatabase_Append(PyObject *self, PyObject *args, PyO { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14504,12 +14636,12 @@ static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *self, PyObject *args, int arg3 ; int arg4 ; int arg5 ; - bool arg6 = (bool) FALSE ; + bool arg6 = (bool) False ; wxString const &arg7_defvalue = wxPyEmptyString ; wxString *arg7 = (wxString *) &arg7_defvalue ; int arg8 = (int) wxFONTENCODING_DEFAULT ; wxFont *result; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; @@ -14527,7 +14659,7 @@ static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *self, PyObject *args, { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -15255,634 +15387,29 @@ static PyObject *_wrap_TheColourDatabase_get() { } -static PyObject *_wrap_new_DragImage(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_Effects(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxBitmap *arg1 = 0 ; - wxCursor const &arg2_defvalue = wxNullCursor ; - wxCursor *arg2 = (wxCursor *) &arg2_defvalue ; - wxGenericDragImage *result; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; + wxEffects *result; char *kwnames[] = { - (char *) "image",(char *) "cursor", NULL + NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_DragImage",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - if (obj1) { - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_Effects",kwnames)) goto fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxGenericDragImage *)new wxGenericDragImage((wxBitmap const &)*arg1,(wxCursor const &)*arg2); + result = (wxEffects *)new wxEffects(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxEffects, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_new_DragIcon(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxIcon *arg1 = 0 ; - wxCursor const &arg2_defvalue = wxNullCursor ; - wxCursor *arg2 = (wxCursor *) &arg2_defvalue ; - wxGenericDragImage *result; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "image",(char *) "cursor", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_DragIcon",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - if (obj1) { - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxGenericDragImage *)new wxGenericDragImage((wxIcon const &)*arg1,(wxCursor const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_DragString(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxString *arg1 = 0 ; - wxCursor const &arg2_defvalue = wxNullCursor ; - wxCursor *arg2 = (wxCursor *) &arg2_defvalue ; - wxGenericDragImage *result; - bool temp1 = false ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "str",(char *) "cursor", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_DragString",kwnames,&obj0,&obj1)) goto fail; - { - arg1 = wxString_in_helper(obj0); - if (arg1 == NULL) SWIG_fail; - temp1 = true; - } - if (obj1) { - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxGenericDragImage *)new wxGenericDragImage((wxString const &)*arg1,(wxCursor const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1); - { - if (temp1) - delete arg1; - } - return resultobj; - fail: - { - if (temp1) - delete arg1; - } - return NULL; -} - - -static PyObject *_wrap_new_DragTreeItem(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxTreeCtrl *arg1 = 0 ; - wxTreeItemId *arg2 = 0 ; - wxGenericDragImage *result; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "treeCtrl",(char *) "id", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_DragTreeItem",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxGenericDragImage *)new wxGenericDragImage((wxTreeCtrl const &)*arg1,*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_DragListItem(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxListCtrl *arg1 = 0 ; - long arg2 ; - wxGenericDragImage *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "listCtrl",(char *) "id", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:new_DragListItem",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg1 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxGenericDragImage *)new wxGenericDragImage((wxListCtrl const &)*arg1,arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_delete_DragImage(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_DragImage",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - delete arg1; - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_DragImage_SetBackingBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - wxBitmap *arg2 = (wxBitmap *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "bitmap", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DragImage_SetBackingBitmap",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetBackingBitmap(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_DragImage_BeginDrag(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - wxPoint *arg2 = 0 ; - wxWindow *arg3 = (wxWindow *) 0 ; - bool arg4 = (bool) FALSE ; - wxRect *arg5 = (wxRect *) NULL ; - bool result; - wxPoint temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "hotspot",(char *) "window",(char *) "fullScreen",(char *) "rect", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:DragImage_BeginDrag",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; - } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (obj3) { - arg4 = PyInt_AsLong(obj3) ? true : false; - if (PyErr_Occurred()) SWIG_fail; - } - if (obj4) { - if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->BeginDrag((wxPoint const &)*arg2,arg3,arg4,arg5); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_DragImage_BeginDragBounded(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - wxPoint *arg2 = 0 ; - wxWindow *arg3 = (wxWindow *) 0 ; - wxWindow *arg4 = (wxWindow *) 0 ; - bool result; - wxPoint temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "hotspot",(char *) "window",(char *) "boundingWindow", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DragImage_BeginDragBounded",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; - } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->BeginDrag((wxPoint const &)*arg2,arg3,arg4); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_DragImage_EndDrag(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - bool result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DragImage_EndDrag",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->EndDrag(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_DragImage_Move(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - wxPoint *arg2 = 0 ; - bool result; - wxPoint temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "pt", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DragImage_Move",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Move((wxPoint const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_DragImage_Show(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - bool result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DragImage_Show",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Show(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_DragImage_Hide(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - bool result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DragImage_Hide",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Hide(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_DragImage_GetImageRect(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - wxPoint *arg2 = 0 ; - wxRect result; - wxPoint temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "pos", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DragImage_GetImageRect",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxGenericDragImage const *)arg1)->GetImageRect((wxPoint const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - wxRect * resultptr; - resultptr = new wxRect((wxRect &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRect, 1); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_DragImage_DoDrawImage(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - wxDC *arg2 = 0 ; - wxPoint *arg3 = 0 ; - bool result; - wxPoint temp3 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "dc",(char *) "pos", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DragImage_DoDrawImage",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg3 = &temp3; - if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxGenericDragImage const *)arg1)->DoDrawImage(*arg2,(wxPoint const &)*arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_DragImage_UpdateBackingFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - wxDC *arg2 = 0 ; - wxMemoryDC *arg3 = 0 ; - wxRect *arg4 = 0 ; - wxRect *arg5 = 0 ; - bool result; - wxRect temp4 ; - wxRect temp5 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "windowDC",(char *) "destDC",(char *) "sourceRect",(char *) "destRect", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DragImage_UpdateBackingFromWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxMemoryDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg3 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - arg4 = &temp4; - if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; - } - { - arg5 = &temp5; - if ( ! wxRect_helper(obj4, &arg5)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxGenericDragImage const *)arg1)->UpdateBackingFromWindow(*arg2,*arg3,(wxRect const &)*arg4,(wxRect const &)*arg5); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_DragImage_RedrawImage(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - wxPoint *arg2 = 0 ; - wxPoint *arg3 = 0 ; - bool arg4 ; - bool arg5 ; - bool result; - wxPoint temp2 ; - wxPoint temp3 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "oldPos",(char *) "newPos",(char *) "eraseOld",(char *) "drawNew", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DragImage_RedrawImage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; - } - { - arg3 = &temp3; - if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; - } - arg4 = PyInt_AsLong(obj3) ? true : false; - if (PyErr_Occurred()) SWIG_fail; - arg5 = PyInt_AsLong(obj4) ? true : false; - if (PyErr_Occurred()) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->RedrawImage((wxPoint const &)*arg2,(wxPoint const &)*arg3,arg4,arg5); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject * DragImage_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxGenericDragImage, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); -} -static PyObject *_wrap_new_Effects(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxEffects *result; - char *kwnames[] = { - NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_Effects",kwnames)) goto fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxEffects *)new wxEffects(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxEffects, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Effects_GetHighlightColour(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Effects_GetHighlightColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxEffects *arg1 = (wxEffects *) 0 ; wxColour result; @@ -16346,9 +15873,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"Colour_Blue", (PyCFunction) _wrap_Colour_Blue, METH_VARARGS | METH_KEYWORDS }, { (char *)"Colour_Ok", (PyCFunction) _wrap_Colour_Ok, METH_VARARGS | METH_KEYWORDS }, { (char *)"Colour_Set", (PyCFunction) _wrap_Colour_Set, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Colour_SetRBG", (PyCFunction) _wrap_Colour_SetRBG, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Colour_SetRGB", (PyCFunction) _wrap_Colour_SetRGB, METH_VARARGS | METH_KEYWORDS }, { (char *)"Colour___eq__", (PyCFunction) _wrap_Colour___eq__, METH_VARARGS | METH_KEYWORDS }, { (char *)"Colour___ne__", (PyCFunction) _wrap_Colour___ne__, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Colour_InitFromName", (PyCFunction) _wrap_Colour_InitFromName, METH_VARARGS | METH_KEYWORDS }, { (char *)"Colour_Get", (PyCFunction) _wrap_Colour_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Colour_swigregister", Colour_swigregister, METH_VARARGS }, { (char *)"new_Palette", (PyCFunction) _wrap_new_Palette, METH_VARARGS | METH_KEYWORDS }, @@ -16685,6 +16213,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"DC_SetBackground", (PyCFunction) _wrap_DC_SetBackground, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetBackgroundMode", (PyCFunction) _wrap_DC_SetBackgroundMode, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetPalette", (PyCFunction) _wrap_DC_SetPalette, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_SetClippingRegionXY", (PyCFunction) _wrap_DC_SetClippingRegionXY, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetClippingRegion", (PyCFunction) _wrap_DC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetClippingRect", (PyCFunction) _wrap_DC_SetClippingRect, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS }, @@ -16696,10 +16225,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"DC_GetTextExtent", (PyCFunction) _wrap_DC_GetTextExtent, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetFullTextExtent", (PyCFunction) _wrap_DC_GetFullTextExtent, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetMultiLineTextExtent", (PyCFunction) _wrap_DC_GetMultiLineTextExtent, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_GetSizeTuple", (PyCFunction) _wrap_DC_GetSizeTuple, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetSize", (PyCFunction) _wrap_DC_GetSize, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_GetSizeMMWH", (PyCFunction) _wrap_DC_GetSizeMMWH, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_GetSizeTuple", (PyCFunction) _wrap_DC_GetSizeTuple, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetSizeMM", (PyCFunction) _wrap_DC_GetSizeMM, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_GetSizeMMTuple", (PyCFunction) _wrap_DC_GetSizeMMTuple, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DeviceToLogicalX", (PyCFunction) _wrap_DC_DeviceToLogicalX, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DeviceToLogicalY", (PyCFunction) _wrap_DC_DeviceToLogicalY, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_DeviceToLogicalXRel", (PyCFunction) _wrap_DC_DeviceToLogicalXRel, METH_VARARGS | METH_KEYWORDS }, @@ -16728,11 +16257,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"DC_SetUserScale", (PyCFunction) _wrap_DC_SetUserScale, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetLogicalScale", (PyCFunction) _wrap_DC_GetLogicalScale, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetLogicalScale", (PyCFunction) _wrap_DC_SetLogicalScale, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_GetLogicalOriginTuple", (PyCFunction) _wrap_DC_GetLogicalOriginTuple, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetLogicalOrigin", (PyCFunction) _wrap_DC_GetLogicalOrigin, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_GetLogicalOriginTuple", (PyCFunction) _wrap_DC_GetLogicalOriginTuple, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetLogicalOrigin", (PyCFunction) _wrap_DC_SetLogicalOrigin, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DC_GetDeviceOriginTuple", (PyCFunction) _wrap_DC_GetDeviceOriginTuple, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetDeviceOrigin", (PyCFunction) _wrap_DC_GetDeviceOrigin, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_GetDeviceOriginTuple", (PyCFunction) _wrap_DC_GetDeviceOriginTuple, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetDeviceOrigin", (PyCFunction) _wrap_DC_SetDeviceOrigin, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetAxisOrientation", (PyCFunction) _wrap_DC_SetAxisOrientation, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_GetLogicalFunction", (PyCFunction) _wrap_DC_GetLogicalFunction, METH_VARARGS | METH_KEYWORDS }, @@ -16822,24 +16351,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"FontList_RemoveFont", (PyCFunction) _wrap_FontList_RemoveFont, METH_VARARGS | METH_KEYWORDS }, { (char *)"FontList_GetCount", (PyCFunction) _wrap_FontList_GetCount, METH_VARARGS | METH_KEYWORDS }, { (char *)"FontList_swigregister", FontList_swigregister, METH_VARARGS }, - { (char *)"new_DragImage", (PyCFunction) _wrap_new_DragImage, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_DragIcon", (PyCFunction) _wrap_new_DragIcon, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_DragString", (PyCFunction) _wrap_new_DragString, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_DragTreeItem", (PyCFunction) _wrap_new_DragTreeItem, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_DragListItem", (PyCFunction) _wrap_new_DragListItem, METH_VARARGS | METH_KEYWORDS }, - { (char *)"delete_DragImage", (PyCFunction) _wrap_delete_DragImage, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DragImage_SetBackingBitmap", (PyCFunction) _wrap_DragImage_SetBackingBitmap, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DragImage_BeginDrag", (PyCFunction) _wrap_DragImage_BeginDrag, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DragImage_BeginDragBounded", (PyCFunction) _wrap_DragImage_BeginDragBounded, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DragImage_EndDrag", (PyCFunction) _wrap_DragImage_EndDrag, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DragImage_Move", (PyCFunction) _wrap_DragImage_Move, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DragImage_Show", (PyCFunction) _wrap_DragImage_Show, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DragImage_Hide", (PyCFunction) _wrap_DragImage_Hide, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DragImage_GetImageRect", (PyCFunction) _wrap_DragImage_GetImageRect, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DragImage_DoDrawImage", (PyCFunction) _wrap_DragImage_DoDrawImage, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DragImage_UpdateBackingFromWindow", (PyCFunction) _wrap_DragImage_UpdateBackingFromWindow, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DragImage_RedrawImage", (PyCFunction) _wrap_DragImage_RedrawImage, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DragImage_swigregister", DragImage_swigregister, METH_VARARGS }, { (char *)"new_Effects", (PyCFunction) _wrap_new_Effects, METH_VARARGS | METH_KEYWORDS }, { (char *)"Effects_GetHighlightColour", (PyCFunction) _wrap_Effects_GetHighlightColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Effects_GetLightShadow", (PyCFunction) _wrap_Effects_GetLightShadow, METH_VARARGS | METH_KEYWORDS }, @@ -16861,78 +16372,21 @@ static PyMethodDef SwigMethods[] = { /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ +static void *_p_wxControlTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxControl *) x)); +} +static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x)); +} +static void *_p_wxMenuBarTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxMenuBar *) x)); +} static void *_p_wxBufferedDCTo_p_wxMemoryDC(void *x) { return (void *)((wxMemoryDC *) ((wxBufferedDC *) x)); } static void *_p_wxBufferedPaintDCTo_p_wxMemoryDC(void *x) { return (void *)((wxMemoryDC *) (wxBufferedDC *) ((wxBufferedPaintDC *) x)); } -static void *_p_wxPyPenTo_p_wxGDIObject(void *x) { - return (void *)((wxGDIObject *) (wxPen *) ((wxPyPen *) x)); -} -static void *_p_wxIconTo_p_wxGDIObject(void *x) { - return (void *)((wxGDIObject *) ((wxIcon *) x)); -} -static void *_p_wxPaletteTo_p_wxGDIObject(void *x) { - return (void *)((wxGDIObject *) ((wxPalette *) x)); -} -static void *_p_wxPenTo_p_wxGDIObject(void *x) { - return (void *)((wxGDIObject *) ((wxPen *) x)); -} -static void *_p_wxFontTo_p_wxGDIObject(void *x) { - return (void *)((wxGDIObject *) ((wxFont *) x)); -} -static void *_p_wxCursorTo_p_wxGDIObject(void *x) { - return (void *)((wxGDIObject *) ((wxCursor *) x)); -} -static void *_p_wxBitmapTo_p_wxGDIObject(void *x) { - return (void *)((wxGDIObject *) ((wxBitmap *) x)); -} -static void *_p_wxRegionTo_p_wxGDIObject(void *x) { - return (void *)((wxGDIObject *) ((wxRegion *) x)); -} -static void *_p_wxBrushTo_p_wxGDIObject(void *x) { - return (void *)((wxGDIObject *) ((wxBrush *) x)); -} -static void *_p_wxBufferedDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) (wxMemoryDC *) ((wxBufferedDC *) x)); -} -static void *_p_wxScreenDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) ((wxScreenDC *) x)); -} -static void *_p_wxMirrorDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) ((wxMirrorDC *) x)); -} -static void *_p_wxMemoryDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) ((wxMemoryDC *) x)); -} -static void *_p_wxWindowDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) ((wxWindowDC *) x)); -} -static void *_p_wxMetaFileDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) ((wxMetaFileDC *) x)); -} -static void *_p_wxBufferedPaintDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) (wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); -} -static void *_p_wxClientDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) ((wxClientDC *) x)); -} -static void *_p_wxPaintDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) ((wxPaintDC *) x)); -} -static void *_p_wxPostScriptDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) ((wxPostScriptDC *) x)); -} -static void *_p_wxPrinterDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) ((wxPrinterDC *) x)); -} -static void *_p_wxPyPenTo_p_wxPen(void *x) { - return (void *)((wxPen *) ((wxPyPen *) x)); -} -static void *_p_wxBufferedPaintDCTo_p_wxBufferedDC(void *x) { - return (void *)((wxBufferedDC *) ((wxBufferedPaintDC *) x)); -} static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxLayoutConstraints *) x)); } @@ -17131,15 +16585,15 @@ static void *_p_wxPrinterDCTo_p_wxObject(void *x) { static void *_p_wxScreenDCTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxDC *) ((wxScreenDC *) x)); } +static void *_p_wxAcceleratorTableTo_p_wxObject(void *x) { + return (void *)((wxObject *) ((wxAcceleratorTable *) x)); +} static void *_p_wxImageTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxImage *) x)); } static void *_p_wxScrollWinEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *) ((wxScrollWinEvent *) x)); } -static void *_p_wxGenericDragImageTo_p_wxObject(void *x) { - return (void *)((wxObject *) ((wxGenericDragImage *) x)); -} static void *_p_wxPaletteTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxGDIObject *) ((wxPalette *) x)); } @@ -17251,20 +16705,75 @@ static void *_p_wxPyValidatorTo_p_wxObject(void *x) { static void *_p_wxValidatorTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x)); } -static void *_p_wxControlTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxControl *) x)); +static void *_p_wxBufferedPaintDCTo_p_wxBufferedDC(void *x) { + return (void *)((wxBufferedDC *) ((wxBufferedPaintDC *) x)); } -static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x)); +static void *_p_wxBufferedDCTo_p_wxDC(void *x) { + return (void *)((wxDC *) (wxMemoryDC *) ((wxBufferedDC *) x)); } -static void *_p_wxMenuBarTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxMenuBar *) x)); +static void *_p_wxScreenDCTo_p_wxDC(void *x) { + return (void *)((wxDC *) ((wxScreenDC *) x)); +} +static void *_p_wxMirrorDCTo_p_wxDC(void *x) { + return (void *)((wxDC *) ((wxMirrorDC *) x)); +} +static void *_p_wxMemoryDCTo_p_wxDC(void *x) { + return (void *)((wxDC *) ((wxMemoryDC *) x)); +} +static void *_p_wxWindowDCTo_p_wxDC(void *x) { + return (void *)((wxDC *) ((wxWindowDC *) x)); +} +static void *_p_wxMetaFileDCTo_p_wxDC(void *x) { + return (void *)((wxDC *) ((wxMetaFileDC *) x)); +} +static void *_p_wxBufferedPaintDCTo_p_wxDC(void *x) { + return (void *)((wxDC *) (wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); +} +static void *_p_wxClientDCTo_p_wxDC(void *x) { + return (void *)((wxDC *) ((wxClientDC *) x)); +} +static void *_p_wxPaintDCTo_p_wxDC(void *x) { + return (void *)((wxDC *) ((wxPaintDC *) x)); +} +static void *_p_wxPostScriptDCTo_p_wxDC(void *x) { + return (void *)((wxDC *) ((wxPostScriptDC *) x)); +} +static void *_p_wxPrinterDCTo_p_wxDC(void *x) { + return (void *)((wxDC *) ((wxPrinterDC *) x)); +} +static void *_p_wxPyPenTo_p_wxGDIObject(void *x) { + return (void *)((wxGDIObject *) (wxPen *) ((wxPyPen *) x)); +} +static void *_p_wxIconTo_p_wxGDIObject(void *x) { + return (void *)((wxGDIObject *) ((wxIcon *) x)); +} +static void *_p_wxPaletteTo_p_wxGDIObject(void *x) { + return (void *)((wxGDIObject *) ((wxPalette *) x)); +} +static void *_p_wxPenTo_p_wxGDIObject(void *x) { + return (void *)((wxGDIObject *) ((wxPen *) x)); +} +static void *_p_wxFontTo_p_wxGDIObject(void *x) { + return (void *)((wxGDIObject *) ((wxFont *) x)); +} +static void *_p_wxCursorTo_p_wxGDIObject(void *x) { + return (void *)((wxGDIObject *) ((wxCursor *) x)); +} +static void *_p_wxBitmapTo_p_wxGDIObject(void *x) { + return (void *)((wxGDIObject *) ((wxBitmap *) x)); +} +static void *_p_wxRegionTo_p_wxGDIObject(void *x) { + return (void *)((wxGDIObject *) ((wxRegion *) x)); +} +static void *_p_wxBrushTo_p_wxGDIObject(void *x) { + return (void *)((wxGDIObject *) ((wxBrush *) x)); +} +static void *_p_wxPyPenTo_p_wxPen(void *x) { + return (void *)((wxPen *) ((wxPyPen *) x)); } static swig_type_info _swigt__p_wxPostScriptDC[] = {{"_p_wxPostScriptDC", 0, "wxPostScriptDC *", 0},{"_p_wxPostScriptDC"},{0}}; -static swig_type_info _swigt__p_wxGenericDragImage[] = {{"_p_wxGenericDragImage", 0, "wxGenericDragImage *", 0},{"_p_wxGenericDragImage"},{0}}; static swig_type_info _swigt__p_wxBrush[] = {{"_p_wxBrush", 0, "wxBrush *", 0},{"_p_wxBrush"},{0}}; static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0},{"_p_wxColour"},{0}}; -static swig_type_info _swigt__p_wxCoord[] = {{"_p_wxCoord", 0, "wxCoord *", 0},{"_p_wxCoord"},{"_p_int"},{0}}; static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxDC},{"_p_wxScreenDC", _p_wxScreenDCTo_p_wxDC},{"_p_wxMirrorDC", _p_wxMirrorDCTo_p_wxDC},{"_p_wxMemoryDC", _p_wxMemoryDCTo_p_wxDC},{"_p_wxWindowDC", _p_wxWindowDCTo_p_wxDC},{"_p_wxDC"},{"_p_wxMetaFileDC", _p_wxMetaFileDCTo_p_wxDC},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxDC},{"_p_wxClientDC", _p_wxClientDCTo_p_wxDC},{"_p_wxPaintDC", _p_wxPaintDCTo_p_wxDC},{"_p_wxPostScriptDC", _p_wxPostScriptDCTo_p_wxDC},{"_p_wxPrinterDC", _p_wxPrinterDCTo_p_wxDC},{0}}; static swig_type_info _swigt__p_wxMirrorDC[] = {{"_p_wxMirrorDC", 0, "wxMirrorDC *", 0},{"_p_wxMirrorDC"},{0}}; static swig_type_info _swigt__p_byte[] = {{"_p_byte", 0, "byte *", 0},{"_p_unsigned_char"},{"_p_byte"},{0}}; @@ -17279,12 +16788,11 @@ static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0},{"_p static swig_type_info _swigt__p_double[] = {{"_p_double", 0, "double *", 0},{"_p_double"},{0}}; static swig_type_info _swigt__p_wxMemoryDC[] = {{"_p_wxMemoryDC", 0, "wxMemoryDC *", 0},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxMemoryDC},{"_p_wxMemoryDC"},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxMemoryDC},{0}}; static swig_type_info _swigt__p_wxFontMapper[] = {{"_p_wxFontMapper", 0, "wxFontMapper *", 0},{"_p_wxFontMapper"},{0}}; -static swig_type_info _swigt__p_wxListCtrl[] = {{"_p_wxListCtrl", 0, "wxListCtrl *", 0},{"_p_wxListCtrl"},{0}}; static swig_type_info _swigt__p_wxEffects[] = {{"_p_wxEffects", 0, "wxEffects *", 0},{"_p_wxEffects"},{0}}; static swig_type_info _swigt__p_wxNativeEncodingInfo[] = {{"_p_wxNativeEncodingInfo", 0, "wxNativeEncodingInfo *", 0},{"_p_wxNativeEncodingInfo"},{0}}; static swig_type_info _swigt__p_wxPalette[] = {{"_p_wxPalette", 0, "wxPalette *", 0},{"_p_wxPalette"},{0}}; static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}}; -static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxRegionIterator", _p_wxRegionIteratorTo_p_wxObject},{"_p_wxPen", _p_wxPenTo_p_wxObject},{"_p_wxColourDatabase", _p_wxColourDatabaseTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxPenList", _p_wxPenListTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxMask", _p_wxMaskTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxFont", _p_wxFontTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxClientDC", _p_wxClientDCTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxMemoryDC", _p_wxMemoryDCTo_p_wxObject},{"_p_wxRegion", _p_wxRegionTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxDC", _p_wxDCTo_p_wxObject},{"_p_wxIcon", _p_wxIconTo_p_wxObject},{"_p_wxWindowDC", _p_wxWindowDCTo_p_wxObject},{"_p_wxGDIObject", _p_wxGDIObjectTo_p_wxObject},{"_p_wxEffects", _p_wxEffectsTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPostScriptDC", _p_wxPostScriptDCTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxPaintDC", _p_wxPaintDCTo_p_wxObject},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxObject},{"_p_wxPrinterDC", _p_wxPrinterDCTo_p_wxObject},{"_p_wxScreenDC", _p_wxScreenDCTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxGenericDragImage", _p_wxGenericDragImageTo_p_wxObject},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxObject},{"_p_wxPalette", _p_wxPaletteTo_p_wxObject},{"_p_wxImageList", _p_wxImageListTo_p_wxObject},{"_p_wxCursor", _p_wxCursorTo_p_wxObject},{"_p_wxObject"},{"_p_wxMirrorDC", _p_wxMirrorDCTo_p_wxObject},{"_p_wxEncodingConverter", _p_wxEncodingConverterTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxMetaFileDC", _p_wxMetaFileDCTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxBrushList", _p_wxBrushListTo_p_wxObject},{"_p_wxPyPen", _p_wxPyPenTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxBitmap", _p_wxBitmapTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxBrush", _p_wxBrushTo_p_wxObject},{"_p_wxMetaFile", _p_wxMetaFileTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxColour", _p_wxColourTo_p_wxObject},{"_p_wxFontList", _p_wxFontListTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{0}}; +static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxRegionIterator", _p_wxRegionIteratorTo_p_wxObject},{"_p_wxPen", _p_wxPenTo_p_wxObject},{"_p_wxColourDatabase", _p_wxColourDatabaseTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxPenList", _p_wxPenListTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxMask", _p_wxMaskTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxFont", _p_wxFontTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxClientDC", _p_wxClientDCTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxMemoryDC", _p_wxMemoryDCTo_p_wxObject},{"_p_wxRegion", _p_wxRegionTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxDC", _p_wxDCTo_p_wxObject},{"_p_wxIcon", _p_wxIconTo_p_wxObject},{"_p_wxWindowDC", _p_wxWindowDCTo_p_wxObject},{"_p_wxGDIObject", _p_wxGDIObjectTo_p_wxObject},{"_p_wxEffects", _p_wxEffectsTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPostScriptDC", _p_wxPostScriptDCTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxPaintDC", _p_wxPaintDCTo_p_wxObject},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxObject},{"_p_wxPrinterDC", _p_wxPrinterDCTo_p_wxObject},{"_p_wxScreenDC", _p_wxScreenDCTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxObject},{"_p_wxPalette", _p_wxPaletteTo_p_wxObject},{"_p_wxImageList", _p_wxImageListTo_p_wxObject},{"_p_wxCursor", _p_wxCursorTo_p_wxObject},{"_p_wxObject"},{"_p_wxMirrorDC", _p_wxMirrorDCTo_p_wxObject},{"_p_wxEncodingConverter", _p_wxEncodingConverterTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxMetaFileDC", _p_wxMetaFileDCTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxBrushList", _p_wxBrushListTo_p_wxObject},{"_p_wxPyPen", _p_wxPyPenTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxBitmap", _p_wxBitmapTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxBrush", _p_wxBrushTo_p_wxObject},{"_p_wxMetaFile", _p_wxMetaFileTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxColour", _p_wxColourTo_p_wxObject},{"_p_wxFontList", _p_wxFontListTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{0}}; static swig_type_info _swigt__p_wxRegionIterator[] = {{"_p_wxRegionIterator", 0, "wxRegionIterator *", 0},{"_p_wxRegionIterator"},{0}}; static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0},{"_p_wxRect"},{0}}; static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; @@ -17295,7 +16803,6 @@ static swig_type_info _swigt__p_wxDash[] = {{"_p_wxDash", 0, "wxDash *", 0},{"_p static swig_type_info _swigt__p_wxScreenDC[] = {{"_p_wxScreenDC", 0, "wxScreenDC *", 0},{"_p_wxScreenDC"},{0}}; static swig_type_info _swigt__p_wxCursor[] = {{"_p_wxCursor", 0, "wxCursor *", 0},{"_p_wxCursor"},{0}}; static swig_type_info _swigt__p_wxClientDC[] = {{"_p_wxClientDC", 0, "wxClientDC *", 0},{"_p_wxClientDC"},{0}}; -static swig_type_info _swigt__p_wxTreeCtrl[] = {{"_p_wxTreeCtrl", 0, "wxTreeCtrl *", 0},{"_p_wxTreeCtrl"},{0}}; static swig_type_info _swigt__p_wxBufferedDC[] = {{"_p_wxBufferedDC", 0, "wxBufferedDC *", 0},{"_p_wxBufferedDC"},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxBufferedDC},{0}}; static swig_type_info _swigt__p_wxImageList[] = {{"_p_wxImageList", 0, "wxImageList *", 0},{"_p_wxImageList"},{0}}; static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *", 0},{"_p_unsigned_char"},{"_p_byte"},{0}}; @@ -17313,9 +16820,8 @@ static swig_type_info _swigt__p_wxPen[] = {{"_p_wxPen", 0, "wxPen *", 0},{"_p_wx static swig_type_info _swigt__p_wxBufferedPaintDC[] = {{"_p_wxBufferedPaintDC", 0, "wxBufferedPaintDC *", 0},{"_p_wxBufferedPaintDC"},{0}}; static swig_type_info _swigt__p_wxPaintDC[] = {{"_p_wxPaintDC", 0, "wxPaintDC *", 0},{"_p_wxPaintDC"},{0}}; static swig_type_info _swigt__p_wxPenList[] = {{"_p_wxPenList", 0, "wxPenList *", 0},{"_p_wxPenList"},{0}}; -static swig_type_info _swigt__p_wxTreeItemId[] = {{"_p_wxTreeItemId", 0, "wxTreeItemId *", 0},{"_p_wxTreeItemId"},{0}}; static swig_type_info _swigt__p_wxPyPen[] = {{"_p_wxPyPen", 0, "wxPyPen *", 0},{"_p_wxPyPen"},{0}}; -static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_wxCoord"},{"_p_int"},{0}}; +static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_int"},{0}}; static swig_type_info _swigt__p_wxMetaFile[] = {{"_p_wxMetaFile", 0, "wxMetaFile *", 0},{"_p_wxMetaFile"},{0}}; static swig_type_info _swigt__p_wxNativeFontInfo[] = {{"_p_wxNativeFontInfo", 0, "wxNativeFontInfo *", 0},{"_p_wxNativeFontInfo"},{0}}; static swig_type_info _swigt__p_wxEncodingConverter[] = {{"_p_wxEncodingConverter", 0, "wxEncodingConverter *", 0},{"_p_wxEncodingConverter"},{0}}; @@ -17323,10 +16829,8 @@ static swig_type_info _swigt__p_wxColourDatabase[] = {{"_p_wxColourDatabase", 0, static swig_type_info *swig_types_initial[] = { _swigt__p_wxPostScriptDC, -_swigt__p_wxGenericDragImage, _swigt__p_wxBrush, _swigt__p_wxColour, -_swigt__p_wxCoord, _swigt__p_wxDC, _swigt__p_wxMirrorDC, _swigt__p_byte, @@ -17341,7 +16845,6 @@ _swigt__p_wxSize, _swigt__p_double, _swigt__p_wxMemoryDC, _swigt__p_wxFontMapper, -_swigt__p_wxListCtrl, _swigt__p_wxEffects, _swigt__p_wxNativeEncodingInfo, _swigt__p_wxPalette, @@ -17357,7 +16860,6 @@ _swigt__p_wxDash, _swigt__p_wxScreenDC, _swigt__p_wxCursor, _swigt__p_wxClientDC, -_swigt__p_wxTreeCtrl, _swigt__p_wxBufferedDC, _swigt__p_wxImageList, _swigt__p_unsigned_char, @@ -17375,7 +16877,6 @@ _swigt__p_wxPen, _swigt__p_wxBufferedPaintDC, _swigt__p_wxPaintDC, _swigt__p_wxPenList, -_swigt__p_wxTreeItemId, _swigt__p_wxPyPen, _swigt__p_int, _swigt__p_wxMetaFile, @@ -17803,7 +17304,8 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"TheBrushList",_wrap_TheBrushList_get, _wrap_TheBrushList_set); SWIG_addvarlink(SWIG_globals,(char*)"TheColourDatabase",_wrap_TheColourDatabase_get, _wrap_TheColourDatabase_set); - wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage"); + // Work around a chicken/egg problem in drawlist.cpp + wxPyDrawList_SetAPIPtr(); }