X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..52f52ebc4e0be6a9899d328b08db9eb14629d219:/wxPython/src/msw/gdi_wrap.cpp?ds=inline diff --git a/wxPython/src/msw/gdi_wrap.cpp b/wxPython/src/msw/gdi_wrap.cpp index a664847126..d10d694271 100644 --- a/wxPython/src/msw/gdi_wrap.cpp +++ b/wxPython/src/msw/gdi_wrap.cpp @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 1.3.20 + * Version 1.3.22 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -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,15 @@ 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 +134,6 @@ SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); * ************************************************************************/ - #include "Python.h" #ifdef __cplusplus @@ -161,8 +164,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) @@ -170,7 +171,7 @@ typedef struct swig_const_info { SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) \ SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_newvarlink() \ SWIG_Python_newvarlink() @@ -178,40 +179,48 @@ 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) +typedef double (*py_objasdbl_conv)(PyObject *obj); -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[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* 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 +231,62 @@ 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_char swig_types[7] +#define SWIGTYPE_p_wxIconLocation swig_types[8] +#define SWIGTYPE_p_wxImage swig_types[9] +#define SWIGTYPE_p_wxMetaFileDC swig_types[10] +#define SWIGTYPE_p_wxMask swig_types[11] +#define SWIGTYPE_p_wxFont swig_types[12] +#define SWIGTYPE_p_wxWindow swig_types[13] +#define SWIGTYPE_p_wxSize swig_types[14] +#define SWIGTYPE_p_double swig_types[15] +#define SWIGTYPE_p_wxMemoryDC swig_types[16] +#define SWIGTYPE_p_wxFontMapper swig_types[17] +#define SWIGTYPE_p_wxEffects swig_types[18] +#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[19] +#define SWIGTYPE_p_wxPalette swig_types[20] +#define SWIGTYPE_p_wxBitmap swig_types[21] +#define SWIGTYPE_p_wxObject swig_types[22] +#define SWIGTYPE_p_wxRegionIterator swig_types[23] +#define SWIGTYPE_p_wxRect swig_types[24] +#define SWIGTYPE_p_wxString swig_types[25] +#define SWIGTYPE_p_wxPrinterDC swig_types[26] +#define SWIGTYPE_p_wxIconBundle swig_types[27] +#define SWIGTYPE_p_wxPoint swig_types[28] +#define SWIGTYPE_p_wxDash swig_types[29] +#define SWIGTYPE_p_wxScreenDC swig_types[30] +#define SWIGTYPE_p_wxCursor swig_types[31] +#define SWIGTYPE_p_wxClientDC swig_types[32] +#define SWIGTYPE_p_wxBufferedDC swig_types[33] +#define SWIGTYPE_p_wxImageList swig_types[34] +#define SWIGTYPE_p_unsigned_char swig_types[35] +#define SWIGTYPE_p_wxGDIObject swig_types[36] +#define SWIGTYPE_p_wxIcon swig_types[37] +#define SWIGTYPE_p_wxLocale swig_types[38] +#define SWIGTYPE_p_wxRegion swig_types[39] +#define SWIGTYPE_p_wxLanguageInfo swig_types[40] +#define SWIGTYPE_p_wxConfigBase swig_types[41] +#define SWIGTYPE_p_wxWindowDC swig_types[42] +#define SWIGTYPE_p_wxPrintData swig_types[43] +#define SWIGTYPE_p_wxBrushList swig_types[44] +#define SWIGTYPE_p_wxFontList swig_types[45] +#define SWIGTYPE_p_wxPen swig_types[46] +#define SWIGTYPE_p_wxBufferedPaintDC swig_types[47] +#define SWIGTYPE_p_wxPaintDC swig_types[48] +#define SWIGTYPE_p_wxPenList swig_types[49] +#define SWIGTYPE_p_wxPyPen swig_types[50] +#define SWIGTYPE_p_int swig_types[51] +#define SWIGTYPE_p_wxMetaFile swig_types[52] +#define SWIGTYPE_p_wxNativeFontInfo swig_types[53] +#define SWIGTYPE_p_wxEncodingConverter swig_types[54] +#define SWIGTYPE_p_wxColourDatabase swig_types[55] +static swig_type_info *swig_types[57]; /* -------- TYPES TABLE (END) -------- */ @@ -293,10 +298,63 @@ static swig_type_info *swig_types[61]; #define SWIG_name "_gdi" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" - DECLARE_DEF_STRING(EmptyString); + + static const wxString wxPyEmptyString(wxEmptyString); + +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} + + +SWIGSTATIC(unsigned char) +SWIG_PyObj_AsUnsignedChar(PyObject *obj) +{ + return numeric_cast(unsigned char, + SWIG_PyObj_AsUnsignedLongInRange(obj, "unsigned char", UCHAR_MAX)); +} PyObject *wxColour_Get(wxColour *self){ PyObject* rv = PyTuple_New(3); @@ -313,6 +371,25 @@ PyObject *wxColour_Get(wxColour *self){ PyTuple_SetItem(rv, 2, PyInt_FromLong(blue)); return rv; } +unsigned long wxColour_GetRGB(wxColour *self){ + return self->Red() | (self->Green() << 8) | (self->Blue() << 16); + } + +SWIGSTATIC(PyObject* ) +SWIG_PyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; @@ -350,6 +427,8 @@ PyObject *wxPen_GetDashes(wxPen *self){ wxPyEndBlockThreads(); return retval; } +bool wxPen___eq__(wxPen *self,wxPen const *other){ return other ? (*self == *other) : False; } +bool wxPen___ne__(wxPen *self,wxPen const *other){ return other ? (*self != *other) : True; } wxPyPen::~wxPyPen() { @@ -407,10 +486,23 @@ wxBitmap *new_wxBitmap(PyObject *bits,int width,int height,int depth){ PyString_AsStringAndSize(bits, &buf, &length); return new wxBitmap(buf, width, height, depth); } + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + void wxBitmap_SetMaskColour(wxBitmap *self,wxColour const &colour){ wxMask *mask = new wxMask(*self, colour); self->SetMask(mask); } +wxMask *new_wxMask(wxBitmap const &bitmap,wxColour const &colour){ + if ( !colour.Ok() ) + return new wxMask(bitmap, *wxBLACK); + else + return new wxMask(bitmap, colour); + } #include @@ -486,10 +578,10 @@ wxString wxNativeFontInfo___str__(wxNativeFontInfo *self){ } wxNativeEncodingInfo* wxGetNativeFontEncoding(wxFontEncoding encoding) - { PyErr_SetNone(PyExc_NotImplementedError); return NULL; } + { wxPyRaiseNotImplemented(); return NULL; } bool wxTestFontEncoding(const wxNativeEncodingInfo& info) - { PyErr_SetNone(PyExc_NotImplementedError); return false; } + { wxPyRaiseNotImplemented(); return False; } PyObject *wxFontMapper_GetAltForEncoding(wxFontMapper *self,wxFontEncoding encoding,wxString const &facename,bool interactive){ wxFontEncoding alt_enc; @@ -508,6 +600,8 @@ wxFont *new_wxFont(wxString const &info){ wxFont *new_wxFont(int pointSize,wxFontFamily family,int flags,wxString const &face,wxFontEncoding encoding){ return wxFont::New(pointSize, family, flags, face, encoding); } +bool wxFont___eq__(wxFont *self,wxFont const *other){ return other ? (*self == *other) : False; } +bool wxFont___ne__(wxFont *self,wxFont const *other){ return other ? (*self != *other) : True; } class wxPyFontEnumerator : public wxFontEnumerator { public: @@ -537,7 +631,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; @@ -547,6 +641,22 @@ wxColour wxDC_GetPixel(wxDC *self,wxPoint const &pt){ self->GetPixel(pt, &col); return col; } + +SWIGSTATIC(double) +SWIG_PyObj_AsDouble(PyObject *obj) +{ + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } +} + wxRect wxDC_DrawImageLabel(wxDC *self,wxString const &text,wxBitmap const &image,wxRect const &rect,int alignment,int indexAccel){ wxRect rv; self->DrawLabel(text, image, rect, alignment, indexAccel, &rv); @@ -557,6 +667,11 @@ wxRect wxDC_GetClippingRect(wxDC *self){ self->GetClippingBox(rect); return rect; } +wxArrayInt wxDC_GetPartialTextExtents(wxDC *self,wxString const &text){ + wxArrayInt widths; + self->GetPartialTextExtents(text, widths); + return widths; + } PyObject *wxDC__DrawPointList(wxDC *self,PyObject *pyCoords,PyObject *pyPens,PyObject *pyBrushes){ return wxPyDrawXXXList(*self, wxPyDrawXXXPoint, pyCoords, pyPens, pyBrushes); } @@ -584,6 +699,93 @@ static void wxDC_GetBoundingBox(wxDC* dc, int* x1, int* y1, int* x2, int* y2) { } +//-=-=-=-=-=-=-=-=-=-=- +#if 0 +#include +#else + + +// Temporarily put a set of classes here similar to the old buffered DC +// classes until the real ones can be fixed to work "correctly" again. + +class wxBufferedDC : public wxMemoryDC +{ +private: + wxDC *m_dc; + wxBitmap m_buffer; + +public: + + wxBufferedDC() : m_dc( 0 ) {} + + wxBufferedDC( wxDC *dc, const wxBitmap &buffer ) + : m_dc( dc ), m_buffer( buffer ) + { + SelectObject( m_buffer ); + } + + wxBufferedDC( wxDC *dc, const wxSize &area ) + : m_dc( dc ), m_buffer( area.GetWidth(), area.GetHeight() ) + { + SelectObject( m_buffer ); + } + + ~wxBufferedDC() { + if( m_dc != 0 ) + UnMask(); + } + + + void Init( wxDC *dc, const wxBitmap &buffer ) { + wxASSERT_MSG( m_dc == 0 && m_buffer == wxNullBitmap, + _T("wxBufferedDC already initialised") ); + m_dc = dc; + m_buffer = buffer; + SelectObject( m_buffer ); + } + + void Init( wxDC *dc, const wxSize &area ) { + wxASSERT_MSG( m_dc == 0 && m_buffer == wxNullBitmap, + _T("wxBufferedDC already initialised") ); + m_dc = dc; + m_buffer = wxBitmap( area.GetWidth(), area.GetHeight() ); + SelectObject( m_buffer ); + } + + void UnMask() { + wxASSERT_MSG( m_dc != 0, _T("No low level DC associated with buffer (anymore)") ); + m_dc->Blit( 0, 0, m_buffer.GetWidth(), m_buffer.GetHeight(), this, 0, 0 ); + m_dc = 0; + } +}; + + +class wxBufferedPaintDC : public wxBufferedDC +{ +private: + wxPaintDC m_paintdc; + +public: + wxBufferedPaintDC( wxWindow *window, const wxBitmap &buffer = wxNullBitmap ) + : m_paintdc( window ) + { + window->PrepareDC( m_paintdc ); + + if( buffer != wxNullBitmap ) + Init( &m_paintdc, buffer ); + else + Init( &m_paintdc, window->GetClientSize() ); + } + + ~wxBufferedPaintDC() { + UnMask(); + } +}; + +#endif +//-=-=-=-=-=-=-=-=-=-=- + + #include @@ -595,9 +797,6 @@ void wxColourDatabase_Append(wxColourDatabase *self,wxString const &name,int red self->AddColour(name, wxColour(red, green, blue)); } -#include - - #include #ifdef __cplusplus @@ -667,7 +866,7 @@ static PyObject *_wrap_GDIObject_GetVisible(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -686,8 +885,10 @@ static PyObject *_wrap_GDIObject_SetVisible(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GDIObject_SetVisible",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGDIObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetVisible(arg2); @@ -720,7 +921,7 @@ static PyObject *_wrap_GDIObject_IsNull(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -749,16 +950,22 @@ static PyObject *_wrap_new_Colour(PyObject *self, PyObject *args, PyObject *kwar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_Colour",kwnames,&obj0,&obj1,&obj2)) goto fail; if (obj0) { - arg1 = (unsigned char) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj0); + if (PyErr_Occurred()) SWIG_fail; + } } if (obj1) { - arg2 = (unsigned char) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } if (obj2) { - arg3 = (unsigned char) PyInt_AsLong(obj2); - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -774,35 +981,11 @@ static PyObject *_wrap_new_Colour(PyObject *self, PyObject *args, PyObject *kwar } -static PyObject *_wrap_delete_Colour(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColour *arg1 = (wxColour *) 0 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Colour",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,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_new_NamedColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; wxColour *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "colorName", NULL @@ -812,7 +995,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(); @@ -846,8 +1029,10 @@ static PyObject *_wrap_new_ColourRGB(PyObject *self, PyObject *args, PyObject *k }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_ColourRGB",kwnames,&obj0)) goto fail; - arg1 = (unsigned long) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxColour *)new wxColour(arg1); @@ -862,6 +1047,30 @@ static PyObject *_wrap_new_ColourRGB(PyObject *self, PyObject *args, PyObject *k } +static PyObject *_wrap_delete_Colour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColour *arg1 = (wxColour *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Colour",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,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_Colour_Red(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxColour *arg1 = (wxColour *) 0 ; @@ -880,7 +1089,7 @@ static PyObject *_wrap_Colour_Red(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -905,7 +1114,7 @@ static PyObject *_wrap_Colour_Green(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -930,7 +1139,7 @@ static PyObject *_wrap_Colour_Blue(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedChar((unsigned char)result); return resultobj; fail: return NULL; @@ -955,7 +1164,7 @@ static PyObject *_wrap_Colour_Ok(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -978,12 +1187,18 @@ static PyObject *_wrap_Colour_Set(PyObject *self, PyObject *args, PyObject *kwar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Colour_Set",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (unsigned char) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; - arg3 = (unsigned char) PyInt_AsLong(obj2); - if (PyErr_Occurred()) SWIG_fail; - arg4 = (unsigned char) PyInt_AsLong(obj3); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (unsigned char) SWIG_PyObj_AsUnsignedChar(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Set(arg2,arg3,arg4); @@ -998,7 +1213,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 ; @@ -1008,10 +1223,12 @@ 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; + { + arg2 = (unsigned long) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Set(arg2); @@ -1026,6 +1243,71 @@ static PyObject *_wrap_Colour_SetRBG(PyObject *self, PyObject *args, PyObject *k } +static PyObject *_wrap_Colour_SetFromName(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_SetFromName",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_GetPixel(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColour *arg1 = (wxColour *) 0 ; + long result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Colour_GetPixel",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (long)((wxColour const *)arg1)->GetPixel(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_PyObj_FromLong((long)result); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Colour___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxColour *arg1 = (wxColour *) 0 ; @@ -1051,7 +1333,7 @@ static PyObject *_wrap_Colour___eq__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1083,7 +1365,7 @@ static PyObject *_wrap_Colour___ne__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1115,6 +1397,31 @@ static PyObject *_wrap_Colour_Get(PyObject *self, PyObject *args, PyObject *kwar } +static PyObject *_wrap_Colour_GetRGB(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxColour *arg1 = (wxColour *) 0 ; + unsigned long result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Colour_GetRGB",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColour,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (unsigned long)wxColour_GetRGB(arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); + return resultobj; + fail: + return NULL; +} + + static PyObject * Colour_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -1129,6 +1436,7 @@ static PyObject *_wrap_new_Palette(PyObject *self, PyObject *args, PyObject *kwa unsigned char *arg3 = (unsigned char *) 0 ; unsigned char *arg4 = (unsigned char *) 0 ; wxPalette *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -1136,7 +1444,11 @@ static PyObject *_wrap_new_Palette(PyObject *self, PyObject *args, PyObject *kwa (char *) "n",(char *) "red",(char *) "green",(char *) "blue", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iOOO:new_Palette",kwnames,&arg1,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:new_Palette",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_unsigned_char,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_unsigned_char,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_unsigned_char,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -1195,23 +1507,29 @@ static PyObject *_wrap_Palette_GetPixel(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Palette_GetPixel",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (byte) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; - arg3 = (byte) PyInt_AsLong(obj2); - if (PyErr_Occurred()) SWIG_fail; - arg4 = (byte) PyInt_AsLong(obj3); - if (PyErr_Occurred()) SWIG_fail; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetPixel(arg2,arg3,arg4); - - wxPyEndAllowThreads(__tstate); + arg2 = (byte) SWIG_PyObj_AsUnsignedChar(obj1); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; + { + arg3 = (byte) SWIG_PyObj_AsUnsignedChar(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (byte) SWIG_PyObj_AsUnsignedChar(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetPixel(arg2,arg3,arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_PyObj_FromInt((int)result); + return resultobj; + fail: + return NULL; } @@ -1227,6 +1545,7 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject * byte temp4 ; byte temp5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pixel", NULL }; @@ -1234,8 +1553,12 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject * arg3 = &temp3; arg4 = &temp4; arg5 = &temp5; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Palette_GetRGB",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Palette_GetRGB",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->GetRGB(arg2,arg3,arg4,arg5); @@ -1243,7 +1566,7 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { PyObject *o = PyInt_FromLong((long) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -1280,7 +1603,7 @@ static PyObject *_wrap_Palette_Ok(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1302,15 +1625,29 @@ static PyObject *_wrap_new_Pen(PyObject *self, PyObject *args, PyObject *kwargs) wxPen *result; wxColour temp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "colour",(char *) "width",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:new_Pen",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_Pen",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = &temp1; if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPen *)new wxPen(*arg1,arg2,arg3); @@ -1367,7 +1704,7 @@ static PyObject *_wrap_Pen_GetCap(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1421,7 +1758,7 @@ static PyObject *_wrap_Pen_GetJoin(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1446,7 +1783,7 @@ static PyObject *_wrap_Pen_GetStyle(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1471,7 +1808,7 @@ static PyObject *_wrap_Pen_GetWidth(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1496,7 +1833,7 @@ static PyObject *_wrap_Pen_Ok(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1508,12 +1845,17 @@ static PyObject *_wrap_Pen_SetCap(PyObject *self, PyObject *args, PyObject *kwar wxPen *arg1 = (wxPen *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "cap_style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Pen_SetCap",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetCap",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCap(arg2); @@ -1564,12 +1906,17 @@ static PyObject *_wrap_Pen_SetJoin(PyObject *self, PyObject *args, PyObject *kwa wxPen *arg1 = (wxPen *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "join_style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Pen_SetJoin",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetJoin",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetJoin(arg2); @@ -1589,12 +1936,17 @@ static PyObject *_wrap_Pen_SetStyle(PyObject *self, PyObject *args, PyObject *kw wxPen *arg1 = (wxPen *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Pen_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle(arg2); @@ -1614,12 +1966,17 @@ static PyObject *_wrap_Pen_SetWidth(PyObject *self, PyObject *args, PyObject *kw wxPen *arg1 = (wxPen *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Pen_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -1697,6 +2054,87 @@ static PyObject *_wrap_Pen_GetDashes(PyObject *self, PyObject *args, PyObject *k } +static PyObject *_wrap_Pen___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPen *arg1 = (wxPen *) 0 ; + wxPen *arg2 = (wxPen *) 0 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "other", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen___eq__",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)wxPen___eq__(arg1,(wxPen const *)arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Pen___ne__(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPen *arg1 = (wxPen *) 0 ; + wxPen *arg2 = (wxPen *) 0 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "other", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen___ne__",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)wxPen___ne__(arg1,(wxPen const *)arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Pen_GetDashCount(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPen *arg1 = (wxPen *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Pen_GetDashCount",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxPen const *)arg1)->GetDashCount(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_PyObj_FromInt((int)result); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Pen_GetStipple(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPen *arg1 = (wxPen *) 0 ; @@ -1767,15 +2205,29 @@ static PyObject *_wrap_new_PyPen(PyObject *self, PyObject *args, PyObject *kwarg wxPyPen *result; wxColour temp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "colour",(char *) "width",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:new_PyPen",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_PyPen",kwnames,&obj0,&obj1,&obj2)) goto fail; { arg1 = &temp1; if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyPen *)new wxPyPen(*arg1,arg2,arg3); @@ -1866,15 +2318,22 @@ static PyObject *_wrap_new_Brush(PyObject *self, PyObject *args, PyObject *kwarg wxBrush *result; wxColour temp1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "colour",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_Brush",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_Brush",kwnames,&obj0,&obj1)) goto fail; { arg1 = &temp1; if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBrush *)new wxBrush((wxColour const &)*arg1,arg2); @@ -1949,12 +2408,17 @@ static PyObject *_wrap_Brush_SetStyle(PyObject *self, PyObject *args, PyObject * wxBrush *arg1 = (wxBrush *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Brush_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Brush_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle(arg2); @@ -2046,7 +2510,7 @@ static PyObject *_wrap_Brush_GetStyle(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2096,7 +2560,7 @@ static PyObject *_wrap_Brush_Ok(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2115,17 +2579,24 @@ 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 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "name",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_Bitmap",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_Bitmap",kwnames,&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; + } + if (obj1) { + { + arg2 = (wxBitmapType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2179,11 +2650,28 @@ static PyObject *_wrap_new_EmptyBitmap(PyObject *self, PyObject *args, PyObject int arg2 ; int arg3 = (int) -1 ; wxBitmap *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "depth", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"ii|i:new_EmptyBitmap",kwnames,&arg1,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_EmptyBitmap",kwnames,&obj0,&obj1,&obj2)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBitmap *)new wxBitmap(arg1,arg2,arg3); @@ -2232,15 +2720,22 @@ static PyObject *_wrap_new_BitmapFromImage(PyObject *self, PyObject *args, PyObj int arg2 = (int) -1 ; wxBitmap *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "image",(char *) "depth", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_BitmapFromImage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_BitmapFromImage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBitmap *)new wxBitmap((wxImage const &)*arg1,arg2); @@ -2288,12 +2783,29 @@ static PyObject *_wrap_new_BitmapFromBits(PyObject *self, PyObject *args, PyObje int arg4 = (int) 1 ; wxBitmap *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "bits",(char *) "width",(char *) "height",(char *) "depth", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:new_BitmapFromBits",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:new_BitmapFromBits",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; arg1 = obj0; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxBitmap *)new_wxBitmap(arg1,arg2,arg3,arg4); @@ -2356,7 +2868,7 @@ static PyObject *_wrap_Bitmap_GetHandle(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -2368,12 +2880,17 @@ static PyObject *_wrap_Bitmap_SetHandle(PyObject *self, PyObject *args, PyObject wxBitmap *arg1 = (wxBitmap *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "handle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Bitmap_SetHandle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetHandle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHandle(arg2); @@ -2406,7 +2923,7 @@ static PyObject *_wrap_Bitmap_Ok(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2431,7 +2948,7 @@ static PyObject *_wrap_Bitmap_GetWidth(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2456,7 +2973,7 @@ static PyObject *_wrap_Bitmap_GetHeight(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2481,7 +2998,7 @@ static PyObject *_wrap_Bitmap_GetDepth(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2643,20 +3160,25 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "type",(char *) "palette", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|O:Bitmap_SaveFile",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Bitmap_SaveFile",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + { + arg3 = (wxBitmapType) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -2668,7 +3190,7 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -2689,19 +3211,24 @@ 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 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "name",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:Bitmap_LoadFile",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Bitmap_LoadFile",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + { + arg3 = (wxBitmapType) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2710,7 +3237,7 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -2749,7 +3276,7 @@ static PyObject *_wrap_Bitmap_CopyFromIcon(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2761,12 +3288,17 @@ static PyObject *_wrap_Bitmap_SetHeight(PyObject *self, PyObject *args, PyObject wxBitmap *arg1 = (wxBitmap *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Bitmap_SetHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeight(arg2); @@ -2786,12 +3318,17 @@ static PyObject *_wrap_Bitmap_SetWidth(PyObject *self, PyObject *args, PyObject wxBitmap *arg1 = (wxBitmap *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Bitmap_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -2811,12 +3348,17 @@ static PyObject *_wrap_Bitmap_SetDepth(PyObject *self, PyObject *args, PyObject wxBitmap *arg1 = (wxBitmap *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "depth", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Bitmap_SetDepth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetDepth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDepth(arg2); @@ -2855,7 +3397,7 @@ static PyObject *_wrap_Bitmap_CopyFromCursor(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2880,7 +3422,7 @@ static PyObject *_wrap_Bitmap_GetQuality(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2892,12 +3434,17 @@ static PyObject *_wrap_Bitmap_SetQuality(PyObject *self, PyObject *args, PyObjec wxBitmap *arg1 = (wxBitmap *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "q", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Bitmap_SetQuality",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetQuality",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetQuality(arg2); @@ -2922,35 +3469,8 @@ static PyObject * Bitmap_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_Mask(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxBitmap *arg1 = 0 ; - wxMask *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "bitmap", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_Mask",kwnames,&obj0)) 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; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxMask *)new wxMask((wxBitmap const &)*arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxMask, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_MaskColour(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBitmap *arg1 = 0 ; - wxColour *arg2 = 0 ; + wxColour const &arg2_defvalue = wxNullColour ; + wxColour *arg2 = (wxColour *) &arg2_defvalue ; wxMask *result; wxColour temp2 ; PyObject * obj0 = 0 ; @@ -2959,18 +3479,20 @@ static PyObject *_wrap_new_MaskColour(PyObject *self, PyObject *args, PyObject * (char *) "bitmap",(char *) "colour", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_MaskColour",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_Mask",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; } - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + if (obj1) { + { + arg2 = &temp2; + if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxMask *)new wxMask((wxBitmap const &)*arg1,(wxColour const &)*arg2); + result = (wxMask *)new_wxMask((wxBitmap const &)*arg1,(wxColour const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2992,25 +3514,44 @@ static PyObject * Mask_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - long arg2 ; + int arg2 ; int arg3 = (int) -1 ; int arg4 = (int) -1 ; wxIcon *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "name",(char *) "flags",(char *) "desiredWidth",(char *) "desiredHeight", NULL + (char *) "name",(char *) "type",(char *) "desiredWidth",(char *) "desiredHeight", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|ii:new_Icon",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_Icon",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; + } + { + arg2 = (wxBitmapType) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxIcon *)new wxIcon((wxString const &)*arg1,arg2,arg3,arg4); + result = (wxIcon *)new wxIcon((wxString const &)*arg1,(wxBitmapType )arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -3161,30 +3702,35 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxIcon *arg1 = (wxIcon *) 0 ; wxString *arg2 = 0 ; - long arg3 ; + int arg3 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "name",(char *) "flags", NULL + (char *) "self",(char *) "name",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:Icon_LoadFile",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Icon_LoadFile",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + { + arg3 = (wxBitmapType) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->LoadFile((wxString const &)*arg2,arg3); + result = (bool)(arg1)->LoadFile((wxString const &)*arg2,(wxBitmapType )arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -3217,7 +3763,7 @@ static PyObject *_wrap_Icon_GetHandle(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -3229,12 +3775,17 @@ static PyObject *_wrap_Icon_SetHandle(PyObject *self, PyObject *args, PyObject * wxIcon *arg1 = (wxIcon *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "handle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Icon_SetHandle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetHandle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHandle(arg2); @@ -3267,7 +3818,7 @@ static PyObject *_wrap_Icon_Ok(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -3292,7 +3843,7 @@ static PyObject *_wrap_Icon_GetWidth(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3317,7 +3868,7 @@ static PyObject *_wrap_Icon_GetHeight(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3342,7 +3893,7 @@ static PyObject *_wrap_Icon_GetDepth(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3354,12 +3905,17 @@ static PyObject *_wrap_Icon_SetWidth(PyObject *self, PyObject *args, PyObject *k wxIcon *arg1 = (wxIcon *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Icon_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -3379,12 +3935,17 @@ static PyObject *_wrap_Icon_SetHeight(PyObject *self, PyObject *args, PyObject * wxIcon *arg1 = (wxIcon *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Icon_SetHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeight(arg2); @@ -3404,12 +3965,17 @@ static PyObject *_wrap_Icon_SetDepth(PyObject *self, PyObject *args, PyObject *k wxIcon *arg1 = (wxIcon *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "d", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Icon_SetDepth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Icon_SetDepth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDepth(arg2); @@ -3497,14 +4063,26 @@ 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 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "filename",(char *) "num", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|Oi:new_IconLocation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_IconLocation",kwnames,&obj0,&obj1)) 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; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3514,8 +4092,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; } @@ -3562,7 +4148,7 @@ static PyObject *_wrap_IconLocation_IsOk(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -3573,7 +4159,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[] = { @@ -3585,7 +4171,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(); @@ -3630,7 +4216,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; @@ -3642,12 +4234,17 @@ static PyObject *_wrap_IconLocation_SetIndex(PyObject *self, PyObject *args, PyO wxIconLocation *arg1 = (wxIconLocation *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "num", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:IconLocation_SetIndex",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IconLocation_SetIndex",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconLocation,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxIconLocation_SetIndex(arg1,arg2); @@ -3680,7 +4277,7 @@ static PyObject *_wrap_IconLocation_GetIndex(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3721,17 +4318,22 @@ 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 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "file",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:new_IconBundleFromFile",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_IconBundleFromFile",kwnames,&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; + } + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3842,19 +4444,24 @@ 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 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "file",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:IconBundle_AddIconFromFile",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:IconBundle_AddIconFromFile",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIconBundle,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3927,13 +4534,37 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 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; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_Cursor",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = True; + } + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCursor *)new_wxCursor((wxString const *)arg1,arg2,arg3,arg4); @@ -3942,8 +4573,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; } @@ -3976,11 +4615,16 @@ static PyObject *_wrap_new_StockCursor(PyObject *self, PyObject *args, PyObject PyObject *resultobj; int arg1 ; wxCursor *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:new_StockCursor",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_StockCursor",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCursor *)new wxCursor(arg1); @@ -4033,13 +4677,37 @@ static PyObject *_wrap_new_CursorFromBits(PyObject *self, PyObject *args, PyObje PyObject *arg6 = (PyObject *) 0 ; wxCursor *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "bits",(char *) "width",(char *) "height",(char *) "hotSpotX",(char *) "hotSpotY",(char *) "maskBits", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|iiO:new_CursorFromBits",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:new_CursorFromBits",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; arg1 = obj0; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { arg6 = obj5; } @@ -4075,7 +4743,7 @@ static PyObject *_wrap_Cursor_GetHandle(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -4087,12 +4755,17 @@ static PyObject *_wrap_Cursor_SetHandle(PyObject *self, PyObject *args, PyObject wxCursor *arg1 = (wxCursor *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "handle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Cursor_SetHandle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetHandle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHandle(arg2); @@ -4125,7 +4798,7 @@ static PyObject *_wrap_Cursor_Ok(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4150,7 +4823,7 @@ static PyObject *_wrap_Cursor_GetWidth(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4175,7 +4848,7 @@ static PyObject *_wrap_Cursor_GetHeight(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4200,7 +4873,7 @@ static PyObject *_wrap_Cursor_GetDepth(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4212,12 +4885,17 @@ static PyObject *_wrap_Cursor_SetWidth(PyObject *self, PyObject *args, PyObject wxCursor *arg1 = (wxCursor *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Cursor_SetWidth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetWidth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWidth(arg2); @@ -4237,12 +4915,17 @@ static PyObject *_wrap_Cursor_SetHeight(PyObject *self, PyObject *args, PyObject wxCursor *arg1 = (wxCursor *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Cursor_SetHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetHeight(arg2); @@ -4262,12 +4945,17 @@ static PyObject *_wrap_Cursor_SetDepth(PyObject *self, PyObject *args, PyObject wxCursor *arg1 = (wxCursor *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "d", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Cursor_SetDepth",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Cursor_SetDepth",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDepth(arg2); @@ -4322,16 +5010,44 @@ 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; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiii:new_Region",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_Region",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRegion *)new wxRegion(arg1,arg2,arg3,arg4); @@ -4356,11 +5072,12 @@ static PyObject *_wrap_new_RegionFromBitmap(PyObject *self, PyObject *args, PyOb wxColour temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "bmp",(char *) "transColour",(char *) "tolerance", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|Oi:new_RegionFromBitmap",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:new_RegionFromBitmap",kwnames,&obj0,&obj1,&obj2)) 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; @@ -4371,6 +5088,12 @@ static PyObject *_wrap_new_RegionFromBitmap(PyObject *self, PyObject *args, PyOb if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; } } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRegion *)new wxRegion((wxBitmap const &)*arg1,(wxColour const &)*arg2,arg3); @@ -4392,15 +5115,22 @@ static PyObject *_wrap_new_RegionFromPoints(PyObject *self, PyObject *args, PyOb int arg3 = (int) wxWINDING_RULE ; wxRegion *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "points",(char *) "fillStyle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_RegionFromPoints",kwnames,&obj0,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_RegionFromPoints",kwnames,&obj0,&obj1)) goto fail; { arg2 = wxPoint_LIST_helper(obj0, &arg1); if (arg2 == NULL) SWIG_fail; } + if (obj1) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxRegion *)new wxRegion(arg1,arg2,arg3); @@ -4472,16 +5202,26 @@ static PyObject *_wrap_Region_Clear(PyObject *self, PyObject *args, PyObject *kw static PyObject *_wrap_Region_Offset(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxRegion *arg1 = (wxRegion *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Region_Offset",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Region_Offset",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Offset(arg2,arg3); @@ -4489,7 +5229,7 @@ static PyObject *_wrap_Region_Offset(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4499,16 +5239,26 @@ static PyObject *_wrap_Region_Offset(PyObject *self, PyObject *args, PyObject *k 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Region_Contains",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Region_Contains",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->Contains(arg2,arg3); @@ -4516,7 +5266,7 @@ static PyObject *_wrap_Region_Contains(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4548,7 +5298,7 @@ static PyObject *_wrap_Region_ContainsPoint(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4580,7 +5330,7 @@ static PyObject *_wrap_Region_ContainsRect(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4590,18 +5340,38 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_ContainsRectDim",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_ContainsRectDim",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->Contains(arg2,arg3,arg4,arg5); @@ -4609,7 +5379,7 @@ static PyObject *_wrap_Region_ContainsRectDim(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4648,18 +5418,38 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_Intersect",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Intersect",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Intersect(arg2,arg3,arg4,arg5); @@ -4667,7 +5457,7 @@ static PyObject *_wrap_Region_Intersect(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4699,7 +5489,7 @@ static PyObject *_wrap_Region_IntersectRect(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4730,7 +5520,7 @@ static PyObject *_wrap_Region_IntersectRegion(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4755,7 +5545,7 @@ static PyObject *_wrap_Region_IsEmpty(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4765,18 +5555,38 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_Union",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Union",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Union(arg2,arg3,arg4,arg5); @@ -4784,7 +5594,7 @@ static PyObject *_wrap_Region_Union(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4816,7 +5626,7 @@ static PyObject *_wrap_Region_UnionRect(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4847,7 +5657,7 @@ static PyObject *_wrap_Region_UnionRegion(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4857,18 +5667,38 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_Subtract",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Subtract",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Subtract(arg2,arg3,arg4,arg5); @@ -4876,7 +5706,7 @@ static PyObject *_wrap_Region_Subtract(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4908,7 +5738,7 @@ static PyObject *_wrap_Region_SubtractRect(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4939,7 +5769,7 @@ static PyObject *_wrap_Region_SubtractRegion(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4949,26 +5779,46 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:Region_Xor",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Region_Xor",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Xor(arg2,arg3,arg4,arg5); + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->Xor(arg2,arg3,arg4,arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5000,7 +5850,7 @@ static PyObject *_wrap_Region_XorRect(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5031,7 +5881,7 @@ static PyObject *_wrap_Region_XorRegion(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5079,11 +5929,12 @@ static PyObject *_wrap_Region_UnionBitmap(PyObject *self, PyObject *args, PyObje PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "bmp",(char *) "transColour",(char *) "tolerance", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|Oi:Region_UnionBitmap",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Region_UnionBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -5095,6 +5946,12 @@ static PyObject *_wrap_Region_UnionBitmap(PyObject *self, PyObject *args, PyObje if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; } } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Union((wxBitmap const &)*arg2,(wxColour const &)*arg3,arg4); @@ -5102,7 +5959,7 @@ static PyObject *_wrap_Region_UnionBitmap(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5171,7 +6028,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 @@ -5181,12 +6038,12 @@ 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5196,7 +6053,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 @@ -5206,12 +6063,12 @@ 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5221,7 +6078,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 @@ -5231,12 +6088,12 @@ 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5246,7 +6103,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 @@ -5256,12 +6113,12 @@ 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5271,7 +6128,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 @@ -5281,12 +6138,12 @@ 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5296,7 +6153,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 @@ -5306,12 +6163,12 @@ 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5365,7 +6222,7 @@ static PyObject *_wrap_RegionIterator_HaveRects(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5438,7 +6295,7 @@ static PyObject *_wrap_RegionIterator___nonzero__(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5570,7 +6427,7 @@ static PyObject *_wrap_NativeFontInfo_GetPointSize(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5595,7 +6452,7 @@ static PyObject *_wrap_NativeFontInfo_GetStyle(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5620,7 +6477,7 @@ static PyObject *_wrap_NativeFontInfo_GetWeight(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5645,7 +6502,7 @@ static PyObject *_wrap_NativeFontInfo_GetUnderlined(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5701,7 +6558,7 @@ static PyObject *_wrap_NativeFontInfo_GetFamily(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5726,7 +6583,7 @@ static PyObject *_wrap_NativeFontInfo_GetEncoding(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5738,12 +6595,17 @@ static PyObject *_wrap_NativeFontInfo_SetPointSize(PyObject *self, PyObject *arg wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pointsize", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetPointSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetPointSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPointSize(arg2); @@ -5763,12 +6625,17 @@ static PyObject *_wrap_NativeFontInfo_SetStyle(PyObject *self, PyObject *args, P wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontStyle) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle((wxFontStyle )arg2); @@ -5788,12 +6655,17 @@ static PyObject *_wrap_NativeFontInfo_SetWeight(PyObject *self, PyObject *args, wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weight", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetWeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetWeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontWeight) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWeight((wxFontWeight )arg2); @@ -5820,8 +6692,10 @@ static PyObject *_wrap_NativeFontInfo_SetUnderlined(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetUnderlined",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetUnderlined(arg2); @@ -5840,7 +6714,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[] = { @@ -5849,8 +6722,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); @@ -5870,12 +6747,17 @@ static PyObject *_wrap_NativeFontInfo_SetFamily(PyObject *self, PyObject *args, wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "family", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetFamily",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetFamily",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontFamily) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFamily((wxFontFamily )arg2); @@ -5895,12 +6777,17 @@ static PyObject *_wrap_NativeFontInfo_SetEncoding(PyObject *self, PyObject *args wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeFontInfo_SetEncoding",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetEncoding",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEncoding((wxFontEncoding )arg2); @@ -5920,7 +6807,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[] = { @@ -5932,7 +6819,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(); @@ -5941,7 +6828,7 @@ static PyObject *_wrap_NativeFontInfo_FromString(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -6023,7 +6910,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[] = { @@ -6035,7 +6922,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(); @@ -6044,7 +6931,7 @@ static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -6100,8 +6987,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[] = { @@ -6110,13 +6997,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; } @@ -6124,7 +7022,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 @@ -6132,13 +7030,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; @@ -6152,12 +7050,17 @@ static PyObject *_wrap_NativeEncodingInfo_encoding_set(PyObject *self, PyObject wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:NativeEncodingInfo_encoding_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeEncodingInfo_encoding_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->encoding = (wxFontEncoding )arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -6180,7 +7083,7 @@ static PyObject *_wrap_NativeEncodingInfo_encoding_get(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->encoding); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6238,7 +7141,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[] = { @@ -6250,7 +7153,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(); @@ -6259,7 +7162,7 @@ static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -6316,11 +7219,16 @@ static PyObject *_wrap_GetNativeFontEncoding(PyObject *self, PyObject *args, PyO PyObject *resultobj; int arg1 ; wxNativeEncodingInfo *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:GetNativeFontEncoding",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetNativeFontEncoding",kwnames,&obj0)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxNativeEncodingInfo *)wxGetNativeFontEncoding((wxFontEncoding )arg1); @@ -6356,7 +7264,7 @@ static PyObject *_wrap_TestFontEncoding(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6460,9 +7368,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 ; @@ -6475,11 +7383,13 @@ 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; - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6488,7 +7398,7 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); { if (temp2) delete arg2; @@ -6518,7 +7428,7 @@ static PyObject *_wrap_FontMapper_GetSupportedEncodingsCount(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -6535,8 +7445,10 @@ static PyObject *_wrap_FontMapper_GetEncoding(PyObject *self, PyObject *args, Py }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncoding",kwnames,&obj0)) goto fail; - arg1 = (size_t) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (size_t) SWIG_PyObj_AsUnsignedLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)wxFontMapper::GetEncoding(arg1); @@ -6544,7 +7456,7 @@ static PyObject *_wrap_FontMapper_GetEncoding(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6555,11 +7467,16 @@ static PyObject *_wrap_FontMapper_GetEncodingName(PyObject *self, PyObject *args PyObject *resultobj; int arg1 ; wxString result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:FontMapper_GetEncodingName",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingName",kwnames,&obj0)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxFontMapper::GetEncodingName((wxFontEncoding )arg1); @@ -6584,11 +7501,16 @@ static PyObject *_wrap_FontMapper_GetEncodingDescription(PyObject *self, PyObjec PyObject *resultobj; int arg1 ; wxString result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:FontMapper_GetEncodingDescription",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingDescription",kwnames,&obj0)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxFontMapper::GetEncodingDescription((wxFontEncoding )arg1); @@ -6640,7 +7562,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[] = { @@ -6652,7 +7574,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(); @@ -6710,28 +7632,35 @@ 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 * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding",(char *) "facename",(char *) "interactive", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OO:FontMapper_GetAltForEncoding",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:FontMapper_GetAltForEncoding",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontMapper,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } if (obj3) { - arg4 = PyInt_AsLong(obj3) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg4 = (bool) SWIG_PyObj_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6762,20 +7691,25 @@ 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 * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding",(char *) "facename", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:FontMapper_IsEncodingAvailable",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FontMapper_IsEncodingAvailable",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontMapper,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } { @@ -6785,7 +7719,7 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp3) delete arg3; @@ -6831,7 +7765,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[] = { @@ -6843,7 +7777,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(); @@ -6880,28 +7814,57 @@ 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 * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "pointSize",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "face",(char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iiii|OOi:new_Font",kwnames,&arg1,&arg2,&arg3,&arg4,&obj4,&obj5,&arg7)) goto fail; - if (obj4) { - arg5 = PyInt_AsLong(obj4) ? true : false; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:new_Font",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); if (PyErr_Occurred()) SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj4) { + { + arg5 = (bool) SWIG_PyObj_AsBool(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; + } + } + if (obj6) { + { + arg7 = (wxFontEncoding) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; } } { @@ -6982,7 +7945,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 @@ -6992,7 +7955,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(); @@ -7025,18 +7988,42 @@ 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 * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "pointSize",(char *) "family",(char *) "flags",(char *) "face",(char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"ii|iOi:new_Font2",kwnames,&arg1,&arg2,&arg3,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_Font2",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (wxFontFamily) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; + } + } + if (obj4) { + { + arg5 = (wxFontEncoding) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } } { @@ -7079,7 +8066,7 @@ static PyObject *_wrap_Font_Ok(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7089,28 +8076,25 @@ static PyObject *_wrap_Font_Ok(PyObject *self, PyObject *args, PyObject *kwargs) static PyObject *_wrap_Font___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; - wxFont *arg2 = 0 ; + wxFont *arg2 = (wxFont *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "font", NULL + (char *) "self",(char *) "other", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font___eq__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxFont const *)arg1)->operator ==((wxFont const &)*arg2); + result = (bool)wxFont___eq__(arg1,(wxFont const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7120,28 +8104,25 @@ static PyObject *_wrap_Font___eq__(PyObject *self, PyObject *args, PyObject *kwa static PyObject *_wrap_Font___ne__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFont *arg1 = (wxFont *) 0 ; - wxFont *arg2 = 0 ; + wxFont *arg2 = (wxFont *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "font", NULL + (char *) "self",(char *) "other", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font___ne__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxFont const *)arg1)->operator !=((wxFont const &)*arg2); + result = (bool)wxFont___ne__(arg1,(wxFont const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7166,7 +8147,7 @@ static PyObject *_wrap_Font_GetPointSize(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7191,7 +8172,7 @@ static PyObject *_wrap_Font_GetFamily(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7216,7 +8197,7 @@ static PyObject *_wrap_Font_GetStyle(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7241,7 +8222,7 @@ static PyObject *_wrap_Font_GetWeight(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7266,7 +8247,7 @@ static PyObject *_wrap_Font_GetUnderlined(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7322,7 +8303,7 @@ static PyObject *_wrap_Font_GetEncoding(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7372,7 +8353,7 @@ static PyObject *_wrap_Font_IsFixedWidth(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7446,12 +8427,17 @@ static PyObject *_wrap_Font_SetPointSize(PyObject *self, PyObject *args, PyObjec wxFont *arg1 = (wxFont *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pointSize", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetPointSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetPointSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPointSize(arg2); @@ -7471,12 +8457,17 @@ static PyObject *_wrap_Font_SetFamily(PyObject *self, PyObject *args, PyObject * wxFont *arg1 = (wxFont *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "family", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetFamily",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetFamily",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFamily(arg2); @@ -7496,12 +8487,17 @@ static PyObject *_wrap_Font_SetStyle(PyObject *self, PyObject *args, PyObject *k wxFont *arg1 = (wxFont *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle(arg2); @@ -7521,12 +8517,17 @@ static PyObject *_wrap_Font_SetWeight(PyObject *self, PyObject *args, PyObject * wxFont *arg1 = (wxFont *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "weight", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetWeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetWeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetWeight(arg2); @@ -7545,7 +8546,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[] = { @@ -7557,7 +8558,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(); @@ -7593,8 +8594,10 @@ static PyObject *_wrap_Font_SetUnderlined(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetUnderlined",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetUnderlined(arg2); @@ -7614,12 +8617,17 @@ static PyObject *_wrap_Font_SetEncoding(PyObject *self, PyObject *args, PyObject wxFont *arg1 = (wxFont *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Font_SetEncoding",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Font_SetEncoding",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEncoding((wxFontEncoding )arg2); @@ -7668,7 +8676,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[] = { @@ -7680,7 +8688,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(); @@ -7708,7 +8716,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[] = { @@ -7720,7 +8728,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(); @@ -7840,7 +8848,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[] = { @@ -7850,8 +8858,10 @@ static PyObject *_wrap_Font_SetNoAntiAliasing(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Font_SetNoAntiAliasing",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7885,7 +8895,7 @@ static PyObject *_wrap_Font_GetNoAntiAliasing(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7907,7 +8917,7 @@ static PyObject *_wrap_Font_GetDefaultEncoding(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7917,11 +8927,16 @@ static PyObject *_wrap_Font_GetDefaultEncoding(PyObject *self, PyObject *args, P static PyObject *_wrap_Font_SetDefaultEncoding(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "encoding", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Font_SetDefaultEncoding",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_SetDefaultEncoding",kwnames,&obj0)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxFont::SetDefaultEncoding((wxFontEncoding )arg1); @@ -8007,8 +9022,10 @@ static PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *self, PyObject if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFontEnumerator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = obj1; arg3 = obj2; - arg4 = PyInt_AsLong(obj3) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg4 = (bool) SWIG_PyObj_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->_setCallbackInfo(arg2,arg3,arg4); @@ -8027,19 +9044,28 @@ 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 * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "encoding",(char *) "fixedWidthOnly", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:FontEnumerator_EnumerateFacenames",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:FontEnumerator_EnumerateFacenames",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyFontEnumerator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8048,7 +9074,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8061,7 +9087,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[] = { @@ -8074,7 +9100,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *self, PyObjec { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } } { @@ -8084,7 +9110,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -8161,12 +9187,17 @@ static PyObject *_wrap_LanguageInfo_Language_set(PyObject *self, PyObject *args, wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "Language", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:LanguageInfo_Language_set",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_Language_set",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (arg1) (arg1)->Language = arg2; Py_INCREF(Py_None); resultobj = Py_None; @@ -8189,7 +9220,7 @@ static PyObject *_wrap_LanguageInfo_Language_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (int) ((arg1)->Language); - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8199,8 +9230,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[] = { @@ -8209,13 +9240,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; } @@ -8223,7 +9265,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 @@ -8231,13 +9273,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; @@ -8249,8 +9291,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[] = { @@ -8259,13 +9301,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; } @@ -8273,7 +9326,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 @@ -8281,13 +9334,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; @@ -8308,11 +9361,25 @@ static PyObject *_wrap_new_Locale(PyObject *self, PyObject *args, PyObject *kwar int arg1 = (int) wxLANGUAGE_DEFAULT ; int arg2 = (int) wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING ; wxLocale *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "language",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_Locale",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Locale",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxLocale *)new wxLocale(arg1,arg2); @@ -8359,12 +9426,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 ; @@ -8380,29 +9447,33 @@ 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) { - arg5 = PyInt_AsLong(obj4) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg5 = (bool) SWIG_PyObj_AsBool(obj4); + if (PyErr_Occurred()) SWIG_fail; + } } if (obj5) { - arg6 = PyInt_AsLong(obj5) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg6 = (bool) SWIG_PyObj_AsBool(obj5); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8411,7 +9482,7 @@ static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -8449,20 +9520,34 @@ static PyObject *_wrap_Locale_Init2(PyObject *self, PyObject *args, PyObject *kw int arg3 = (int) wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "language",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:Locale_Init2",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Locale_Init2",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLocale,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Init(arg2,arg3); + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->Init(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8484,7 +9569,7 @@ static PyObject *_wrap_Locale_GetSystemLanguage(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8506,7 +9591,7 @@ static PyObject *_wrap_Locale_GetSystemEncoding(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8559,7 +9644,7 @@ static PyObject *_wrap_Locale_IsOk(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8615,7 +9700,7 @@ static PyObject *_wrap_Locale_GetLanguage(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8687,7 +9772,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 @@ -8697,7 +9782,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(); @@ -8726,7 +9811,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[] = { @@ -8738,7 +9823,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(); @@ -8747,7 +9832,7 @@ static PyObject *_wrap_Locale_AddCatalog(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -8767,7 +9852,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[] = { @@ -8779,7 +9864,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(); @@ -8788,7 +9873,7 @@ static PyObject *_wrap_Locale_IsLoaded(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -8807,11 +9892,16 @@ static PyObject *_wrap_Locale_GetLanguageInfo(PyObject *self, PyObject *args, Py PyObject *resultobj; int arg1 ; wxLanguageInfo *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "lang", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Locale_GetLanguageInfo",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetLanguageInfo",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxLanguageInfo *)wxLocale::GetLanguageInfo(arg1); @@ -8830,11 +9920,16 @@ static PyObject *_wrap_Locale_GetLanguageName(PyObject *self, PyObject *args, Py PyObject *resultobj; int arg1 ; wxString result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "lang", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:Locale_GetLanguageName",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetLanguageName",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxLocale::GetLanguageName(arg1); @@ -8859,7 +9954,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 @@ -8869,7 +9964,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(); @@ -8927,8 +10022,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 ; @@ -8941,13 +10036,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; } } { @@ -9007,7 +10102,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; @@ -9047,14 +10148,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(); @@ -9090,8 +10191,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 ; @@ -9100,15 +10201,17 @@ 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) SWIG_PyObj_AsUnsignedLong(obj2); + if (PyErr_Occurred()) SWIG_fail; } - arg3 = (size_t) PyInt_AsLong(obj2); - if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxGetTranslation((wxString const &)*arg1,(wxString const &)*arg2,arg3); @@ -9157,13 +10260,7 @@ static PyObject *_wrap_GetTranslation(PyObject *self, PyObject *args) { if (argc == 1) { int _v; { - void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxString, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } + _v = PyString_Check(argv[0]) || PyUnicode_Check(argv[0]); } if (_v) { return _wrap_GetTranslation__SWIG_0(self,args); @@ -9172,27 +10269,21 @@ static PyObject *_wrap_GetTranslation(PyObject *self, PyObject *args) { if (argc == 3) { int _v; { - void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxString, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } + _v = PyString_Check(argv[0]) || PyUnicode_Check(argv[0]); } if (_v) { { - void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxString, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } + _v = PyString_Check(argv[1]) || PyUnicode_Check(argv[1]); } if (_v) { { - _v = (PyInt_Check(argv[2]) || PyLong_Check(argv[2])) ? 1 : 0; + SWIG_PyObj_AsUnsignedLong(argv[2]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } } if (_v) { return _wrap_GetTranslation__SWIG_1(self,args); @@ -9260,12 +10351,29 @@ static PyObject *_wrap_EncodingConverter_Init(PyObject *self, PyObject *args, Py int arg4 = (int) wxCONVERT_STRICT ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "input_enc",(char *) "output_enc",(char *) "method", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:EncodingConverter_Init",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:EncodingConverter_Init",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEncodingConverter,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (wxFontEncoding) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Init((wxFontEncoding )arg2,(wxFontEncoding )arg3,arg4); @@ -9273,7 +10381,7 @@ static PyObject *_wrap_EncodingConverter_Init(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9285,7 +10393,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[] = { @@ -9297,7 +10405,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(); @@ -9332,11 +10440,23 @@ static PyObject *_wrap_EncodingConverter_GetPlatformEquivalents(PyObject *self, int arg1 ; int arg2 = (int) wxPLATFORM_CURRENT ; wxFontEncodingArray result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "enc",(char *) "platform", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|i:EncodingConverter_GetPlatformEquivalents",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:EncodingConverter_GetPlatformEquivalents",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxEncodingConverter::GetPlatformEquivalents((wxFontEncoding )arg1,arg2); @@ -9362,11 +10482,16 @@ static PyObject *_wrap_EncodingConverter_GetAllEquivalents(PyObject *self, PyObj PyObject *resultobj; int arg1 ; wxFontEncodingArray result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "enc", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:EncodingConverter_GetAllEquivalents",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EncodingConverter_GetAllEquivalents",kwnames,&obj0)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxEncodingConverter::GetAllEquivalents((wxFontEncoding )arg1); @@ -9393,11 +10518,21 @@ static PyObject *_wrap_EncodingConverter_CanConvert(PyObject *self, PyObject *ar int arg1 ; int arg2 ; bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "encIn",(char *) "encOut", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"ii:EncodingConverter_CanConvert",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EncodingConverter_CanConvert",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (wxFontEncoding) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (wxFontEncoding) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)wxEncodingConverter::CanConvert((wxFontEncoding )arg1,(wxFontEncoding )arg2); @@ -9405,7 +10540,7 @@ static PyObject *_wrap_EncodingConverter_CanConvert(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9494,24 +10629,41 @@ 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; wxColour temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "col",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiO|i:DC_FloodFillXY",kwnames,&obj0,&arg2,&arg3,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_FloodFillXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = &temp4; if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->FloodFill(arg2,arg3,(wxColour const &)*arg4,arg5); @@ -9519,7 +10671,7 @@ static PyObject *_wrap_DC_FloodFillXY(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9538,11 +10690,12 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "col",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:DC_FloodFill",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:DC_FloodFill",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -9552,6 +10705,12 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw arg3 = &temp3; if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->FloodFill((wxPoint const &)*arg2,(wxColour const &)*arg3,arg4); @@ -9559,7 +10718,7 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9569,16 +10728,26 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:DC_GetPixelXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_GetPixelXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDC_GetPixelXY(arg1,arg2,arg3); @@ -9636,17 +10805,37 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_DrawLineXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawLineXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawLine(arg2,arg3,arg4,arg5); @@ -9702,15 +10891,25 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:DC_CrossHairXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_CrossHairXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CrossHair(arg2,arg3); @@ -9759,19 +10958,49 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2",(char *) "xc",(char *) "yc", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiiiii:DC_DrawArcXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:DC_DrawArcXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawArc(arg2,arg3,arg4,arg5,arg6,arg7); @@ -9834,17 +11063,37 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_DrawCheckMarkXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawCheckMarkXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawCheckMark(arg2,arg3,arg4,arg5); @@ -9893,19 +11142,49 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h",(char *) "sa",(char *) "ea", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiiidd:DC_DrawEllipticArcXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:DC_DrawEllipticArcXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg7 = (double) SWIG_PyObj_AsDouble(obj6); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawEllipticArc(arg2,arg3,arg4,arg5,arg6,arg7); @@ -9932,11 +11211,13 @@ static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObje PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "sz",(char *) "sa",(char *) "ea", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOdd:DC_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawEllipticArc",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -9946,6 +11227,14 @@ static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObje arg3 = &temp3; if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawEllipticArc((wxPoint const &)*arg2,(wxSize const &)*arg3,arg4,arg5); @@ -9963,15 +11252,25 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:DC_DrawPointXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawPointXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawPoint(arg2,arg3); @@ -10020,17 +11319,37 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_DrawRectangleXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawRectangleXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRectangle(arg2,arg3,arg4,arg5); @@ -10117,18 +11436,43 @@ 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 ; - double arg6 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; + double arg6 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiiid:DC_DrawRoundedRectangleXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:DC_DrawRoundedRectangleXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg6 = (double) SWIG_PyObj_AsDouble(obj5); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle(arg2,arg3,arg4,arg5,arg6); @@ -10154,11 +11498,12 @@ static PyObject *_wrap_DC_DrawRoundedRectangle(PyObject *self, PyObject *args, P PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "sz",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOd:DC_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawRoundedRectangle",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -10168,6 +11513,10 @@ static PyObject *_wrap_DC_DrawRoundedRectangle(PyObject *self, PyObject *args, P arg3 = &temp3; if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle((wxPoint const &)*arg2,(wxSize const &)*arg3,arg4); @@ -10190,16 +11539,21 @@ static PyObject *_wrap_DC_DrawRoundedRectangleRect(PyObject *self, PyObject *arg wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "r",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOd:DC_DrawRoundedRectangleRect",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawRoundedRectangleRect",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; } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRoundedRectangle((wxRect const &)*arg2,arg3); @@ -10217,16 +11571,31 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii:DC_DrawCircleXY",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawCircleXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawCircle(arg2,arg3,arg4); @@ -10245,20 +11614,25 @@ 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 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pt",(char *) "radius", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:DC_DrawCircle",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawCircle",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 ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawCircle((wxPoint const &)*arg2,arg3); @@ -10276,17 +11650,37 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_DrawEllipseXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawEllipseXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawEllipse(arg2,arg3,arg4,arg5); @@ -10374,20 +11768,30 @@ 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 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "icon",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:DC_DrawIconXY",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawIconXY",kwnames,&obj0,&obj1,&obj2,&obj3)) 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_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawIcon((wxIcon const &)*arg2,arg3,arg4); @@ -10443,26 +11847,38 @@ 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 * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "bmp",(char *) "x",(char *) "y",(char *) "useMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii|O:DC_DrawBitmapXY",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_DrawBitmapXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) 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_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - if (obj4) { - arg5 = PyInt_AsLong(obj4) ? true : false; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); if (PyErr_Occurred()) SWIG_fail; } + if (obj4) { + { + arg5 = (bool) SWIG_PyObj_AsBool(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawBitmap((wxBitmap const &)*arg2,arg3,arg4,arg5); @@ -10482,7 +11898,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 ; @@ -10503,8 +11919,10 @@ static PyObject *_wrap_DC_DrawBitmap(PyObject *self, PyObject *args, PyObject *k if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; } if (obj3) { - arg4 = PyInt_AsLong(obj3) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg4 = (bool) SWIG_PyObj_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10524,21 +11942,31 @@ 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 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:DC_DrawTextXY",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawTextXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10567,7 +11995,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 ; @@ -10581,7 +12009,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; @@ -10613,22 +12041,37 @@ 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 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "x",(char *) "y",(char *) "angle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiid:DC_DrawRotatedTextXY",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawRotatedTextXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (double) SWIG_PyObj_AsDouble(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10658,26 +12101,31 @@ 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 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "pt",(char *) "angle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOd:DC_DrawRotatedText",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawRotatedText",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = &temp3; if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; } + { + arg4 = (double) SWIG_PyObj_AsDouble(obj3); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawRotatedText((wxString const &)*arg2,(wxPoint const &)*arg3,arg4); @@ -10703,32 +12151,85 @@ 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 * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; + PyObject * obj10 = 0 ; + PyObject * obj11 = 0 ; char *kwnames[] = { (char *) "self",(char *) "xdest",(char *) "ydest",(char *) "width",(char *) "height",(char *) "source",(char *) "xsrc",(char *) "ysrc",(char *) "rop",(char *) "useMask",(char *) "xsrcMask",(char *) "ysrcMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiiiiOii|iOii:DC_BlitXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5,&arg7,&arg8,&arg9,&obj9,&arg11,&arg12)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO|OOOO:DC_BlitXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (obj9) { - arg10 = PyInt_AsLong(obj9) ? true : false; + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg8 = (int) SWIG_PyObj_AsInt(obj7); if (PyErr_Occurred()) SWIG_fail; } + if (obj8) { + { + arg9 = (int) SWIG_PyObj_AsInt(obj8); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj9) { + { + arg10 = (bool) SWIG_PyObj_AsBool(obj9); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj10) { + { + arg11 = (int) SWIG_PyObj_AsInt(obj10); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj11) { + { + arg12 = (int) SWIG_PyObj_AsInt(obj11); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Blit(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12); @@ -10736,7 +12237,7 @@ static PyObject *_wrap_DC_BlitXY(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10751,7 +12252,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; @@ -10764,13 +12265,14 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "self",(char *) "destPt",(char *) "sz",(char *) "source",(char *) "srcPt",(char *) "rop",(char *) "useMask",(char *) "srcPtMask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|iOO:DC_Blit",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:DC_Blit",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -10785,9 +12287,17 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) arg5 = &temp5; if ( ! wxPoint_helper(obj4, &arg5)) SWIG_fail; } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { - arg7 = PyInt_AsLong(obj6) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg7 = (bool) SWIG_PyObj_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; + } } if (obj7) { { @@ -10802,7 +12312,7 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10814,20 +12324,34 @@ 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 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "points",(char *) "xoffset",(char *) "yoffset", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|ii:DC_DrawLines",kwnames,&obj0,&obj1,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DC_DrawLines",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg3 = wxPoint_LIST_helper(obj1, &arg2); if (arg3 == NULL) SWIG_fail; } + if (obj2) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawLines(arg2,arg3,arg4,arg5); @@ -10853,21 +12377,42 @@ 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 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "points",(char *) "xoffset",(char *) "yoffset",(char *) "fillStyle", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iii:DC_DrawPolygon",kwnames,&obj0,&obj1,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:DC_DrawPolygon",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg3 = wxPoint_LIST_helper(obj1, &arg2); if (arg3 == NULL) SWIG_fail; } + if (obj2) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawPolygon(arg2,arg3,arg4,arg5,arg6); @@ -10895,26 +12440,40 @@ 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 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "rect",(char *) "alignment",(char *) "indexAccel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|ii:DC_DrawLabel",kwnames,&obj0,&obj1,&obj2,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:DC_DrawLabel",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = &temp3; if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawLabel((wxString const &)*arg2,(wxRect const &)*arg3,arg4,arg5); @@ -10946,22 +12505,24 @@ 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 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "image",(char *) "rect",(char *) "alignment",(char *) "indexAccel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|ii:DC_DrawImageLabel",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:DC_DrawImageLabel",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { 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) { @@ -10971,6 +12532,18 @@ static PyObject *_wrap_DC_DrawImageLabel(PyObject *self, PyObject *args, PyObjec arg4 = &temp4; if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxDC_DrawImageLabel(arg1,(wxString const &)*arg2,(wxBitmap const &)*arg3,(wxRect const &)*arg4,arg5,arg6); @@ -11063,7 +12636,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[] = { @@ -11075,7 +12648,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(); @@ -11084,7 +12657,7 @@ static PyObject *_wrap_DC_StartDoc(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -11296,12 +12869,17 @@ static PyObject *_wrap_DC_SetBackgroundMode(PyObject *self, PyObject *args, PyOb wxDC *arg1 = (wxDC *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_SetBackgroundMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetBackgroundMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBackgroundMode(arg2); @@ -11346,20 +12924,40 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 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 *)"OOOOO:DC_SetClippingRegionXY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetClippingRegion(arg2,arg3,arg4,arg5); @@ -11374,14 +12972,52 @@ 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 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { + wxPoint *arg2 = 0 ; + wxSize *arg3 = 0 ; + wxPoint temp2 ; + wxSize temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pt",(char *) "sz", NULL + }; + + 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 ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetClippingRegion((wxPoint const &)*arg2,(wxSize const &)*arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_DC_SetClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxDC *arg1 = (wxDC *) 0 ; + wxRect *arg2 = 0 ; + wxRect temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { (char *) "self",(char *) "rect", NULL }; @@ -11462,14 +13098,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 @@ -11543,7 +13179,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 @@ -11553,12 +13189,12 @@ 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11568,7 +13204,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 @@ -11578,12 +13214,12 @@ 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11594,11 +13230,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[] = { @@ -11612,7 +13248,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(); @@ -11648,16 +13284,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 ; @@ -11674,7 +13310,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; @@ -11721,14 +13357,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 ; @@ -11744,7 +13380,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; @@ -11783,40 +13419,51 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args, } -static PyObject *_wrap_DC_GetSizeTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_GetPartialTextExtents(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; - int *arg2 = (int *) 0 ; - int *arg3 = (int *) 0 ; - int temp2 ; - int temp3 ; + wxString *arg2 = 0 ; + wxArrayInt result; + bool temp2 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "text", NULL }; - arg2 = &temp2; - arg3 = &temp3; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_GetSizeTuple",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_GetPartialTextExtents",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->GetSize(arg2,arg3); + result = wxDC_GetPartialTextExtents(arg1,(wxString const &)*arg2); 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); + resultobj = PyList_New(0); + size_t idx; + for (idx = 0; idx < (&result)->GetCount(); idx += 1) { + PyObject* val = PyInt_FromLong( (&result)->Item(idx) ); + PyList_Append(resultobj, val); + Py_DECREF(val); + } } { - PyObject *o = PyInt_FromLong((long) (*arg3)); - resultobj = t_output_helper(resultobj,o); + if (temp2) + delete arg2; } return resultobj; fail: + { + if (temp2) + delete arg2; + } return NULL; } @@ -11850,7 +13497,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_GetSizeTuple(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; int *arg2 = (int *) 0 ; @@ -11864,11 +13511,11 @@ 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_GetSizeTuple",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)->GetSizeMM(arg2,arg3); + (arg1)->GetSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11917,26 +13564,69 @@ static PyObject *_wrap_DC_GetSizeMM(PyObject *self, PyObject *args, PyObject *kw } +static PyObject *_wrap_DC_GetSizeMMTuple(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxDC *arg1 = (wxDC *) 0 ; + int *arg2 = (int *) 0 ; + int *arg3 = (int *) 0 ; + int temp2 ; + int temp3 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + arg2 = &temp2; + arg3 = &temp3; + 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(); + ((wxDC const *)arg1)->GetSizeMM(arg2,arg3); + + 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); + } + 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 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_DeviceToLogicalX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DeviceToLogicalX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11946,23 +13636,28 @@ 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 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_DeviceToLogicalY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DeviceToLogicalY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11972,23 +13667,28 @@ 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 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_DeviceToLogicalXRel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DeviceToLogicalXRel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11998,23 +13698,28 @@ 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 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_DeviceToLogicalYRel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_DeviceToLogicalYRel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12024,23 +13729,28 @@ 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 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_LogicalToDeviceX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_LogicalToDeviceX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12050,23 +13760,28 @@ 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 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_LogicalToDeviceY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_LogicalToDeviceY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12076,23 +13791,28 @@ 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 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_LogicalToDeviceXRel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_LogicalToDeviceXRel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12102,23 +13822,28 @@ 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 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_LogicalToDeviceYRel",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_LogicalToDeviceYRel",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12143,7 +13868,7 @@ static PyObject *_wrap_DC_CanDrawBitmap(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12168,7 +13893,7 @@ static PyObject *_wrap_DC_CanGetTextExtent(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12193,7 +13918,7 @@ static PyObject *_wrap_DC_GetDepth(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12247,7 +13972,7 @@ static PyObject *_wrap_DC_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12272,7 +13997,7 @@ static PyObject *_wrap_DC_GetBackgroundMode(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12527,7 +14252,7 @@ static PyObject *_wrap_DC_GetMapMode(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12539,12 +14264,17 @@ static PyObject *_wrap_DC_SetMapMode(PyObject *self, PyObject *args, PyObject *k wxDC *arg1 = (wxDC *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_SetMapMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetMapMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMapMode(arg2); @@ -12603,12 +14333,22 @@ static PyObject *_wrap_DC_SetUserScale(PyObject *self, PyObject *args, PyObject double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:DC_SetUserScale",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetUserScale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetUserScale(arg2,arg3); @@ -12667,12 +14407,22 @@ static PyObject *_wrap_DC_SetLogicalScale(PyObject *self, PyObject *args, PyObje double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:DC_SetLogicalScale",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetLogicalScale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLogicalScale(arg2,arg3); @@ -12687,37 +14437,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: @@ -12725,28 +14466,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: @@ -12757,15 +14507,25 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:DC_SetLogicalOrigin",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetLogicalOrigin",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLogicalOrigin(arg2,arg3); @@ -12780,37 +14540,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: @@ -12818,28 +14569,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: @@ -12850,15 +14610,25 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:DC_SetDeviceOrigin",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetDeviceOrigin",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDeviceOrigin(arg2,arg3); @@ -12887,10 +14657,14 @@ static PyObject *_wrap_DC_SetAxisOrientation(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetAxisOrientation",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAxisOrientation(arg2,arg3); @@ -12923,7 +14697,7 @@ static PyObject *_wrap_DC_GetLogicalFunction(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12935,12 +14709,17 @@ static PyObject *_wrap_DC_SetLogicalFunction(PyObject *self, PyObject *args, PyO wxDC *arg1 = (wxDC *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "function", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DC_SetLogicalFunction",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetLogicalFunction",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLogicalFunction(arg2); @@ -12967,8 +14746,10 @@ static PyObject *_wrap_DC_SetOptimization(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetOptimization",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOptimization(arg2); @@ -13001,7 +14782,7 @@ static PyObject *_wrap_DC_GetOptimization(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13011,15 +14792,25 @@ 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 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:DC_CalcBoundingBox",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_CalcBoundingBox",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->CalcBoundingBox(arg2,arg3); @@ -13061,7 +14852,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 @@ -13071,12 +14862,12 @@ 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13086,7 +14877,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 @@ -13096,12 +14887,12 @@ 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13111,7 +14902,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 @@ -13121,12 +14912,12 @@ 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13136,7 +14927,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 @@ -13146,12 +14937,12 @@ 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; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -13508,18 +15299,15 @@ static PyObject * MemoryDC_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxBitmap *arg2 = 0 ; wxBufferedDC *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "dc",(char *) "buffer", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_BufferedDC",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&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_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -13539,7 +15327,97 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args, PyObject * } -static PyObject *_wrap_new_BufferedDCInternalBuffer(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxDC *arg1 = (wxDC *) 0 ; + wxSize *arg2 = 0 ; + wxBufferedDC *result; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBufferedDC, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[3]; + int ii; + + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 2); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if (argc == 2) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxDC, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + void *ptr; + if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_new_BufferedDC__SWIG_0(self,args); + } + } + } + if (argc == 2) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxDC, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2); + } + if (_v) { + return _wrap_new_BufferedDC__SWIG_1(self,args); + } + } + } + + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_BufferedDC'"); + return NULL; +} + + +static PyObject *_wrap_new_BufferedDCInternalBuffer(PyObject *self, PyObject *args) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxSize *arg2 = 0 ; @@ -13547,11 +15425,8 @@ static PyObject *_wrap_new_BufferedDCInternalBuffer(PyObject *self, PyObject *ar wxSize temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "dc",(char *) "area", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_BufferedDCInternalBuffer",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDCInternalBuffer",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; @@ -13571,6 +15446,30 @@ static PyObject *_wrap_new_BufferedDCInternalBuffer(PyObject *self, PyObject *ar } +static PyObject *_wrap_delete_BufferedDC(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxBufferedDC *arg1 = (wxBufferedDC *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_BufferedDC",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBufferedDC,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_BufferedDC_UnMask(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxBufferedDC *arg1 = (wxBufferedDC *) 0 ; @@ -13686,7 +15585,7 @@ static PyObject *_wrap_ScreenDC_StartDrawingOnTopWin(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13716,7 +15615,7 @@ static PyObject *_wrap_ScreenDC_StartDrawingOnTop(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13741,7 +15640,7 @@ static PyObject *_wrap_ScreenDC_EndDrawingOnTop(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13867,8 +15766,10 @@ static PyObject *_wrap_new_MirrorDC(PyObject *self, PyObject *args, PyObject *kw if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMirrorDC *)new wxMirrorDC(*arg1,arg2); @@ -13979,11 +15880,16 @@ static PyObject *_wrap_PostScriptDC_SetPrintData(PyObject *self, PyObject *args, static PyObject *_wrap_PostScriptDC_SetResolution(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "ppi", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:PostScriptDC_SetResolution",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PostScriptDC_SetResolution",kwnames,&obj0)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxPostScriptDC::SetResolution(arg1); @@ -14013,7 +15919,7 @@ static PyObject *_wrap_PostScriptDC_GetResolution(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14032,7 +15938,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 @@ -14043,7 +15949,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; } } { @@ -14110,7 +16016,7 @@ static PyObject *_wrap_MetaFile_Ok(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14124,12 +16030,26 @@ static PyObject *_wrap_MetaFile_SetClipboard(PyObject *self, PyObject *args, PyO int arg3 = (int) 0 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:MetaFile_SetClipboard",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:MetaFile_SetClipboard",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMetaFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetClipboard(arg2,arg3); @@ -14137,7 +16057,7 @@ static PyObject *_wrap_MetaFile_SetClipboard(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14191,7 +16111,7 @@ static PyObject *_wrap_MetaFile_GetWidth(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14216,7 +16136,7 @@ static PyObject *_wrap_MetaFile_GetHeight(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14244,7 +16164,13 @@ static PyObject *_wrap_MetaFile_GetFileName(PyObject *self, PyObject *args, PyOb 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; @@ -14267,27 +16193,41 @@ 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 * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "filename",(char *) "width",(char *) "height",(char *) "description", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OiiO:new_MetaFileDC",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_MetaFileDC",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if (obj0) { { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { @@ -14391,14 +16331,38 @@ 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; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "width",(char *) "height",(char *) "mask",(char *) "initialCount", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"ii|ii:new_ImageList",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_ImageList",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxImageList *)new wxImageList(arg1,arg2,arg3,arg4); @@ -14472,7 +16436,7 @@ static PyObject *_wrap_ImageList_Add(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14510,7 +16474,7 @@ static PyObject *_wrap_ImageList_AddWithColourMask(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14541,7 +16505,7 @@ static PyObject *_wrap_ImageList_AddIcon(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14557,14 +16521,19 @@ static PyObject *_wrap_ImageList_Replace(PyObject *self, PyObject *args, PyObjec wxBitmap *arg4 = (wxBitmap *) &arg4_defvalue ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index",(char *) "bitmap",(char *) "mask", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:ImageList_Replace",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:ImageList_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; @@ -14582,7 +16551,7 @@ static PyObject *_wrap_ImageList_Replace(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14597,25 +16566,49 @@ 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 * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index",(char *) "dc",(char *) "x",(char *) "x",(char *) "flags",(char *) "solidBackground", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOii|iO:ImageList_Draw",kwnames,&obj0,&arg2,&obj2,&arg4,&arg5,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:ImageList_Draw",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg3 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - if (obj6) { - arg7 = PyInt_AsLong(obj6) ? true : false; + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); if (PyErr_Occurred()) SWIG_fail; } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (bool const) SWIG_PyObj_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Draw(arg2,*arg3,arg4,arg5,arg6,arg7); @@ -14623,7 +16616,7 @@ static PyObject *_wrap_ImageList_Draw(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14648,7 +16641,7 @@ static PyObject *_wrap_ImageList_GetImageCount(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -14661,704 +16654,108 @@ static PyObject *_wrap_ImageList_Remove(PyObject *self, PyObject *args, PyObject int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ImageList_Remove",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_Remove",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Remove(arg2); - - wxPyEndAllowThreads(__tstate); + arg2 = (int) SWIG_PyObj_AsInt(obj1); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_ImageList_RemoveAll(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxImageList *arg1 = (wxImageList *) 0 ; - bool result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ImageList_RemoveAll",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->RemoveAll(); + result = (bool)(arg1)->Remove(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; } -static PyObject *_wrap_ImageList_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_ImageList_RemoveAll(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImageList *arg1 = (wxImageList *) 0 ; - int arg2 ; - int *arg3 = 0 ; - int *arg4 = 0 ; - int temp3 ; - int temp4 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "index", NULL - }; - - arg3 = &temp3; - arg4 = &temp4; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ImageList_GetSize",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->GetSize(arg2,*arg3,*arg4); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyInt_FromLong((long) (*arg3)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyInt_FromLong((long) (*arg4)); - resultobj = t_output_helper(resultobj,o); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject * ImageList_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxImageList, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); -} -static PyObject *_wrap_PenList_AddPen(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPenList *arg1 = (wxPenList *) 0 ; - wxPen *arg2 = (wxPen *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "pen", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_AddPen",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddPen(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_PenList_FindOrCreatePen(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPenList *arg1 = (wxPenList *) 0 ; - wxColour *arg2 = 0 ; - int arg3 ; - int arg4 ; - wxPen *result; - wxColour temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "colour",(char *) "width",(char *) "style", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOii:PenList_FindOrCreatePen",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxPen *)(arg1)->FindOrCreatePen((wxColour const &)*arg2,arg3,arg4); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_PenList_RemovePen(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPenList *arg1 = (wxPenList *) 0 ; - wxPen *arg2 = (wxPen *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "pen", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_RemovePen",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->RemovePen(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_PenList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPenList *arg1 = (wxPenList *) 0 ; - int result; + bool result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PenList_GetCount",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetCount(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject * PenList_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxPenList, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); -} -static PyObject *_wrap_BrushList_AddBrush(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBrushList *arg1 = (wxBrushList *) 0 ; - wxBrush *arg2 = (wxBrush *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "brush", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_AddBrush",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddBrush(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_BrushList_FindOrCreateBrush(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBrushList *arg1 = (wxBrushList *) 0 ; - wxColour *arg2 = 0 ; - int arg3 ; - wxBrush *result; - wxColour temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "colour",(char *) "style", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:BrushList_FindOrCreateBrush",kwnames,&obj0,&obj1,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBrush *)(arg1)->FindOrCreateBrush((wxColour const &)*arg2,arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBrush, 0); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_BrushList_RemoveBrush(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBrushList *arg1 = (wxBrushList *) 0 ; - wxBrush *arg2 = (wxBrush *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "brush", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_RemoveBrush",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->RemoveBrush(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_BrushList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBrushList *arg1 = (wxBrushList *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BrushList_GetCount",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetCount(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -static PyObject * BrushList_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxBrushList, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); -} -static PyObject *_wrap_new_ColourDatabase(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *result; - char *kwnames[] = { - NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_ColourDatabase",kwnames)) goto fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxColourDatabase *)new wxColourDatabase(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColourDatabase, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_delete_ColourDatabase(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ColourDatabase",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,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_ColourDatabase_Find(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; - wxString *arg2 = 0 ; - wxColour result; - bool temp2 = false ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "name", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_Find",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = wxString_in_helper(obj1); - if (arg2 == NULL) SWIG_fail; - temp2 = true; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxColourDatabase const *)arg1)->Find((wxString const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - wxColour * resultptr; - resultptr = new wxColour((wxColour &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1); - } - { - if (temp2) - delete arg2; - } - return resultobj; - fail: - { - if (temp2) - delete arg2; - } - return NULL; -} - - -static PyObject *_wrap_ColourDatabase_FindName(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; - wxColour *arg2 = 0 ; - wxString result; - wxColour temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "colour", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_FindName",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxColourDatabase const *)arg1)->FindName((wxColour const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { -#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; -} - - -static PyObject *_wrap_ColourDatabase_AddColour(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; - wxString *arg2 = 0 ; - wxColour *arg3 = 0 ; - bool temp2 = false ; - wxColour temp3 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "name",(char *) "colour", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ColourDatabase_AddColour",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = wxString_in_helper(obj1); - if (arg2 == NULL) SWIG_fail; - temp2 = true; - } - { - arg3 = &temp3; - if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddColour((wxString const &)*arg2,(wxColour const &)*arg3); - - 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_ColourDatabase_Append(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; - wxString *arg2 = 0 ; - int arg3 ; - int arg4 ; - int arg5 ; - bool temp2 = false ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "name",(char *) "red",(char *) "green",(char *) "blue", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiii:ColourDatabase_Append",kwnames,&obj0,&obj1,&arg3,&arg4,&arg5)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - arg2 = wxString_in_helper(obj1); - if (arg2 == NULL) SWIG_fail; - temp2 = true; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxColourDatabase_Append(arg1,(wxString const &)*arg2,arg3,arg4,arg5); - - 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 * ColourDatabase_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxColourDatabase, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); -} -static PyObject *_wrap_FontList_AddFont(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxFontList *arg1 = (wxFontList *) 0 ; - wxFont *arg2 = (wxFont *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "font", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_AddFont",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddFont(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxFontList *arg1 = (wxFontList *) 0 ; - int arg2 ; - int arg3 ; - int arg4 ; - int arg5 ; - bool arg6 = (bool) FALSE ; - wxString const &arg7_defvalue = wxPyEmptyString ; - wxString *arg7 = (wxString *) &arg7_defvalue ; - int arg8 = (int) wxFONTENCODING_DEFAULT ; - wxFont *result; - bool temp7 = false ; - PyObject * obj0 = 0 ; - PyObject * obj5 = 0 ; - PyObject * obj6 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "point_size",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "facename",(char *) "encoding", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|OOi:FontList_FindOrCreateFont",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&obj5,&obj6,&arg8)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (obj5) { - arg6 = PyInt_AsLong(obj5) ? true : false; - if (PyErr_Occurred()) SWIG_fail; - } - if (obj6) { - { - arg7 = wxString_in_helper(obj6); - if (arg7 == NULL) SWIG_fail; - temp7 = true; - } - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxFont *)(arg1)->FindOrCreateFont(arg2,arg3,arg4,arg5,arg6,(wxString const &)*arg7,(wxFontEncoding )arg8); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 0); - { - if (temp7) - delete arg7; - } - return resultobj; - fail: - { - if (temp7) - delete arg7; - } - return NULL; -} - - -static PyObject *_wrap_FontList_RemoveFont(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxFontList *arg1 = (wxFontList *) 0 ; - wxFont *arg2 = (wxFont *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "font", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_RemoveFont",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ImageList_RemoveAll",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->RemoveFont(arg2); + result = (bool)(arg1)->RemoveAll(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; } -static PyObject *_wrap_FontList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_ImageList_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxFontList *arg1 = (wxFontList *) 0 ; - int result; + wxImageList *arg1 = (wxImageList *) 0 ; + int arg2 ; + int *arg3 = 0 ; + int *arg4 = 0 ; + int temp3 ; + int temp4 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "index", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontList_GetCount",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + arg3 = &temp3; + arg4 = &temp4; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageList_GetSize",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxImageList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetCount(); + (arg1)->GetSize(arg2,*arg3,*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + Py_INCREF(Py_None); resultobj = Py_None; + { + PyObject *o = PyInt_FromLong((long) (*arg3)); + resultobj = t_output_helper(resultobj,o); + } + { + PyObject *o = PyInt_FromLong((long) (*arg4)); + resultobj = t_output_helper(resultobj,o); + } return resultobj; fail: return NULL; } -static PyObject * FontList_swigregister(PyObject *self, PyObject *args) { +static PyObject * ImageList_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxFontList, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxImageList, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_NORMAL_FONT_set(PyObject *_val) { +static int _wrap_NORMAL_FONT_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable NORMAL_FONT is read-only."); return 1; } @@ -15372,7 +16769,7 @@ static PyObject *_wrap_NORMAL_FONT_get() { } -static int _wrap_SMALL_FONT_set(PyObject *_val) { +static int _wrap_SMALL_FONT_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable SMALL_FONT is read-only."); return 1; } @@ -15386,7 +16783,7 @@ static PyObject *_wrap_SMALL_FONT_get() { } -static int _wrap_ITALIC_FONT_set(PyObject *_val) { +static int _wrap_ITALIC_FONT_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ITALIC_FONT is read-only."); return 1; } @@ -15400,7 +16797,7 @@ static PyObject *_wrap_ITALIC_FONT_get() { } -static int _wrap_SWISS_FONT_set(PyObject *_val) { +static int _wrap_SWISS_FONT_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable SWISS_FONT is read-only."); return 1; } @@ -15414,7 +16811,7 @@ static PyObject *_wrap_SWISS_FONT_get() { } -static int _wrap_RED_PEN_set(PyObject *_val) { +static int _wrap_RED_PEN_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable RED_PEN is read-only."); return 1; } @@ -15428,7 +16825,7 @@ static PyObject *_wrap_RED_PEN_get() { } -static int _wrap_CYAN_PEN_set(PyObject *_val) { +static int _wrap_CYAN_PEN_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable CYAN_PEN is read-only."); return 1; } @@ -15442,7 +16839,7 @@ static PyObject *_wrap_CYAN_PEN_get() { } -static int _wrap_GREEN_PEN_set(PyObject *_val) { +static int _wrap_GREEN_PEN_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable GREEN_PEN is read-only."); return 1; } @@ -15456,7 +16853,7 @@ static PyObject *_wrap_GREEN_PEN_get() { } -static int _wrap_BLACK_PEN_set(PyObject *_val) { +static int _wrap_BLACK_PEN_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable BLACK_PEN is read-only."); return 1; } @@ -15470,7 +16867,7 @@ static PyObject *_wrap_BLACK_PEN_get() { } -static int _wrap_WHITE_PEN_set(PyObject *_val) { +static int _wrap_WHITE_PEN_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable WHITE_PEN is read-only."); return 1; } @@ -15484,7 +16881,7 @@ static PyObject *_wrap_WHITE_PEN_get() { } -static int _wrap_TRANSPARENT_PEN_set(PyObject *_val) { +static int _wrap_TRANSPARENT_PEN_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TRANSPARENT_PEN is read-only."); return 1; } @@ -15498,7 +16895,7 @@ static PyObject *_wrap_TRANSPARENT_PEN_get() { } -static int _wrap_BLACK_DASHED_PEN_set(PyObject *_val) { +static int _wrap_BLACK_DASHED_PEN_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable BLACK_DASHED_PEN is read-only."); return 1; } @@ -15512,7 +16909,7 @@ static PyObject *_wrap_BLACK_DASHED_PEN_get() { } -static int _wrap_GREY_PEN_set(PyObject *_val) { +static int _wrap_GREY_PEN_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable GREY_PEN is read-only."); return 1; } @@ -15526,7 +16923,7 @@ static PyObject *_wrap_GREY_PEN_get() { } -static int _wrap_MEDIUM_GREY_PEN_set(PyObject *_val) { +static int _wrap_MEDIUM_GREY_PEN_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable MEDIUM_GREY_PEN is read-only."); return 1; } @@ -15540,7 +16937,7 @@ static PyObject *_wrap_MEDIUM_GREY_PEN_get() { } -static int _wrap_LIGHT_GREY_PEN_set(PyObject *_val) { +static int _wrap_LIGHT_GREY_PEN_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY_PEN is read-only."); return 1; } @@ -15554,7 +16951,7 @@ static PyObject *_wrap_LIGHT_GREY_PEN_get() { } -static int _wrap_BLUE_BRUSH_set(PyObject *_val) { +static int _wrap_BLUE_BRUSH_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable BLUE_BRUSH is read-only."); return 1; } @@ -15568,7 +16965,7 @@ static PyObject *_wrap_BLUE_BRUSH_get() { } -static int _wrap_GREEN_BRUSH_set(PyObject *_val) { +static int _wrap_GREEN_BRUSH_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable GREEN_BRUSH is read-only."); return 1; } @@ -15582,7 +16979,7 @@ static PyObject *_wrap_GREEN_BRUSH_get() { } -static int _wrap_WHITE_BRUSH_set(PyObject *_val) { +static int _wrap_WHITE_BRUSH_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable WHITE_BRUSH is read-only."); return 1; } @@ -15596,7 +16993,7 @@ static PyObject *_wrap_WHITE_BRUSH_get() { } -static int _wrap_BLACK_BRUSH_set(PyObject *_val) { +static int _wrap_BLACK_BRUSH_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable BLACK_BRUSH is read-only."); return 1; } @@ -15610,7 +17007,7 @@ static PyObject *_wrap_BLACK_BRUSH_get() { } -static int _wrap_TRANSPARENT_BRUSH_set(PyObject *_val) { +static int _wrap_TRANSPARENT_BRUSH_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable TRANSPARENT_BRUSH is read-only."); return 1; } @@ -15624,7 +17021,7 @@ static PyObject *_wrap_TRANSPARENT_BRUSH_get() { } -static int _wrap_CYAN_BRUSH_set(PyObject *_val) { +static int _wrap_CYAN_BRUSH_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable CYAN_BRUSH is read-only."); return 1; } @@ -15638,7 +17035,7 @@ static PyObject *_wrap_CYAN_BRUSH_get() { } -static int _wrap_RED_BRUSH_set(PyObject *_val) { +static int _wrap_RED_BRUSH_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable RED_BRUSH is read-only."); return 1; } @@ -15652,7 +17049,7 @@ static PyObject *_wrap_RED_BRUSH_get() { } -static int _wrap_GREY_BRUSH_set(PyObject *_val) { +static int _wrap_GREY_BRUSH_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable GREY_BRUSH is read-only."); return 1; } @@ -15666,7 +17063,7 @@ static PyObject *_wrap_GREY_BRUSH_get() { } -static int _wrap_MEDIUM_GREY_BRUSH_set(PyObject *_val) { +static int _wrap_MEDIUM_GREY_BRUSH_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable MEDIUM_GREY_BRUSH is read-only."); return 1; } @@ -15680,7 +17077,7 @@ static PyObject *_wrap_MEDIUM_GREY_BRUSH_get() { } -static int _wrap_LIGHT_GREY_BRUSH_set(PyObject *_val) { +static int _wrap_LIGHT_GREY_BRUSH_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY_BRUSH is read-only."); return 1; } @@ -15694,7 +17091,7 @@ static PyObject *_wrap_LIGHT_GREY_BRUSH_get() { } -static int _wrap_BLACK_set(PyObject *_val) { +static int _wrap_BLACK_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable BLACK is read-only."); return 1; } @@ -15708,7 +17105,7 @@ static PyObject *_wrap_BLACK_get() { } -static int _wrap_WHITE_set(PyObject *_val) { +static int _wrap_WHITE_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable WHITE is read-only."); return 1; } @@ -15722,7 +17119,7 @@ static PyObject *_wrap_WHITE_get() { } -static int _wrap_RED_set(PyObject *_val) { +static int _wrap_RED_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable RED is read-only."); return 1; } @@ -15736,7 +17133,7 @@ static PyObject *_wrap_RED_get() { } -static int _wrap_BLUE_set(PyObject *_val) { +static int _wrap_BLUE_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable BLUE is read-only."); return 1; } @@ -15750,7 +17147,7 @@ static PyObject *_wrap_BLUE_get() { } -static int _wrap_GREEN_set(PyObject *_val) { +static int _wrap_GREEN_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable GREEN is read-only."); return 1; } @@ -15764,7 +17161,7 @@ static PyObject *_wrap_GREEN_get() { } -static int _wrap_CYAN_set(PyObject *_val) { +static int _wrap_CYAN_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable CYAN is read-only."); return 1; } @@ -15778,7 +17175,7 @@ static PyObject *_wrap_CYAN_get() { } -static int _wrap_LIGHT_GREY_set(PyObject *_val) { +static int _wrap_LIGHT_GREY_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY is read-only."); return 1; } @@ -15792,7 +17189,7 @@ static PyObject *_wrap_LIGHT_GREY_get() { } -static int _wrap_STANDARD_CURSOR_set(PyObject *_val) { +static int _wrap_STANDARD_CURSOR_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable STANDARD_CURSOR is read-only."); return 1; } @@ -15806,7 +17203,7 @@ static PyObject *_wrap_STANDARD_CURSOR_get() { } -static int _wrap_HOURGLASS_CURSOR_set(PyObject *_val) { +static int _wrap_HOURGLASS_CURSOR_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable HOURGLASS_CURSOR is read-only."); return 1; } @@ -15820,7 +17217,7 @@ static PyObject *_wrap_HOURGLASS_CURSOR_get() { } -static int _wrap_CROSS_CURSOR_set(PyObject *_val) { +static int _wrap_CROSS_CURSOR_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable CROSS_CURSOR is read-only."); return 1; } @@ -15834,7 +17231,7 @@ static PyObject *_wrap_CROSS_CURSOR_get() { } -static int _wrap_NullBitmap_set(PyObject *_val) { +static int _wrap_NullBitmap_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable NullBitmap is read-only."); return 1; } @@ -15848,7 +17245,7 @@ static PyObject *_wrap_NullBitmap_get() { } -static int _wrap_NullIcon_set(PyObject *_val) { +static int _wrap_NullIcon_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable NullIcon is read-only."); return 1; } @@ -15862,7 +17259,7 @@ static PyObject *_wrap_NullIcon_get() { } -static int _wrap_NullCursor_set(PyObject *_val) { +static int _wrap_NullCursor_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable NullCursor is read-only."); return 1; } @@ -15876,7 +17273,7 @@ static PyObject *_wrap_NullCursor_get() { } -static int _wrap_NullPen_set(PyObject *_val) { +static int _wrap_NullPen_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable NullPen is read-only."); return 1; } @@ -15890,7 +17287,7 @@ static PyObject *_wrap_NullPen_get() { } -static int _wrap_NullBrush_set(PyObject *_val) { +static int _wrap_NullBrush_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable NullBrush is read-only."); return 1; } @@ -15904,7 +17301,7 @@ static PyObject *_wrap_NullBrush_get() { } -static int _wrap_NullPalette_set(PyObject *_val) { +static int _wrap_NullPalette_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable NullPalette is read-only."); return 1; } @@ -15918,7 +17315,7 @@ static PyObject *_wrap_NullPalette_get() { } -static int _wrap_NullFont_set(PyObject *_val) { +static int _wrap_NullFont_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable NullFont is read-only."); return 1; } @@ -15932,7 +17329,7 @@ static PyObject *_wrap_NullFont_get() { } -static int _wrap_NullColour_set(PyObject *_val) { +static int _wrap_NullColour_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable NullColour is read-only."); return 1; } @@ -15946,286 +17343,217 @@ static PyObject *_wrap_NullColour_get() { } -static int _wrap_TheFontList_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable TheFontList is read-only."); - return 1; -} - - -static PyObject *_wrap_TheFontList_get() { - PyObject *pyobj; - - pyobj = SWIG_NewPointerObj((void *) wxTheFontList, SWIGTYPE_p_wxFontList, 0); - return pyobj; -} - - -static int _wrap_ThePenList_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable ThePenList is read-only."); - return 1; -} - - -static PyObject *_wrap_ThePenList_get() { - PyObject *pyobj; - - pyobj = SWIG_NewPointerObj((void *) wxThePenList, SWIGTYPE_p_wxPenList, 0); - return pyobj; -} - - -static int _wrap_TheBrushList_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable TheBrushList is read-only."); - return 1; -} - - -static PyObject *_wrap_TheBrushList_get() { - PyObject *pyobj; - - pyobj = SWIG_NewPointerObj((void *) wxTheBrushList, SWIGTYPE_p_wxBrushList, 0); - return pyobj; -} - - -static int _wrap_TheColourDatabase_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable TheColourDatabase is read-only."); - return 1; -} - - -static PyObject *_wrap_TheColourDatabase_get() { - PyObject *pyobj; - - pyobj = SWIG_NewPointerObj((void *) wxTheColourDatabase, SWIGTYPE_p_wxColourDatabase, 0); - return pyobj; -} - - -static PyObject *_wrap_new_DragImage(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PenList_AddPen(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxBitmap *arg1 = 0 ; - wxCursor const &arg2_defvalue = wxNullCursor ; - wxCursor *arg2 = (wxCursor *) &arg2_defvalue ; - wxGenericDragImage *result; + wxPenList *arg1 = (wxPenList *) 0 ; + wxPen *arg2 = (wxPen *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "image",(char *) "cursor", NULL + (char *) "self",(char *) "pen", 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 *)"OO:PenList_AddPen",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxGenericDragImage *)new wxGenericDragImage((wxBitmap const &)*arg1,(wxCursor const &)*arg2); + (arg1)->AddPen(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1); + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_new_DragIcon(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PenList_FindOrCreatePen(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxIcon *arg1 = 0 ; - wxCursor const &arg2_defvalue = wxNullCursor ; - wxCursor *arg2 = (wxCursor *) &arg2_defvalue ; - wxGenericDragImage *result; + wxPenList *arg1 = (wxPenList *) 0 ; + wxColour *arg2 = 0 ; + int arg3 ; + int arg4 ; + wxPen *result; + wxColour temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "image",(char *) "cursor", NULL + (char *) "self",(char *) "colour",(char *) "width",(char *) "style", 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PenList_FindOrCreatePen",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxColour_helper(obj1, &arg2)) 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; - } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxGenericDragImage *)new wxGenericDragImage((wxIcon const &)*arg1,(wxCursor const &)*arg2); + result = (wxPen *)(arg1)->FindOrCreatePen((wxColour const &)*arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxPen, 0); return resultobj; fail: return NULL; } -static PyObject *_wrap_new_DragString(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PenList_RemovePen(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 ; + wxPenList *arg1 = (wxPenList *) 0 ; + wxPen *arg2 = (wxPen *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "str",(char *) "cursor", NULL + (char *) "self",(char *) "pen", 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; - } - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_RemovePen",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxGenericDragImage *)new wxGenericDragImage((wxString const &)*arg1,(wxCursor const &)*arg2); + (arg1)->RemovePen(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1); - { - if (temp1) - delete arg1; - } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: - { - if (temp1) - delete arg1; - } return NULL; } -static PyObject *_wrap_new_DragTreeItem(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PenList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxTreeCtrl *arg1 = 0 ; - wxTreeItemId *arg2 = 0 ; - wxGenericDragImage *result; + wxPenList *arg1 = (wxPenList *) 0 ; + int result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "treeCtrl",(char *) "id", NULL + (char *) "self", 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; - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PenList_GetCount",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPenList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxGenericDragImage *)new wxGenericDragImage((wxTreeCtrl const &)*arg1,*arg2); + result = (int)(arg1)->GetCount(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; } -static PyObject *_wrap_new_DragListItem(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject * PenList_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxPenList, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_BrushList_AddBrush(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxListCtrl *arg1 = 0 ; - long arg2 ; - wxGenericDragImage *result; + wxBrushList *arg1 = (wxBrushList *) 0 ; + wxBrush *arg2 = (wxBrush *) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "listCtrl",(char *) "id", NULL + (char *) "self",(char *) "brush", 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; - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_AddBrush",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxGenericDragImage *)new wxGenericDragImage((wxListCtrl const &)*arg1,arg2); + (arg1)->AddBrush(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1); + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_delete_DragImage(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_BrushList_FindOrCreateBrush(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; + wxBrushList *arg1 = (wxBrushList *) 0 ; + wxColour *arg2 = 0 ; + int arg3 ; + wxBrush *result; + wxColour temp2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "colour",(char *) "style", 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; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:BrushList_FindOrCreateBrush",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - delete arg1; + result = (wxBrush *)(arg1)->FindOrCreateBrush((wxColour const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBrush, 0); return resultobj; fail: return NULL; } -static PyObject *_wrap_DragImage_SetBackingBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_BrushList_RemoveBrush(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - wxBitmap *arg2 = (wxBitmap *) 0 ; + wxBrushList *arg1 = (wxBrushList *) 0 ; + wxBrush *arg2 = (wxBrush *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "bitmap", NULL + (char *) "self",(char *) "brush", 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; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_RemoveBrush",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBrush,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetBackingBitmap(arg2); + (arg1)->RemoveBrush(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -16237,376 +17565,505 @@ static PyObject *_wrap_DragImage_SetBackingBitmap(PyObject *self, PyObject *args } -static PyObject *_wrap_DragImage_BeginDrag(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_BrushList_GetCount(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 ; + wxBrushList *arg1 = (wxBrushList *) 0 ; + int result; 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; - } + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BrushList_GetCount",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBrushList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->BeginDrag((wxPoint const &)*arg2,arg3,arg4,arg5); + result = (int)(arg1)->GetCount(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; } -static PyObject *_wrap_DragImage_BeginDragBounded(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject * BrushList_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxBrushList, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_ColourDatabase(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 ; + wxColourDatabase *result; char *kwnames[] = { - (char *) "self",(char *) "hotspot",(char *) "window",(char *) "boundingWindow", NULL + 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; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_ColourDatabase",kwnames)) goto fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->BeginDrag((wxPoint const &)*arg2,arg3,arg4); + result = (wxColourDatabase *)new wxColourDatabase(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColourDatabase, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_DragImage_EndDrag(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_delete_ColourDatabase(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - bool result; + wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; 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; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ColourDatabase",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->EndDrag(); + delete arg1; wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_DragImage_Move(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_ColourDatabase_Find(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - wxPoint *arg2 = 0 ; - bool result; - wxPoint temp2 ; + wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; + wxString *arg2 = 0 ; + wxColour result; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pt", NULL + (char *) "self",(char *) "name", 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; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_Find",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = &temp2; - if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Move((wxPoint const &)*arg2); + result = ((wxColourDatabase const *)arg1)->Find((wxString const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + wxColour * resultptr; + resultptr = new wxColour((wxColour &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1); + } + { + if (temp2) + delete arg2; + } return resultobj; fail: + { + if (temp2) + delete arg2; + } return NULL; } -static PyObject *_wrap_DragImage_Show(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_ColourDatabase_FindName(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - bool result; + wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; + wxColour *arg2 = 0 ; + wxString result; + wxColour temp2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "colour", 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; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourDatabase_FindName",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Show(); + result = ((wxColourDatabase const *)arg1)->FindName((wxColour const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { +#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; } -static PyObject *_wrap_DragImage_Hide(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_ColourDatabase_AddColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - bool result; + wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; + wxString *arg2 = 0 ; + wxColour *arg3 = 0 ; + bool temp2 = False ; + wxColour temp3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "name",(char *) "colour", 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; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ColourDatabase_AddColour",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + { + arg3 = &temp3; + if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Hide(); + (arg1)->AddColour((wxString const &)*arg2,(wxColour const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp2) + delete arg2; + } return resultobj; fail: + { + if (temp2) + delete arg2; + } return NULL; } -static PyObject *_wrap_DragImage_GetImageRect(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_ColourDatabase_Append(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - wxPoint *arg2 = 0 ; - wxRect result; - wxPoint temp2 ; + wxColourDatabase *arg1 = (wxColourDatabase *) 0 ; + wxString *arg2 = 0 ; + int arg3 ; + int arg4 ; + int arg5 ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pos", NULL + (char *) "self",(char *) "name",(char *) "red",(char *) "green",(char *) "blue", 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; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:ColourDatabase_Append",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDatabase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = &temp2; - if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxGenericDragImage const *)arg1)->GetImageRect((wxPoint const &)*arg2); + wxColourDatabase_Append(arg1,(wxString const &)*arg2,arg3,arg4,arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } + Py_INCREF(Py_None); resultobj = Py_None; { - wxRect * resultptr; - resultptr = new wxRect((wxRect &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRect, 1); + if (temp2) + delete arg2; } return resultobj; fail: + { + if (temp2) + delete arg2; + } return NULL; } -static PyObject *_wrap_DragImage_DoDrawImage(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject * ColourDatabase_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxColourDatabase, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_FontList_AddFont(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ; - wxDC *arg2 = 0 ; - wxPoint *arg3 = 0 ; - bool result; - wxPoint temp3 ; + wxFontList *arg1 = (wxFontList *) 0 ; + wxFont *arg2 = (wxFont *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "dc",(char *) "pos", NULL + (char *) "self",(char *) "font", 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; - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_AddFont",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxGenericDragImage const *)arg1)->DoDrawImage(*arg2,(wxPoint const &)*arg3); + (arg1)->AddFont(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_DragImage_UpdateBackingFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_FontList_FindOrCreateFont(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 ; + wxFontList *arg1 = (wxFontList *) 0 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; + bool arg6 = (bool) False ; + wxString const &arg7_defvalue = wxPyEmptyString ; + wxString *arg7 = (wxString *) &arg7_defvalue ; + int arg8 = (int) wxFONTENCODING_DEFAULT ; + wxFont *result; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "windowDC",(char *) "destDC",(char *) "sourceRect",(char *) "destRect", NULL + (char *) "self",(char *) "point_size",(char *) "family",(char *) "style",(char *) "weight",(char *) "underline",(char *) "facename",(char *) "encoding", 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(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:FontList_FindOrCreateFont",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) 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; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { - arg4 = &temp4; - if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; } { - arg5 = &temp5; - if ( ! wxRect_helper(obj4, &arg5)) SWIG_fail; + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (bool) SWIG_PyObj_AsBool(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = wxString_in_helper(obj6); + if (arg7 == NULL) SWIG_fail; + temp7 = True; + } + } + if (obj7) { + { + arg8 = (wxFontEncoding) SWIG_PyObj_AsInt(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxFont *)(arg1)->FindOrCreateFont(arg2,arg3,arg4,arg5,arg6,(wxString const &)*arg7,(wxFontEncoding )arg8); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFont, 0); + { + if (temp7) + delete arg7; + } + return resultobj; + fail: + { + if (temp7) + delete arg7; + } + return NULL; +} + + +static PyObject *_wrap_FontList_RemoveFont(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxFontList *arg1 = (wxFontList *) 0 ; + wxFont *arg2 = (wxFont *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "font", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_RemoveFont",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxGenericDragImage const *)arg1)->UpdateBackingFromWindow(*arg2,*arg3,(wxRect const &)*arg4,(wxRect const &)*arg5); + (arg1)->RemoveFont(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_DragImage_RedrawImage(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_FontList_GetCount(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 ; + wxFontList *arg1 = (wxFontList *) 0 ; + int result; 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 + (char *) "self", 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; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontList_GetCount",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->RedrawImage((wxPoint const &)*arg2,(wxPoint const &)*arg3,arg4,arg5); + result = (int)(arg1)->GetCount(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; } -static PyObject * DragImage_swigregister(PyObject *self, PyObject *args) { +static PyObject * FontList_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxGenericDragImage, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxFontList, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } +static int _wrap_TheFontList_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable TheFontList is read-only."); + return 1; +} + + +static PyObject *_wrap_TheFontList_get() { + PyObject *pyobj; + + pyobj = SWIG_NewPointerObj((void *) wxTheFontList, SWIGTYPE_p_wxFontList, 0); + return pyobj; +} + + +static int _wrap_ThePenList_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable ThePenList is read-only."); + return 1; +} + + +static PyObject *_wrap_ThePenList_get() { + PyObject *pyobj; + + pyobj = SWIG_NewPointerObj((void *) wxThePenList, SWIGTYPE_p_wxPenList, 0); + return pyobj; +} + + +static int _wrap_TheBrushList_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable TheBrushList is read-only."); + return 1; +} + + +static PyObject *_wrap_TheBrushList_get() { + PyObject *pyobj; + + pyobj = SWIG_NewPointerObj((void *) wxTheBrushList, SWIGTYPE_p_wxBrushList, 0); + return pyobj; +} + + +static int _wrap_TheColourDatabase_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable TheColourDatabase is read-only."); + return 1; +} + + +static PyObject *_wrap_TheColourDatabase_get() { + PyObject *pyobj; + + pyobj = SWIG_NewPointerObj((void *) wxTheColourDatabase, SWIGTYPE_p_wxColourDatabase, 0); + return pyobj; +} + + static PyObject *_wrap_new_Effects(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxEffects *result; @@ -16998,11 +18455,12 @@ static PyObject *_wrap_Effects_DrawSunkenEdge(PyObject *self, PyObject *args, Py PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "dc",(char *) "rect",(char *) "borderSize", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:Effects_DrawSunkenEdge",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Effects_DrawSunkenEdge",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,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) { @@ -17012,6 +18470,12 @@ static PyObject *_wrap_Effects_DrawSunkenEdge(PyObject *self, PyObject *args, Py arg3 = &temp3; if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail; } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DrawSunkenEdge(*arg2,(wxRect const &)*arg3,arg4); @@ -17063,7 +18527,7 @@ static PyObject *_wrap_Effects_TileBitmap(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17085,18 +18549,21 @@ static PyMethodDef SwigMethods[] = { { (char *)"GDIObject_IsNull", (PyCFunction) _wrap_GDIObject_IsNull, METH_VARARGS | METH_KEYWORDS }, { (char *)"GDIObject_swigregister", GDIObject_swigregister, METH_VARARGS }, { (char *)"new_Colour", (PyCFunction) _wrap_new_Colour, METH_VARARGS | METH_KEYWORDS }, - { (char *)"delete_Colour", (PyCFunction) _wrap_delete_Colour, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_NamedColour", (PyCFunction) _wrap_new_NamedColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_ColourRGB", (PyCFunction) _wrap_new_ColourRGB, METH_VARARGS | METH_KEYWORDS }, + { (char *)"delete_Colour", (PyCFunction) _wrap_delete_Colour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Colour_Red", (PyCFunction) _wrap_Colour_Red, METH_VARARGS | METH_KEYWORDS }, { (char *)"Colour_Green", (PyCFunction) _wrap_Colour_Green, METH_VARARGS | METH_KEYWORDS }, { (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_SetFromName", (PyCFunction) _wrap_Colour_SetFromName, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Colour_GetPixel", (PyCFunction) _wrap_Colour_GetPixel, 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_Get", (PyCFunction) _wrap_Colour_Get, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Colour_GetRGB", (PyCFunction) _wrap_Colour_GetRGB, METH_VARARGS | METH_KEYWORDS }, { (char *)"Colour_swigregister", Colour_swigregister, METH_VARARGS }, { (char *)"new_Palette", (PyCFunction) _wrap_new_Palette, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_Palette", (PyCFunction) _wrap_delete_Palette, METH_VARARGS | METH_KEYWORDS }, @@ -17119,6 +18586,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"Pen_SetWidth", (PyCFunction) _wrap_Pen_SetWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_SetDashes", (PyCFunction) _wrap_Pen_SetDashes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_GetDashes", (PyCFunction) _wrap_Pen_GetDashes, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Pen___eq__", (PyCFunction) _wrap_Pen___eq__, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Pen___ne__", (PyCFunction) _wrap_Pen___ne__, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Pen_GetDashCount", (PyCFunction) _wrap_Pen_GetDashCount, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_GetStipple", (PyCFunction) _wrap_Pen_GetStipple, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_SetStipple", (PyCFunction) _wrap_Pen_SetStipple, METH_VARARGS | METH_KEYWORDS }, { (char *)"Pen_swigregister", Pen_swigregister, METH_VARARGS }, @@ -17166,7 +18636,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"Bitmap_SetQuality", (PyCFunction) _wrap_Bitmap_SetQuality, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS }, { (char *)"new_Mask", (PyCFunction) _wrap_new_Mask, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_MaskColour", (PyCFunction) _wrap_new_MaskColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Mask_swigregister", Mask_swigregister, METH_VARARGS }, { (char *)"new_Icon", (PyCFunction) _wrap_new_Icon, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_Icon", (PyCFunction) _wrap_delete_Icon, METH_VARARGS | METH_KEYWORDS }, @@ -17452,6 +18921,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 }, @@ -17463,10 +18933,11 @@ 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_GetPartialTextExtents", (PyCFunction) _wrap_DC_GetPartialTextExtents, 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 }, @@ -17495,11 +18966,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 }, @@ -17524,8 +18995,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS }, { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS }, { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS }, - { (char *)"new_BufferedDC", (PyCFunction) _wrap_new_BufferedDC, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_BufferedDCInternalBuffer", (PyCFunction) _wrap_new_BufferedDCInternalBuffer, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_BufferedDC", _wrap_new_BufferedDC, METH_VARARGS }, + { (char *)"new_BufferedDCInternalBuffer", _wrap_new_BufferedDCInternalBuffer, METH_VARARGS }, + { (char *)"delete_BufferedDC", (PyCFunction) _wrap_delete_BufferedDC, METH_VARARGS | METH_KEYWORDS }, { (char *)"BufferedDC_UnMask", (PyCFunction) _wrap_BufferedDC_UnMask, METH_VARARGS | METH_KEYWORDS }, { (char *)"BufferedDC_swigregister", BufferedDC_swigregister, METH_VARARGS }, { (char *)"new_BufferedPaintDC", (PyCFunction) _wrap_new_BufferedPaintDC, METH_VARARGS | METH_KEYWORDS }, @@ -17597,24 +19069,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 }, @@ -17636,78 +19090,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)); } @@ -17906,15 +19303,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)); } @@ -18026,24 +19423,80 @@ 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}}; static swig_type_info _swigt__p_wxPyFontEnumerator[] = {{"_p_wxPyFontEnumerator", 0, "wxPyFontEnumerator *", 0},{"_p_wxPyFontEnumerator"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxIconLocation[] = {{"_p_wxIconLocation", 0, "wxIconLocation *", 0},{"_p_wxIconLocation"},{0}}; static swig_type_info _swigt__p_wxImage[] = {{"_p_wxImage", 0, "wxImage *", 0},{"_p_wxImage"},{0}}; static swig_type_info _swigt__p_wxMetaFileDC[] = {{"_p_wxMetaFileDC", 0, "wxMetaFileDC *", 0},{"_p_wxMetaFileDC"},{0}}; @@ -18054,12 +19507,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}}; @@ -18070,13 +19522,12 @@ 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}}; static swig_type_info _swigt__p_wxGDIObject[] = {{"_p_wxGDIObject", 0, "wxGDIObject *", 0},{"_p_wxIcon", _p_wxIconTo_p_wxGDIObject},{"_p_wxPyPen", _p_wxPyPenTo_p_wxGDIObject},{"_p_wxPen", _p_wxPenTo_p_wxGDIObject},{"_p_wxFont", _p_wxFontTo_p_wxGDIObject},{"_p_wxPalette", _p_wxPaletteTo_p_wxGDIObject},{"_p_wxGDIObject"},{"_p_wxCursor", _p_wxCursorTo_p_wxGDIObject},{"_p_wxBitmap", _p_wxBitmapTo_p_wxGDIObject},{"_p_wxRegion", _p_wxRegionTo_p_wxGDIObject},{"_p_wxBrush", _p_wxBrushTo_p_wxGDIObject},{0}}; -static swig_type_info _swigt__p_wxLocale[] = {{"_p_wxLocale", 0, "wxLocale *", 0},{"_p_wxLocale"},{0}}; static swig_type_info _swigt__p_wxIcon[] = {{"_p_wxIcon", 0, "wxIcon *", 0},{"_p_wxIcon"},{0}}; +static swig_type_info _swigt__p_wxLocale[] = {{"_p_wxLocale", 0, "wxLocale *", 0},{"_p_wxLocale"},{0}}; static swig_type_info _swigt__p_wxRegion[] = {{"_p_wxRegion", 0, "wxRegion *", 0},{"_p_wxRegion"},{0}}; static swig_type_info _swigt__p_wxLanguageInfo[] = {{"_p_wxLanguageInfo", 0, "wxLanguageInfo *", 0},{"_p_wxLanguageInfo"},{0}}; static swig_type_info _swigt__p_wxConfigBase[] = {{"_p_wxConfigBase", 0, "wxConfigBase *", 0},{"_p_wxConfigBase"},{0}}; @@ -18088,9 +19539,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}}; @@ -18098,14 +19548,13 @@ 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, _swigt__p_wxPyFontEnumerator, +_swigt__p_char, _swigt__p_wxIconLocation, _swigt__p_wxImage, _swigt__p_wxMetaFileDC, @@ -18116,7 +19565,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, @@ -18132,13 +19580,12 @@ _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, _swigt__p_wxGDIObject, -_swigt__p_wxLocale, _swigt__p_wxIcon, +_swigt__p_wxLocale, _swigt__p_wxRegion, _swigt__p_wxLanguageInfo, _swigt__p_wxConfigBase, @@ -18150,7 +19597,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, @@ -18164,343 +19610,6 @@ _swigt__p_wxColourDatabase, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"OutRegion", (long) wxOutRegion, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PartRegion", (long) wxPartRegion, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"InRegion", (long) wxInRegion, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_DEFAULT", (long) wxFONTFAMILY_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_DECORATIVE", (long) wxFONTFAMILY_DECORATIVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_ROMAN", (long) wxFONTFAMILY_ROMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_SCRIPT", (long) wxFONTFAMILY_SCRIPT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_SWISS", (long) wxFONTFAMILY_SWISS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_MODERN", (long) wxFONTFAMILY_MODERN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_TELETYPE", (long) wxFONTFAMILY_TELETYPE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_MAX", (long) wxFONTFAMILY_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFAMILY_UNKNOWN", (long) wxFONTFAMILY_UNKNOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTSTYLE_NORMAL", (long) wxFONTSTYLE_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTSTYLE_ITALIC", (long) wxFONTSTYLE_ITALIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTSTYLE_SLANT", (long) wxFONTSTYLE_SLANT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTSTYLE_MAX", (long) wxFONTSTYLE_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTWEIGHT_NORMAL", (long) wxFONTWEIGHT_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTWEIGHT_LIGHT", (long) wxFONTWEIGHT_LIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTWEIGHT_BOLD", (long) wxFONTWEIGHT_BOLD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTWEIGHT_MAX", (long) wxFONTWEIGHT_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_DEFAULT", (long) wxFONTFLAG_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_ITALIC", (long) wxFONTFLAG_ITALIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_SLANT", (long) wxFONTFLAG_SLANT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_LIGHT", (long) wxFONTFLAG_LIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_BOLD", (long) wxFONTFLAG_BOLD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_ANTIALIASED", (long) wxFONTFLAG_ANTIALIASED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_NOT_ANTIALIASED", (long) wxFONTFLAG_NOT_ANTIALIASED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_UNDERLINED", (long) wxFONTFLAG_UNDERLINED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_STRIKETHROUGH", (long) wxFONTFLAG_STRIKETHROUGH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTFLAG_MASK", (long) wxFONTFLAG_MASK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_SYSTEM", (long) wxFONTENCODING_SYSTEM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_DEFAULT", (long) wxFONTENCODING_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_1", (long) wxFONTENCODING_ISO8859_1, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_2", (long) wxFONTENCODING_ISO8859_2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_3", (long) wxFONTENCODING_ISO8859_3, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_4", (long) wxFONTENCODING_ISO8859_4, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_5", (long) wxFONTENCODING_ISO8859_5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_6", (long) wxFONTENCODING_ISO8859_6, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_7", (long) wxFONTENCODING_ISO8859_7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_8", (long) wxFONTENCODING_ISO8859_8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_9", (long) wxFONTENCODING_ISO8859_9, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_10", (long) wxFONTENCODING_ISO8859_10, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_11", (long) wxFONTENCODING_ISO8859_11, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_12", (long) wxFONTENCODING_ISO8859_12, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_13", (long) wxFONTENCODING_ISO8859_13, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_14", (long) wxFONTENCODING_ISO8859_14, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_15", (long) wxFONTENCODING_ISO8859_15, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ISO8859_MAX", (long) wxFONTENCODING_ISO8859_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_KOI8", (long) wxFONTENCODING_KOI8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_ALTERNATIVE", (long) wxFONTENCODING_ALTERNATIVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_BULGARIAN", (long) wxFONTENCODING_BULGARIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP437", (long) wxFONTENCODING_CP437, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP850", (long) wxFONTENCODING_CP850, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP852", (long) wxFONTENCODING_CP852, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP855", (long) wxFONTENCODING_CP855, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP866", (long) wxFONTENCODING_CP866, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP874", (long) wxFONTENCODING_CP874, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP932", (long) wxFONTENCODING_CP932, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP936", (long) wxFONTENCODING_CP936, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP949", (long) wxFONTENCODING_CP949, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP950", (long) wxFONTENCODING_CP950, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1250", (long) wxFONTENCODING_CP1250, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1251", (long) wxFONTENCODING_CP1251, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1252", (long) wxFONTENCODING_CP1252, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1253", (long) wxFONTENCODING_CP1253, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1254", (long) wxFONTENCODING_CP1254, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1255", (long) wxFONTENCODING_CP1255, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1256", (long) wxFONTENCODING_CP1256, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP1257", (long) wxFONTENCODING_CP1257, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_CP12_MAX", (long) wxFONTENCODING_CP12_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF7", (long) wxFONTENCODING_UTF7, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF8", (long) wxFONTENCODING_UTF8, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_EUC_JP", (long) wxFONTENCODING_EUC_JP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF16BE", (long) wxFONTENCODING_UTF16BE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF16LE", (long) wxFONTENCODING_UTF16LE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF32BE", (long) wxFONTENCODING_UTF32BE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF32LE", (long) wxFONTENCODING_UTF32LE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_MAX", (long) wxFONTENCODING_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF16", (long) wxFONTENCODING_UTF16, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UTF32", (long) wxFONTENCODING_UTF32, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_UNICODE", (long) wxFONTENCODING_UNICODE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_GB2312", (long) wxFONTENCODING_GB2312, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_BIG5", (long) wxFONTENCODING_BIG5, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FONTENCODING_SHIFT_JIS", (long) wxFONTENCODING_SHIFT_JIS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_DEFAULT", (long) wxLANGUAGE_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UNKNOWN", (long) wxLANGUAGE_UNKNOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ABKHAZIAN", (long) wxLANGUAGE_ABKHAZIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AFAR", (long) wxLANGUAGE_AFAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AFRIKAANS", (long) wxLANGUAGE_AFRIKAANS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ALBANIAN", (long) wxLANGUAGE_ALBANIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AMHARIC", (long) wxLANGUAGE_AMHARIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC", (long) wxLANGUAGE_ARABIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_ALGERIA", (long) wxLANGUAGE_ARABIC_ALGERIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_BAHRAIN", (long) wxLANGUAGE_ARABIC_BAHRAIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_EGYPT", (long) wxLANGUAGE_ARABIC_EGYPT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_IRAQ", (long) wxLANGUAGE_ARABIC_IRAQ, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_JORDAN", (long) wxLANGUAGE_ARABIC_JORDAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_KUWAIT", (long) wxLANGUAGE_ARABIC_KUWAIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_LEBANON", (long) wxLANGUAGE_ARABIC_LEBANON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_LIBYA", (long) wxLANGUAGE_ARABIC_LIBYA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_MOROCCO", (long) wxLANGUAGE_ARABIC_MOROCCO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_OMAN", (long) wxLANGUAGE_ARABIC_OMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_QATAR", (long) wxLANGUAGE_ARABIC_QATAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_SAUDI_ARABIA", (long) wxLANGUAGE_ARABIC_SAUDI_ARABIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_SUDAN", (long) wxLANGUAGE_ARABIC_SUDAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_SYRIA", (long) wxLANGUAGE_ARABIC_SYRIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_TUNISIA", (long) wxLANGUAGE_ARABIC_TUNISIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_UAE", (long) wxLANGUAGE_ARABIC_UAE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARABIC_YEMEN", (long) wxLANGUAGE_ARABIC_YEMEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ARMENIAN", (long) wxLANGUAGE_ARMENIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ASSAMESE", (long) wxLANGUAGE_ASSAMESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AYMARA", (long) wxLANGUAGE_AYMARA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AZERI", (long) wxLANGUAGE_AZERI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AZERI_CYRILLIC", (long) wxLANGUAGE_AZERI_CYRILLIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_AZERI_LATIN", (long) wxLANGUAGE_AZERI_LATIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BASHKIR", (long) wxLANGUAGE_BASHKIR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BASQUE", (long) wxLANGUAGE_BASQUE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BELARUSIAN", (long) wxLANGUAGE_BELARUSIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BENGALI", (long) wxLANGUAGE_BENGALI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BHUTANI", (long) wxLANGUAGE_BHUTANI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BIHARI", (long) wxLANGUAGE_BIHARI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BISLAMA", (long) wxLANGUAGE_BISLAMA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BRETON", (long) wxLANGUAGE_BRETON, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BULGARIAN", (long) wxLANGUAGE_BULGARIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_BURMESE", (long) wxLANGUAGE_BURMESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CAMBODIAN", (long) wxLANGUAGE_CAMBODIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CATALAN", (long) wxLANGUAGE_CATALAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE", (long) wxLANGUAGE_CHINESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_SIMPLIFIED", (long) wxLANGUAGE_CHINESE_SIMPLIFIED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_TRADITIONAL", (long) wxLANGUAGE_CHINESE_TRADITIONAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_HONGKONG", (long) wxLANGUAGE_CHINESE_HONGKONG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_MACAU", (long) wxLANGUAGE_CHINESE_MACAU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_SINGAPORE", (long) wxLANGUAGE_CHINESE_SINGAPORE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CHINESE_TAIWAN", (long) wxLANGUAGE_CHINESE_TAIWAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CORSICAN", (long) wxLANGUAGE_CORSICAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CROATIAN", (long) wxLANGUAGE_CROATIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_CZECH", (long) wxLANGUAGE_CZECH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_DANISH", (long) wxLANGUAGE_DANISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_DUTCH", (long) wxLANGUAGE_DUTCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_DUTCH_BELGIAN", (long) wxLANGUAGE_DUTCH_BELGIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH", (long) wxLANGUAGE_ENGLISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_UK", (long) wxLANGUAGE_ENGLISH_UK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_US", (long) wxLANGUAGE_ENGLISH_US, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_AUSTRALIA", (long) wxLANGUAGE_ENGLISH_AUSTRALIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_BELIZE", (long) wxLANGUAGE_ENGLISH_BELIZE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_BOTSWANA", (long) wxLANGUAGE_ENGLISH_BOTSWANA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_CANADA", (long) wxLANGUAGE_ENGLISH_CANADA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_CARIBBEAN", (long) wxLANGUAGE_ENGLISH_CARIBBEAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_DENMARK", (long) wxLANGUAGE_ENGLISH_DENMARK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_EIRE", (long) wxLANGUAGE_ENGLISH_EIRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_JAMAICA", (long) wxLANGUAGE_ENGLISH_JAMAICA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_NEW_ZEALAND", (long) wxLANGUAGE_ENGLISH_NEW_ZEALAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_PHILIPPINES", (long) wxLANGUAGE_ENGLISH_PHILIPPINES, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_SOUTH_AFRICA", (long) wxLANGUAGE_ENGLISH_SOUTH_AFRICA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_TRINIDAD", (long) wxLANGUAGE_ENGLISH_TRINIDAD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ENGLISH_ZIMBABWE", (long) wxLANGUAGE_ENGLISH_ZIMBABWE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ESPERANTO", (long) wxLANGUAGE_ESPERANTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ESTONIAN", (long) wxLANGUAGE_ESTONIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FAEROESE", (long) wxLANGUAGE_FAEROESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FARSI", (long) wxLANGUAGE_FARSI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FIJI", (long) wxLANGUAGE_FIJI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FINNISH", (long) wxLANGUAGE_FINNISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH", (long) wxLANGUAGE_FRENCH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH_BELGIAN", (long) wxLANGUAGE_FRENCH_BELGIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH_CANADIAN", (long) wxLANGUAGE_FRENCH_CANADIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH_LUXEMBOURG", (long) wxLANGUAGE_FRENCH_LUXEMBOURG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH_MONACO", (long) wxLANGUAGE_FRENCH_MONACO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRENCH_SWISS", (long) wxLANGUAGE_FRENCH_SWISS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_FRISIAN", (long) wxLANGUAGE_FRISIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GALICIAN", (long) wxLANGUAGE_GALICIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GEORGIAN", (long) wxLANGUAGE_GEORGIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN", (long) wxLANGUAGE_GERMAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN_AUSTRIAN", (long) wxLANGUAGE_GERMAN_AUSTRIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN_BELGIUM", (long) wxLANGUAGE_GERMAN_BELGIUM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN_LIECHTENSTEIN", (long) wxLANGUAGE_GERMAN_LIECHTENSTEIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN_LUXEMBOURG", (long) wxLANGUAGE_GERMAN_LUXEMBOURG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GERMAN_SWISS", (long) wxLANGUAGE_GERMAN_SWISS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GREEK", (long) wxLANGUAGE_GREEK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GREENLANDIC", (long) wxLANGUAGE_GREENLANDIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GUARANI", (long) wxLANGUAGE_GUARANI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_GUJARATI", (long) wxLANGUAGE_GUJARATI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_HAUSA", (long) wxLANGUAGE_HAUSA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_HEBREW", (long) wxLANGUAGE_HEBREW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_HINDI", (long) wxLANGUAGE_HINDI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_HUNGARIAN", (long) wxLANGUAGE_HUNGARIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ICELANDIC", (long) wxLANGUAGE_ICELANDIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_INDONESIAN", (long) wxLANGUAGE_INDONESIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_INTERLINGUA", (long) wxLANGUAGE_INTERLINGUA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_INTERLINGUE", (long) wxLANGUAGE_INTERLINGUE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_INUKTITUT", (long) wxLANGUAGE_INUKTITUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_INUPIAK", (long) wxLANGUAGE_INUPIAK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_IRISH", (long) wxLANGUAGE_IRISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ITALIAN", (long) wxLANGUAGE_ITALIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ITALIAN_SWISS", (long) wxLANGUAGE_ITALIAN_SWISS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_JAPANESE", (long) wxLANGUAGE_JAPANESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_JAVANESE", (long) wxLANGUAGE_JAVANESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KANNADA", (long) wxLANGUAGE_KANNADA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KASHMIRI", (long) wxLANGUAGE_KASHMIRI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KASHMIRI_INDIA", (long) wxLANGUAGE_KASHMIRI_INDIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KAZAKH", (long) wxLANGUAGE_KAZAKH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KERNEWEK", (long) wxLANGUAGE_KERNEWEK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KINYARWANDA", (long) wxLANGUAGE_KINYARWANDA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KIRGHIZ", (long) wxLANGUAGE_KIRGHIZ, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KIRUNDI", (long) wxLANGUAGE_KIRUNDI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KONKANI", (long) wxLANGUAGE_KONKANI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KOREAN", (long) wxLANGUAGE_KOREAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_KURDISH", (long) wxLANGUAGE_KURDISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_LAOTHIAN", (long) wxLANGUAGE_LAOTHIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_LATIN", (long) wxLANGUAGE_LATIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_LATVIAN", (long) wxLANGUAGE_LATVIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_LINGALA", (long) wxLANGUAGE_LINGALA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_LITHUANIAN", (long) wxLANGUAGE_LITHUANIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MACEDONIAN", (long) wxLANGUAGE_MACEDONIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALAGASY", (long) wxLANGUAGE_MALAGASY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALAY", (long) wxLANGUAGE_MALAY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALAYALAM", (long) wxLANGUAGE_MALAYALAM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALAY_BRUNEI_DARUSSALAM", (long) wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALAY_MALAYSIA", (long) wxLANGUAGE_MALAY_MALAYSIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MALTESE", (long) wxLANGUAGE_MALTESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MANIPURI", (long) wxLANGUAGE_MANIPURI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MAORI", (long) wxLANGUAGE_MAORI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MARATHI", (long) wxLANGUAGE_MARATHI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MOLDAVIAN", (long) wxLANGUAGE_MOLDAVIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_MONGOLIAN", (long) wxLANGUAGE_MONGOLIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_NAURU", (long) wxLANGUAGE_NAURU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_NEPALI", (long) wxLANGUAGE_NEPALI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_NEPALI_INDIA", (long) wxLANGUAGE_NEPALI_INDIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_NORWEGIAN_BOKMAL", (long) wxLANGUAGE_NORWEGIAN_BOKMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_NORWEGIAN_NYNORSK", (long) wxLANGUAGE_NORWEGIAN_NYNORSK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_OCCITAN", (long) wxLANGUAGE_OCCITAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ORIYA", (long) wxLANGUAGE_ORIYA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_OROMO", (long) wxLANGUAGE_OROMO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_PASHTO", (long) wxLANGUAGE_PASHTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_POLISH", (long) wxLANGUAGE_POLISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_PORTUGUESE", (long) wxLANGUAGE_PORTUGUESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_PORTUGUESE_BRAZILIAN", (long) wxLANGUAGE_PORTUGUESE_BRAZILIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_PUNJABI", (long) wxLANGUAGE_PUNJABI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_QUECHUA", (long) wxLANGUAGE_QUECHUA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_RHAETO_ROMANCE", (long) wxLANGUAGE_RHAETO_ROMANCE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ROMANIAN", (long) wxLANGUAGE_ROMANIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_RUSSIAN", (long) wxLANGUAGE_RUSSIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_RUSSIAN_UKRAINE", (long) wxLANGUAGE_RUSSIAN_UKRAINE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SAMOAN", (long) wxLANGUAGE_SAMOAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SANGHO", (long) wxLANGUAGE_SANGHO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SANSKRIT", (long) wxLANGUAGE_SANSKRIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SCOTS_GAELIC", (long) wxLANGUAGE_SCOTS_GAELIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SERBIAN", (long) wxLANGUAGE_SERBIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SERBIAN_CYRILLIC", (long) wxLANGUAGE_SERBIAN_CYRILLIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SERBIAN_LATIN", (long) wxLANGUAGE_SERBIAN_LATIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SERBO_CROATIAN", (long) wxLANGUAGE_SERBO_CROATIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SESOTHO", (long) wxLANGUAGE_SESOTHO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SETSWANA", (long) wxLANGUAGE_SETSWANA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SHONA", (long) wxLANGUAGE_SHONA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SINDHI", (long) wxLANGUAGE_SINDHI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SINHALESE", (long) wxLANGUAGE_SINHALESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SISWATI", (long) wxLANGUAGE_SISWATI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SLOVAK", (long) wxLANGUAGE_SLOVAK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SLOVENIAN", (long) wxLANGUAGE_SLOVENIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SOMALI", (long) wxLANGUAGE_SOMALI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH", (long) wxLANGUAGE_SPANISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_ARGENTINA", (long) wxLANGUAGE_SPANISH_ARGENTINA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_BOLIVIA", (long) wxLANGUAGE_SPANISH_BOLIVIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_CHILE", (long) wxLANGUAGE_SPANISH_CHILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_COLOMBIA", (long) wxLANGUAGE_SPANISH_COLOMBIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_COSTA_RICA", (long) wxLANGUAGE_SPANISH_COSTA_RICA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_DOMINICAN_REPUBLIC", (long) wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_ECUADOR", (long) wxLANGUAGE_SPANISH_ECUADOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_EL_SALVADOR", (long) wxLANGUAGE_SPANISH_EL_SALVADOR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_GUATEMALA", (long) wxLANGUAGE_SPANISH_GUATEMALA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_HONDURAS", (long) wxLANGUAGE_SPANISH_HONDURAS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_MEXICAN", (long) wxLANGUAGE_SPANISH_MEXICAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_MODERN", (long) wxLANGUAGE_SPANISH_MODERN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_NICARAGUA", (long) wxLANGUAGE_SPANISH_NICARAGUA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_PANAMA", (long) wxLANGUAGE_SPANISH_PANAMA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_PARAGUAY", (long) wxLANGUAGE_SPANISH_PARAGUAY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_PERU", (long) wxLANGUAGE_SPANISH_PERU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_PUERTO_RICO", (long) wxLANGUAGE_SPANISH_PUERTO_RICO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_URUGUAY", (long) wxLANGUAGE_SPANISH_URUGUAY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_US", (long) wxLANGUAGE_SPANISH_US, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SPANISH_VENEZUELA", (long) wxLANGUAGE_SPANISH_VENEZUELA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SUNDANESE", (long) wxLANGUAGE_SUNDANESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SWAHILI", (long) wxLANGUAGE_SWAHILI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SWEDISH", (long) wxLANGUAGE_SWEDISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_SWEDISH_FINLAND", (long) wxLANGUAGE_SWEDISH_FINLAND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TAGALOG", (long) wxLANGUAGE_TAGALOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TAJIK", (long) wxLANGUAGE_TAJIK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TAMIL", (long) wxLANGUAGE_TAMIL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TATAR", (long) wxLANGUAGE_TATAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TELUGU", (long) wxLANGUAGE_TELUGU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_THAI", (long) wxLANGUAGE_THAI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TIBETAN", (long) wxLANGUAGE_TIBETAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TIGRINYA", (long) wxLANGUAGE_TIGRINYA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TONGA", (long) wxLANGUAGE_TONGA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TSONGA", (long) wxLANGUAGE_TSONGA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TURKISH", (long) wxLANGUAGE_TURKISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TURKMEN", (long) wxLANGUAGE_TURKMEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_TWI", (long) wxLANGUAGE_TWI, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UIGHUR", (long) wxLANGUAGE_UIGHUR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UKRAINIAN", (long) wxLANGUAGE_UKRAINIAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_URDU", (long) wxLANGUAGE_URDU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_URDU_INDIA", (long) wxLANGUAGE_URDU_INDIA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_URDU_PAKISTAN", (long) wxLANGUAGE_URDU_PAKISTAN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UZBEK", (long) wxLANGUAGE_UZBEK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UZBEK_CYRILLIC", (long) wxLANGUAGE_UZBEK_CYRILLIC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_UZBEK_LATIN", (long) wxLANGUAGE_UZBEK_LATIN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_VIETNAMESE", (long) wxLANGUAGE_VIETNAMESE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_VOLAPUK", (long) wxLANGUAGE_VOLAPUK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_WELSH", (long) wxLANGUAGE_WELSH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_WOLOF", (long) wxLANGUAGE_WOLOF, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_XHOSA", (long) wxLANGUAGE_XHOSA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_YIDDISH", (long) wxLANGUAGE_YIDDISH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_YORUBA", (long) wxLANGUAGE_YORUBA, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ZHUANG", (long) wxLANGUAGE_ZHUANG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_ZULU", (long) wxLANGUAGE_ZULU, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LANGUAGE_USER_DEFINED", (long) wxLANGUAGE_USER_DEFINED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_CAT_NUMBER", (long) wxLOCALE_CAT_NUMBER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_CAT_DATE", (long) wxLOCALE_CAT_DATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_CAT_MONEY", (long) wxLOCALE_CAT_MONEY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_CAT_MAX", (long) wxLOCALE_CAT_MAX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_THOUSANDS_SEP", (long) wxLOCALE_THOUSANDS_SEP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_DECIMAL_POINT", (long) wxLOCALE_DECIMAL_POINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_LOAD_DEFAULT", (long) wxLOCALE_LOAD_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LOCALE_CONV_ENCODING", (long) wxLOCALE_CONV_ENCODING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONVERT_STRICT", (long) wxCONVERT_STRICT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CONVERT_SUBSTITUTE", (long) wxCONVERT_SUBSTITUTE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PLATFORM_CURRENT", (long) wxPLATFORM_CURRENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PLATFORM_UNIX", (long) wxPLATFORM_UNIX, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PLATFORM_WINDOWS", (long) wxPLATFORM_WINDOWS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PLATFORM_OS2", (long) wxPLATFORM_OS2, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PLATFORM_MAC", (long) wxPLATFORM_MAC, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGELIST_DRAW_NORMAL", (long) wxIMAGELIST_DRAW_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGELIST_DRAW_TRANSPARENT", (long) wxIMAGELIST_DRAW_TRANSPARENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGELIST_DRAW_SELECTED", (long) wxIMAGELIST_DRAW_SELECTED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGELIST_DRAW_FOCUSED", (long) wxIMAGELIST_DRAW_FOCUSED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGE_LIST_NORMAL", (long) wxIMAGE_LIST_NORMAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGE_LIST_SMALL", (long) wxIMAGE_LIST_SMALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IMAGE_LIST_STATE", (long) wxIMAGE_LIST_STATE, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -18527,9 +19636,388 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); + PyDict_SetItemString(d,"OutRegion", SWIG_PyObj_FromInt((int)wxOutRegion)); + PyDict_SetItemString(d,"PartRegion", SWIG_PyObj_FromInt((int)wxPartRegion)); + PyDict_SetItemString(d,"InRegion", SWIG_PyObj_FromInt((int)wxInRegion)); + PyDict_SetItemString(d,"FONTFAMILY_DEFAULT", SWIG_PyObj_FromInt((int)wxFONTFAMILY_DEFAULT)); + PyDict_SetItemString(d,"FONTFAMILY_DECORATIVE", SWIG_PyObj_FromInt((int)wxFONTFAMILY_DECORATIVE)); + PyDict_SetItemString(d,"FONTFAMILY_ROMAN", SWIG_PyObj_FromInt((int)wxFONTFAMILY_ROMAN)); + PyDict_SetItemString(d,"FONTFAMILY_SCRIPT", SWIG_PyObj_FromInt((int)wxFONTFAMILY_SCRIPT)); + PyDict_SetItemString(d,"FONTFAMILY_SWISS", SWIG_PyObj_FromInt((int)wxFONTFAMILY_SWISS)); + PyDict_SetItemString(d,"FONTFAMILY_MODERN", SWIG_PyObj_FromInt((int)wxFONTFAMILY_MODERN)); + PyDict_SetItemString(d,"FONTFAMILY_TELETYPE", SWIG_PyObj_FromInt((int)wxFONTFAMILY_TELETYPE)); + PyDict_SetItemString(d,"FONTFAMILY_MAX", SWIG_PyObj_FromInt((int)wxFONTFAMILY_MAX)); + PyDict_SetItemString(d,"FONTFAMILY_UNKNOWN", SWIG_PyObj_FromInt((int)wxFONTFAMILY_UNKNOWN)); + PyDict_SetItemString(d,"FONTSTYLE_NORMAL", SWIG_PyObj_FromInt((int)wxFONTSTYLE_NORMAL)); + PyDict_SetItemString(d,"FONTSTYLE_ITALIC", SWIG_PyObj_FromInt((int)wxFONTSTYLE_ITALIC)); + PyDict_SetItemString(d,"FONTSTYLE_SLANT", SWIG_PyObj_FromInt((int)wxFONTSTYLE_SLANT)); + PyDict_SetItemString(d,"FONTSTYLE_MAX", SWIG_PyObj_FromInt((int)wxFONTSTYLE_MAX)); + PyDict_SetItemString(d,"FONTWEIGHT_NORMAL", SWIG_PyObj_FromInt((int)wxFONTWEIGHT_NORMAL)); + PyDict_SetItemString(d,"FONTWEIGHT_LIGHT", SWIG_PyObj_FromInt((int)wxFONTWEIGHT_LIGHT)); + PyDict_SetItemString(d,"FONTWEIGHT_BOLD", SWIG_PyObj_FromInt((int)wxFONTWEIGHT_BOLD)); + PyDict_SetItemString(d,"FONTWEIGHT_MAX", SWIG_PyObj_FromInt((int)wxFONTWEIGHT_MAX)); + PyDict_SetItemString(d,"FONTFLAG_DEFAULT", SWIG_PyObj_FromInt((int)wxFONTFLAG_DEFAULT)); + PyDict_SetItemString(d,"FONTFLAG_ITALIC", SWIG_PyObj_FromInt((int)wxFONTFLAG_ITALIC)); + PyDict_SetItemString(d,"FONTFLAG_SLANT", SWIG_PyObj_FromInt((int)wxFONTFLAG_SLANT)); + PyDict_SetItemString(d,"FONTFLAG_LIGHT", SWIG_PyObj_FromInt((int)wxFONTFLAG_LIGHT)); + PyDict_SetItemString(d,"FONTFLAG_BOLD", SWIG_PyObj_FromInt((int)wxFONTFLAG_BOLD)); + PyDict_SetItemString(d,"FONTFLAG_ANTIALIASED", SWIG_PyObj_FromInt((int)wxFONTFLAG_ANTIALIASED)); + PyDict_SetItemString(d,"FONTFLAG_NOT_ANTIALIASED", SWIG_PyObj_FromInt((int)wxFONTFLAG_NOT_ANTIALIASED)); + PyDict_SetItemString(d,"FONTFLAG_UNDERLINED", SWIG_PyObj_FromInt((int)wxFONTFLAG_UNDERLINED)); + PyDict_SetItemString(d,"FONTFLAG_STRIKETHROUGH", SWIG_PyObj_FromInt((int)wxFONTFLAG_STRIKETHROUGH)); + PyDict_SetItemString(d,"FONTFLAG_MASK", SWIG_PyObj_FromInt((int)wxFONTFLAG_MASK)); + PyDict_SetItemString(d,"FONTENCODING_SYSTEM", SWIG_PyObj_FromInt((int)wxFONTENCODING_SYSTEM)); + PyDict_SetItemString(d,"FONTENCODING_DEFAULT", SWIG_PyObj_FromInt((int)wxFONTENCODING_DEFAULT)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_1", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_1)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_2", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_2)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_3", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_3)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_4", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_4)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_5", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_5)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_6", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_6)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_7", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_7)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_8", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_8)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_9", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_9)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_10", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_10)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_11", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_11)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_12", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_12)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_13", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_13)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_14", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_14)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_15", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_15)); + PyDict_SetItemString(d,"FONTENCODING_ISO8859_MAX", SWIG_PyObj_FromInt((int)wxFONTENCODING_ISO8859_MAX)); + PyDict_SetItemString(d,"FONTENCODING_KOI8", SWIG_PyObj_FromInt((int)wxFONTENCODING_KOI8)); + PyDict_SetItemString(d,"FONTENCODING_ALTERNATIVE", SWIG_PyObj_FromInt((int)wxFONTENCODING_ALTERNATIVE)); + PyDict_SetItemString(d,"FONTENCODING_BULGARIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_BULGARIAN)); + PyDict_SetItemString(d,"FONTENCODING_CP437", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP437)); + PyDict_SetItemString(d,"FONTENCODING_CP850", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP850)); + PyDict_SetItemString(d,"FONTENCODING_CP852", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP852)); + PyDict_SetItemString(d,"FONTENCODING_CP855", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP855)); + PyDict_SetItemString(d,"FONTENCODING_CP866", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP866)); + PyDict_SetItemString(d,"FONTENCODING_CP874", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP874)); + PyDict_SetItemString(d,"FONTENCODING_CP932", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP932)); + PyDict_SetItemString(d,"FONTENCODING_CP936", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP936)); + PyDict_SetItemString(d,"FONTENCODING_CP949", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP949)); + PyDict_SetItemString(d,"FONTENCODING_CP950", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP950)); + PyDict_SetItemString(d,"FONTENCODING_CP1250", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1250)); + PyDict_SetItemString(d,"FONTENCODING_CP1251", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1251)); + PyDict_SetItemString(d,"FONTENCODING_CP1252", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1252)); + PyDict_SetItemString(d,"FONTENCODING_CP1253", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1253)); + PyDict_SetItemString(d,"FONTENCODING_CP1254", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1254)); + PyDict_SetItemString(d,"FONTENCODING_CP1255", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1255)); + PyDict_SetItemString(d,"FONTENCODING_CP1256", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1256)); + PyDict_SetItemString(d,"FONTENCODING_CP1257", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP1257)); + PyDict_SetItemString(d,"FONTENCODING_CP12_MAX", SWIG_PyObj_FromInt((int)wxFONTENCODING_CP12_MAX)); + PyDict_SetItemString(d,"FONTENCODING_UTF7", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF7)); + PyDict_SetItemString(d,"FONTENCODING_UTF8", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF8)); + PyDict_SetItemString(d,"FONTENCODING_EUC_JP", SWIG_PyObj_FromInt((int)wxFONTENCODING_EUC_JP)); + PyDict_SetItemString(d,"FONTENCODING_UTF16BE", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF16BE)); + PyDict_SetItemString(d,"FONTENCODING_UTF16LE", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF16LE)); + PyDict_SetItemString(d,"FONTENCODING_UTF32BE", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF32BE)); + PyDict_SetItemString(d,"FONTENCODING_UTF32LE", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF32LE)); + PyDict_SetItemString(d,"FONTENCODING_MACROMAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACROMAN)); + PyDict_SetItemString(d,"FONTENCODING_MACJAPANESE", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACJAPANESE)); + PyDict_SetItemString(d,"FONTENCODING_MACCHINESETRAD", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCHINESETRAD)); + PyDict_SetItemString(d,"FONTENCODING_MACKOREAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACKOREAN)); + PyDict_SetItemString(d,"FONTENCODING_MACARABIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACARABIC)); + PyDict_SetItemString(d,"FONTENCODING_MACHEBREW", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACHEBREW)); + PyDict_SetItemString(d,"FONTENCODING_MACGREEK", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACGREEK)); + PyDict_SetItemString(d,"FONTENCODING_MACCYRILLIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCYRILLIC)); + PyDict_SetItemString(d,"FONTENCODING_MACDEVANAGARI", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACDEVANAGARI)); + PyDict_SetItemString(d,"FONTENCODING_MACGURMUKHI", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACGURMUKHI)); + PyDict_SetItemString(d,"FONTENCODING_MACGUJARATI", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACGUJARATI)); + PyDict_SetItemString(d,"FONTENCODING_MACORIYA", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACORIYA)); + PyDict_SetItemString(d,"FONTENCODING_MACBENGALI", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACBENGALI)); + PyDict_SetItemString(d,"FONTENCODING_MACTAMIL", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACTAMIL)); + PyDict_SetItemString(d,"FONTENCODING_MACTELUGU", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACTELUGU)); + PyDict_SetItemString(d,"FONTENCODING_MACKANNADA", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACKANNADA)); + PyDict_SetItemString(d,"FONTENCODING_MACMALAJALAM", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACMALAJALAM)); + PyDict_SetItemString(d,"FONTENCODING_MACSINHALESE", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACSINHALESE)); + PyDict_SetItemString(d,"FONTENCODING_MACBURMESE", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACBURMESE)); + PyDict_SetItemString(d,"FONTENCODING_MACKHMER", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACKHMER)); + PyDict_SetItemString(d,"FONTENCODING_MACTHAI", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACTHAI)); + PyDict_SetItemString(d,"FONTENCODING_MACLAOTIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACLAOTIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACGEORGIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACGEORGIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACARMENIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACARMENIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACCHINESESIMP", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCHINESESIMP)); + PyDict_SetItemString(d,"FONTENCODING_MACTIBETAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACTIBETAN)); + PyDict_SetItemString(d,"FONTENCODING_MACMONGOLIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACMONGOLIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACETHIOPIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACETHIOPIC)); + PyDict_SetItemString(d,"FONTENCODING_MACCENTRALEUR", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCENTRALEUR)); + PyDict_SetItemString(d,"FONTENCODING_MACVIATNAMESE", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACVIATNAMESE)); + PyDict_SetItemString(d,"FONTENCODING_MACARABICEXT", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACARABICEXT)); + PyDict_SetItemString(d,"FONTENCODING_MACSYMBOL", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACSYMBOL)); + PyDict_SetItemString(d,"FONTENCODING_MACDINGBATS", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACDINGBATS)); + PyDict_SetItemString(d,"FONTENCODING_MACTURKISH", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACTURKISH)); + PyDict_SetItemString(d,"FONTENCODING_MACCROATIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCROATIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACICELANDIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACICELANDIC)); + PyDict_SetItemString(d,"FONTENCODING_MACROMANIAN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACROMANIAN)); + PyDict_SetItemString(d,"FONTENCODING_MACCELTIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACCELTIC)); + PyDict_SetItemString(d,"FONTENCODING_MACGAELIC", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACGAELIC)); + PyDict_SetItemString(d,"FONTENCODING_MACKEYBOARD", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACKEYBOARD)); + PyDict_SetItemString(d,"FONTENCODING_MACMIN", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACMIN)); + PyDict_SetItemString(d,"FONTENCODING_MACMAX", SWIG_PyObj_FromInt((int)wxFONTENCODING_MACMAX)); + PyDict_SetItemString(d,"FONTENCODING_MAX", SWIG_PyObj_FromInt((int)wxFONTENCODING_MAX)); + PyDict_SetItemString(d,"FONTENCODING_UTF16", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF16)); + PyDict_SetItemString(d,"FONTENCODING_UTF32", SWIG_PyObj_FromInt((int)wxFONTENCODING_UTF32)); + PyDict_SetItemString(d,"FONTENCODING_UNICODE", SWIG_PyObj_FromInt((int)wxFONTENCODING_UNICODE)); + PyDict_SetItemString(d,"FONTENCODING_GB2312", SWIG_PyObj_FromInt((int)wxFONTENCODING_GB2312)); + PyDict_SetItemString(d,"FONTENCODING_BIG5", SWIG_PyObj_FromInt((int)wxFONTENCODING_BIG5)); + PyDict_SetItemString(d,"FONTENCODING_SHIFT_JIS", SWIG_PyObj_FromInt((int)wxFONTENCODING_SHIFT_JIS)); wxPyPtrTypeMap_Add("wxFontEnumerator", "wxPyFontEnumerator"); + PyDict_SetItemString(d,"LANGUAGE_DEFAULT", SWIG_PyObj_FromInt((int)wxLANGUAGE_DEFAULT)); + PyDict_SetItemString(d,"LANGUAGE_UNKNOWN", SWIG_PyObj_FromInt((int)wxLANGUAGE_UNKNOWN)); + PyDict_SetItemString(d,"LANGUAGE_ABKHAZIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ABKHAZIAN)); + PyDict_SetItemString(d,"LANGUAGE_AFAR", SWIG_PyObj_FromInt((int)wxLANGUAGE_AFAR)); + PyDict_SetItemString(d,"LANGUAGE_AFRIKAANS", SWIG_PyObj_FromInt((int)wxLANGUAGE_AFRIKAANS)); + PyDict_SetItemString(d,"LANGUAGE_ALBANIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ALBANIAN)); + PyDict_SetItemString(d,"LANGUAGE_AMHARIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_AMHARIC)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_ALGERIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_ALGERIA)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_BAHRAIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_BAHRAIN)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_EGYPT", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_EGYPT)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_IRAQ", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_IRAQ)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_JORDAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_JORDAN)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_KUWAIT", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_KUWAIT)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_LEBANON", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_LEBANON)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_LIBYA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_LIBYA)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_MOROCCO", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_MOROCCO)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_OMAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_OMAN)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_QATAR", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_QATAR)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_SAUDI_ARABIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_SAUDI_ARABIA)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_SUDAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_SUDAN)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_SYRIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_SYRIA)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_TUNISIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_TUNISIA)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_UAE", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_UAE)); + PyDict_SetItemString(d,"LANGUAGE_ARABIC_YEMEN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARABIC_YEMEN)); + PyDict_SetItemString(d,"LANGUAGE_ARMENIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ARMENIAN)); + PyDict_SetItemString(d,"LANGUAGE_ASSAMESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_ASSAMESE)); + PyDict_SetItemString(d,"LANGUAGE_AYMARA", SWIG_PyObj_FromInt((int)wxLANGUAGE_AYMARA)); + PyDict_SetItemString(d,"LANGUAGE_AZERI", SWIG_PyObj_FromInt((int)wxLANGUAGE_AZERI)); + PyDict_SetItemString(d,"LANGUAGE_AZERI_CYRILLIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_AZERI_CYRILLIC)); + PyDict_SetItemString(d,"LANGUAGE_AZERI_LATIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_AZERI_LATIN)); + PyDict_SetItemString(d,"LANGUAGE_BASHKIR", SWIG_PyObj_FromInt((int)wxLANGUAGE_BASHKIR)); + PyDict_SetItemString(d,"LANGUAGE_BASQUE", SWIG_PyObj_FromInt((int)wxLANGUAGE_BASQUE)); + PyDict_SetItemString(d,"LANGUAGE_BELARUSIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_BELARUSIAN)); + PyDict_SetItemString(d,"LANGUAGE_BENGALI", SWIG_PyObj_FromInt((int)wxLANGUAGE_BENGALI)); + PyDict_SetItemString(d,"LANGUAGE_BHUTANI", SWIG_PyObj_FromInt((int)wxLANGUAGE_BHUTANI)); + PyDict_SetItemString(d,"LANGUAGE_BIHARI", SWIG_PyObj_FromInt((int)wxLANGUAGE_BIHARI)); + PyDict_SetItemString(d,"LANGUAGE_BISLAMA", SWIG_PyObj_FromInt((int)wxLANGUAGE_BISLAMA)); + PyDict_SetItemString(d,"LANGUAGE_BRETON", SWIG_PyObj_FromInt((int)wxLANGUAGE_BRETON)); + PyDict_SetItemString(d,"LANGUAGE_BULGARIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_BULGARIAN)); + PyDict_SetItemString(d,"LANGUAGE_BURMESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_BURMESE)); + PyDict_SetItemString(d,"LANGUAGE_CAMBODIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_CAMBODIAN)); + PyDict_SetItemString(d,"LANGUAGE_CATALAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_CATALAN)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_SIMPLIFIED", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_SIMPLIFIED)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_TRADITIONAL", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_TRADITIONAL)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_HONGKONG", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_HONGKONG)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_MACAU", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_MACAU)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_SINGAPORE", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_SINGAPORE)); + PyDict_SetItemString(d,"LANGUAGE_CHINESE_TAIWAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_CHINESE_TAIWAN)); + PyDict_SetItemString(d,"LANGUAGE_CORSICAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_CORSICAN)); + PyDict_SetItemString(d,"LANGUAGE_CROATIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_CROATIAN)); + PyDict_SetItemString(d,"LANGUAGE_CZECH", SWIG_PyObj_FromInt((int)wxLANGUAGE_CZECH)); + PyDict_SetItemString(d,"LANGUAGE_DANISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_DANISH)); + PyDict_SetItemString(d,"LANGUAGE_DUTCH", SWIG_PyObj_FromInt((int)wxLANGUAGE_DUTCH)); + PyDict_SetItemString(d,"LANGUAGE_DUTCH_BELGIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_DUTCH_BELGIAN)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_UK", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_UK)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_US", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_US)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_AUSTRALIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_AUSTRALIA)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_BELIZE", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_BELIZE)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_BOTSWANA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_BOTSWANA)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_CANADA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_CANADA)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_CARIBBEAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_CARIBBEAN)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_DENMARK", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_DENMARK)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_EIRE", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_EIRE)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_JAMAICA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_JAMAICA)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_NEW_ZEALAND", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_NEW_ZEALAND)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_PHILIPPINES", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_PHILIPPINES)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_SOUTH_AFRICA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_SOUTH_AFRICA)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_TRINIDAD", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_TRINIDAD)); + PyDict_SetItemString(d,"LANGUAGE_ENGLISH_ZIMBABWE", SWIG_PyObj_FromInt((int)wxLANGUAGE_ENGLISH_ZIMBABWE)); + PyDict_SetItemString(d,"LANGUAGE_ESPERANTO", SWIG_PyObj_FromInt((int)wxLANGUAGE_ESPERANTO)); + PyDict_SetItemString(d,"LANGUAGE_ESTONIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ESTONIAN)); + PyDict_SetItemString(d,"LANGUAGE_FAEROESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_FAEROESE)); + PyDict_SetItemString(d,"LANGUAGE_FARSI", SWIG_PyObj_FromInt((int)wxLANGUAGE_FARSI)); + PyDict_SetItemString(d,"LANGUAGE_FIJI", SWIG_PyObj_FromInt((int)wxLANGUAGE_FIJI)); + PyDict_SetItemString(d,"LANGUAGE_FINNISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_FINNISH)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH_BELGIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH_BELGIAN)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH_CANADIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH_CANADIAN)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH_LUXEMBOURG", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH_LUXEMBOURG)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH_MONACO", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH_MONACO)); + PyDict_SetItemString(d,"LANGUAGE_FRENCH_SWISS", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRENCH_SWISS)); + PyDict_SetItemString(d,"LANGUAGE_FRISIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_FRISIAN)); + PyDict_SetItemString(d,"LANGUAGE_GALICIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_GALICIAN)); + PyDict_SetItemString(d,"LANGUAGE_GEORGIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_GEORGIAN)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN_AUSTRIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN_AUSTRIAN)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN_BELGIUM", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN_BELGIUM)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN_LIECHTENSTEIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN_LIECHTENSTEIN)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN_LUXEMBOURG", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN_LUXEMBOURG)); + PyDict_SetItemString(d,"LANGUAGE_GERMAN_SWISS", SWIG_PyObj_FromInt((int)wxLANGUAGE_GERMAN_SWISS)); + PyDict_SetItemString(d,"LANGUAGE_GREEK", SWIG_PyObj_FromInt((int)wxLANGUAGE_GREEK)); + PyDict_SetItemString(d,"LANGUAGE_GREENLANDIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_GREENLANDIC)); + PyDict_SetItemString(d,"LANGUAGE_GUARANI", SWIG_PyObj_FromInt((int)wxLANGUAGE_GUARANI)); + PyDict_SetItemString(d,"LANGUAGE_GUJARATI", SWIG_PyObj_FromInt((int)wxLANGUAGE_GUJARATI)); + PyDict_SetItemString(d,"LANGUAGE_HAUSA", SWIG_PyObj_FromInt((int)wxLANGUAGE_HAUSA)); + PyDict_SetItemString(d,"LANGUAGE_HEBREW", SWIG_PyObj_FromInt((int)wxLANGUAGE_HEBREW)); + PyDict_SetItemString(d,"LANGUAGE_HINDI", SWIG_PyObj_FromInt((int)wxLANGUAGE_HINDI)); + PyDict_SetItemString(d,"LANGUAGE_HUNGARIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_HUNGARIAN)); + PyDict_SetItemString(d,"LANGUAGE_ICELANDIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_ICELANDIC)); + PyDict_SetItemString(d,"LANGUAGE_INDONESIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_INDONESIAN)); + PyDict_SetItemString(d,"LANGUAGE_INTERLINGUA", SWIG_PyObj_FromInt((int)wxLANGUAGE_INTERLINGUA)); + PyDict_SetItemString(d,"LANGUAGE_INTERLINGUE", SWIG_PyObj_FromInt((int)wxLANGUAGE_INTERLINGUE)); + PyDict_SetItemString(d,"LANGUAGE_INUKTITUT", SWIG_PyObj_FromInt((int)wxLANGUAGE_INUKTITUT)); + PyDict_SetItemString(d,"LANGUAGE_INUPIAK", SWIG_PyObj_FromInt((int)wxLANGUAGE_INUPIAK)); + PyDict_SetItemString(d,"LANGUAGE_IRISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_IRISH)); + PyDict_SetItemString(d,"LANGUAGE_ITALIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ITALIAN)); + PyDict_SetItemString(d,"LANGUAGE_ITALIAN_SWISS", SWIG_PyObj_FromInt((int)wxLANGUAGE_ITALIAN_SWISS)); + PyDict_SetItemString(d,"LANGUAGE_JAPANESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_JAPANESE)); + PyDict_SetItemString(d,"LANGUAGE_JAVANESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_JAVANESE)); + PyDict_SetItemString(d,"LANGUAGE_KANNADA", SWIG_PyObj_FromInt((int)wxLANGUAGE_KANNADA)); + PyDict_SetItemString(d,"LANGUAGE_KASHMIRI", SWIG_PyObj_FromInt((int)wxLANGUAGE_KASHMIRI)); + PyDict_SetItemString(d,"LANGUAGE_KASHMIRI_INDIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_KASHMIRI_INDIA)); + PyDict_SetItemString(d,"LANGUAGE_KAZAKH", SWIG_PyObj_FromInt((int)wxLANGUAGE_KAZAKH)); + PyDict_SetItemString(d,"LANGUAGE_KERNEWEK", SWIG_PyObj_FromInt((int)wxLANGUAGE_KERNEWEK)); + PyDict_SetItemString(d,"LANGUAGE_KINYARWANDA", SWIG_PyObj_FromInt((int)wxLANGUAGE_KINYARWANDA)); + PyDict_SetItemString(d,"LANGUAGE_KIRGHIZ", SWIG_PyObj_FromInt((int)wxLANGUAGE_KIRGHIZ)); + PyDict_SetItemString(d,"LANGUAGE_KIRUNDI", SWIG_PyObj_FromInt((int)wxLANGUAGE_KIRUNDI)); + PyDict_SetItemString(d,"LANGUAGE_KONKANI", SWIG_PyObj_FromInt((int)wxLANGUAGE_KONKANI)); + PyDict_SetItemString(d,"LANGUAGE_KOREAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_KOREAN)); + PyDict_SetItemString(d,"LANGUAGE_KURDISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_KURDISH)); + PyDict_SetItemString(d,"LANGUAGE_LAOTHIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_LAOTHIAN)); + PyDict_SetItemString(d,"LANGUAGE_LATIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_LATIN)); + PyDict_SetItemString(d,"LANGUAGE_LATVIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_LATVIAN)); + PyDict_SetItemString(d,"LANGUAGE_LINGALA", SWIG_PyObj_FromInt((int)wxLANGUAGE_LINGALA)); + PyDict_SetItemString(d,"LANGUAGE_LITHUANIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_LITHUANIAN)); + PyDict_SetItemString(d,"LANGUAGE_MACEDONIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_MACEDONIAN)); + PyDict_SetItemString(d,"LANGUAGE_MALAGASY", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALAGASY)); + PyDict_SetItemString(d,"LANGUAGE_MALAY", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALAY)); + PyDict_SetItemString(d,"LANGUAGE_MALAYALAM", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALAYALAM)); + PyDict_SetItemString(d,"LANGUAGE_MALAY_BRUNEI_DARUSSALAM", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM)); + PyDict_SetItemString(d,"LANGUAGE_MALAY_MALAYSIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALAY_MALAYSIA)); + PyDict_SetItemString(d,"LANGUAGE_MALTESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_MALTESE)); + PyDict_SetItemString(d,"LANGUAGE_MANIPURI", SWIG_PyObj_FromInt((int)wxLANGUAGE_MANIPURI)); + PyDict_SetItemString(d,"LANGUAGE_MAORI", SWIG_PyObj_FromInt((int)wxLANGUAGE_MAORI)); + PyDict_SetItemString(d,"LANGUAGE_MARATHI", SWIG_PyObj_FromInt((int)wxLANGUAGE_MARATHI)); + PyDict_SetItemString(d,"LANGUAGE_MOLDAVIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_MOLDAVIAN)); + PyDict_SetItemString(d,"LANGUAGE_MONGOLIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_MONGOLIAN)); + PyDict_SetItemString(d,"LANGUAGE_NAURU", SWIG_PyObj_FromInt((int)wxLANGUAGE_NAURU)); + PyDict_SetItemString(d,"LANGUAGE_NEPALI", SWIG_PyObj_FromInt((int)wxLANGUAGE_NEPALI)); + PyDict_SetItemString(d,"LANGUAGE_NEPALI_INDIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_NEPALI_INDIA)); + PyDict_SetItemString(d,"LANGUAGE_NORWEGIAN_BOKMAL", SWIG_PyObj_FromInt((int)wxLANGUAGE_NORWEGIAN_BOKMAL)); + PyDict_SetItemString(d,"LANGUAGE_NORWEGIAN_NYNORSK", SWIG_PyObj_FromInt((int)wxLANGUAGE_NORWEGIAN_NYNORSK)); + PyDict_SetItemString(d,"LANGUAGE_OCCITAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_OCCITAN)); + PyDict_SetItemString(d,"LANGUAGE_ORIYA", SWIG_PyObj_FromInt((int)wxLANGUAGE_ORIYA)); + PyDict_SetItemString(d,"LANGUAGE_OROMO", SWIG_PyObj_FromInt((int)wxLANGUAGE_OROMO)); + PyDict_SetItemString(d,"LANGUAGE_PASHTO", SWIG_PyObj_FromInt((int)wxLANGUAGE_PASHTO)); + PyDict_SetItemString(d,"LANGUAGE_POLISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_POLISH)); + PyDict_SetItemString(d,"LANGUAGE_PORTUGUESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_PORTUGUESE)); + PyDict_SetItemString(d,"LANGUAGE_PORTUGUESE_BRAZILIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_PORTUGUESE_BRAZILIAN)); + PyDict_SetItemString(d,"LANGUAGE_PUNJABI", SWIG_PyObj_FromInt((int)wxLANGUAGE_PUNJABI)); + PyDict_SetItemString(d,"LANGUAGE_QUECHUA", SWIG_PyObj_FromInt((int)wxLANGUAGE_QUECHUA)); + PyDict_SetItemString(d,"LANGUAGE_RHAETO_ROMANCE", SWIG_PyObj_FromInt((int)wxLANGUAGE_RHAETO_ROMANCE)); + PyDict_SetItemString(d,"LANGUAGE_ROMANIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_ROMANIAN)); + PyDict_SetItemString(d,"LANGUAGE_RUSSIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_RUSSIAN)); + PyDict_SetItemString(d,"LANGUAGE_RUSSIAN_UKRAINE", SWIG_PyObj_FromInt((int)wxLANGUAGE_RUSSIAN_UKRAINE)); + PyDict_SetItemString(d,"LANGUAGE_SAMOAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SAMOAN)); + PyDict_SetItemString(d,"LANGUAGE_SANGHO", SWIG_PyObj_FromInt((int)wxLANGUAGE_SANGHO)); + PyDict_SetItemString(d,"LANGUAGE_SANSKRIT", SWIG_PyObj_FromInt((int)wxLANGUAGE_SANSKRIT)); + PyDict_SetItemString(d,"LANGUAGE_SCOTS_GAELIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_SCOTS_GAELIC)); + PyDict_SetItemString(d,"LANGUAGE_SERBIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SERBIAN)); + PyDict_SetItemString(d,"LANGUAGE_SERBIAN_CYRILLIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_SERBIAN_CYRILLIC)); + PyDict_SetItemString(d,"LANGUAGE_SERBIAN_LATIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SERBIAN_LATIN)); + PyDict_SetItemString(d,"LANGUAGE_SERBO_CROATIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SERBO_CROATIAN)); + PyDict_SetItemString(d,"LANGUAGE_SESOTHO", SWIG_PyObj_FromInt((int)wxLANGUAGE_SESOTHO)); + PyDict_SetItemString(d,"LANGUAGE_SETSWANA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SETSWANA)); + PyDict_SetItemString(d,"LANGUAGE_SHONA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SHONA)); + PyDict_SetItemString(d,"LANGUAGE_SINDHI", SWIG_PyObj_FromInt((int)wxLANGUAGE_SINDHI)); + PyDict_SetItemString(d,"LANGUAGE_SINHALESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_SINHALESE)); + PyDict_SetItemString(d,"LANGUAGE_SISWATI", SWIG_PyObj_FromInt((int)wxLANGUAGE_SISWATI)); + PyDict_SetItemString(d,"LANGUAGE_SLOVAK", SWIG_PyObj_FromInt((int)wxLANGUAGE_SLOVAK)); + PyDict_SetItemString(d,"LANGUAGE_SLOVENIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SLOVENIAN)); + PyDict_SetItemString(d,"LANGUAGE_SOMALI", SWIG_PyObj_FromInt((int)wxLANGUAGE_SOMALI)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_ARGENTINA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_ARGENTINA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_BOLIVIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_BOLIVIA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_CHILE", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_CHILE)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_COLOMBIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_COLOMBIA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_COSTA_RICA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_COSTA_RICA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_DOMINICAN_REPUBLIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_ECUADOR", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_ECUADOR)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_EL_SALVADOR", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_EL_SALVADOR)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_GUATEMALA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_GUATEMALA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_HONDURAS", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_HONDURAS)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_MEXICAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_MEXICAN)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_MODERN", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_MODERN)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_NICARAGUA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_NICARAGUA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_PANAMA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_PANAMA)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_PARAGUAY", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_PARAGUAY)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_PERU", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_PERU)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_PUERTO_RICO", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_PUERTO_RICO)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_URUGUAY", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_URUGUAY)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_US", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_US)); + PyDict_SetItemString(d,"LANGUAGE_SPANISH_VENEZUELA", SWIG_PyObj_FromInt((int)wxLANGUAGE_SPANISH_VENEZUELA)); + PyDict_SetItemString(d,"LANGUAGE_SUNDANESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_SUNDANESE)); + PyDict_SetItemString(d,"LANGUAGE_SWAHILI", SWIG_PyObj_FromInt((int)wxLANGUAGE_SWAHILI)); + PyDict_SetItemString(d,"LANGUAGE_SWEDISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_SWEDISH)); + PyDict_SetItemString(d,"LANGUAGE_SWEDISH_FINLAND", SWIG_PyObj_FromInt((int)wxLANGUAGE_SWEDISH_FINLAND)); + PyDict_SetItemString(d,"LANGUAGE_TAGALOG", SWIG_PyObj_FromInt((int)wxLANGUAGE_TAGALOG)); + PyDict_SetItemString(d,"LANGUAGE_TAJIK", SWIG_PyObj_FromInt((int)wxLANGUAGE_TAJIK)); + PyDict_SetItemString(d,"LANGUAGE_TAMIL", SWIG_PyObj_FromInt((int)wxLANGUAGE_TAMIL)); + PyDict_SetItemString(d,"LANGUAGE_TATAR", SWIG_PyObj_FromInt((int)wxLANGUAGE_TATAR)); + PyDict_SetItemString(d,"LANGUAGE_TELUGU", SWIG_PyObj_FromInt((int)wxLANGUAGE_TELUGU)); + PyDict_SetItemString(d,"LANGUAGE_THAI", SWIG_PyObj_FromInt((int)wxLANGUAGE_THAI)); + PyDict_SetItemString(d,"LANGUAGE_TIBETAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_TIBETAN)); + PyDict_SetItemString(d,"LANGUAGE_TIGRINYA", SWIG_PyObj_FromInt((int)wxLANGUAGE_TIGRINYA)); + PyDict_SetItemString(d,"LANGUAGE_TONGA", SWIG_PyObj_FromInt((int)wxLANGUAGE_TONGA)); + PyDict_SetItemString(d,"LANGUAGE_TSONGA", SWIG_PyObj_FromInt((int)wxLANGUAGE_TSONGA)); + PyDict_SetItemString(d,"LANGUAGE_TURKISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_TURKISH)); + PyDict_SetItemString(d,"LANGUAGE_TURKMEN", SWIG_PyObj_FromInt((int)wxLANGUAGE_TURKMEN)); + PyDict_SetItemString(d,"LANGUAGE_TWI", SWIG_PyObj_FromInt((int)wxLANGUAGE_TWI)); + PyDict_SetItemString(d,"LANGUAGE_UIGHUR", SWIG_PyObj_FromInt((int)wxLANGUAGE_UIGHUR)); + PyDict_SetItemString(d,"LANGUAGE_UKRAINIAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_UKRAINIAN)); + PyDict_SetItemString(d,"LANGUAGE_URDU", SWIG_PyObj_FromInt((int)wxLANGUAGE_URDU)); + PyDict_SetItemString(d,"LANGUAGE_URDU_INDIA", SWIG_PyObj_FromInt((int)wxLANGUAGE_URDU_INDIA)); + PyDict_SetItemString(d,"LANGUAGE_URDU_PAKISTAN", SWIG_PyObj_FromInt((int)wxLANGUAGE_URDU_PAKISTAN)); + PyDict_SetItemString(d,"LANGUAGE_UZBEK", SWIG_PyObj_FromInt((int)wxLANGUAGE_UZBEK)); + PyDict_SetItemString(d,"LANGUAGE_UZBEK_CYRILLIC", SWIG_PyObj_FromInt((int)wxLANGUAGE_UZBEK_CYRILLIC)); + PyDict_SetItemString(d,"LANGUAGE_UZBEK_LATIN", SWIG_PyObj_FromInt((int)wxLANGUAGE_UZBEK_LATIN)); + PyDict_SetItemString(d,"LANGUAGE_VIETNAMESE", SWIG_PyObj_FromInt((int)wxLANGUAGE_VIETNAMESE)); + PyDict_SetItemString(d,"LANGUAGE_VOLAPUK", SWIG_PyObj_FromInt((int)wxLANGUAGE_VOLAPUK)); + PyDict_SetItemString(d,"LANGUAGE_WELSH", SWIG_PyObj_FromInt((int)wxLANGUAGE_WELSH)); + PyDict_SetItemString(d,"LANGUAGE_WOLOF", SWIG_PyObj_FromInt((int)wxLANGUAGE_WOLOF)); + PyDict_SetItemString(d,"LANGUAGE_XHOSA", SWIG_PyObj_FromInt((int)wxLANGUAGE_XHOSA)); + PyDict_SetItemString(d,"LANGUAGE_YIDDISH", SWIG_PyObj_FromInt((int)wxLANGUAGE_YIDDISH)); + PyDict_SetItemString(d,"LANGUAGE_YORUBA", SWIG_PyObj_FromInt((int)wxLANGUAGE_YORUBA)); + PyDict_SetItemString(d,"LANGUAGE_ZHUANG", SWIG_PyObj_FromInt((int)wxLANGUAGE_ZHUANG)); + PyDict_SetItemString(d,"LANGUAGE_ZULU", SWIG_PyObj_FromInt((int)wxLANGUAGE_ZULU)); + PyDict_SetItemString(d,"LANGUAGE_USER_DEFINED", SWIG_PyObj_FromInt((int)wxLANGUAGE_USER_DEFINED)); + PyDict_SetItemString(d,"LOCALE_CAT_NUMBER", SWIG_PyObj_FromInt((int)wxLOCALE_CAT_NUMBER)); + PyDict_SetItemString(d,"LOCALE_CAT_DATE", SWIG_PyObj_FromInt((int)wxLOCALE_CAT_DATE)); + PyDict_SetItemString(d,"LOCALE_CAT_MONEY", SWIG_PyObj_FromInt((int)wxLOCALE_CAT_MONEY)); + PyDict_SetItemString(d,"LOCALE_CAT_MAX", SWIG_PyObj_FromInt((int)wxLOCALE_CAT_MAX)); + PyDict_SetItemString(d,"LOCALE_THOUSANDS_SEP", SWIG_PyObj_FromInt((int)wxLOCALE_THOUSANDS_SEP)); + PyDict_SetItemString(d,"LOCALE_DECIMAL_POINT", SWIG_PyObj_FromInt((int)wxLOCALE_DECIMAL_POINT)); + PyDict_SetItemString(d,"LOCALE_LOAD_DEFAULT", SWIG_PyObj_FromInt((int)wxLOCALE_LOAD_DEFAULT)); + PyDict_SetItemString(d,"LOCALE_CONV_ENCODING", SWIG_PyObj_FromInt((int)wxLOCALE_CONV_ENCODING)); + PyDict_SetItemString(d,"CONVERT_STRICT", SWIG_PyObj_FromInt((int)wxCONVERT_STRICT)); + PyDict_SetItemString(d,"CONVERT_SUBSTITUTE", SWIG_PyObj_FromInt((int)wxCONVERT_SUBSTITUTE)); + PyDict_SetItemString(d,"PLATFORM_CURRENT", SWIG_PyObj_FromInt((int)wxPLATFORM_CURRENT)); + PyDict_SetItemString(d,"PLATFORM_UNIX", SWIG_PyObj_FromInt((int)wxPLATFORM_UNIX)); + PyDict_SetItemString(d,"PLATFORM_WINDOWS", SWIG_PyObj_FromInt((int)wxPLATFORM_WINDOWS)); + PyDict_SetItemString(d,"PLATFORM_OS2", SWIG_PyObj_FromInt((int)wxPLATFORM_OS2)); + PyDict_SetItemString(d,"PLATFORM_MAC", SWIG_PyObj_FromInt((int)wxPLATFORM_MAC)); + PyDict_SetItemString(d,"IMAGELIST_DRAW_NORMAL", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_NORMAL)); + PyDict_SetItemString(d,"IMAGELIST_DRAW_TRANSPARENT", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_TRANSPARENT)); + PyDict_SetItemString(d,"IMAGELIST_DRAW_SELECTED", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_SELECTED)); + PyDict_SetItemString(d,"IMAGELIST_DRAW_FOCUSED", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_FOCUSED)); + PyDict_SetItemString(d,"IMAGE_LIST_NORMAL", SWIG_PyObj_FromInt((int)wxIMAGE_LIST_NORMAL)); + PyDict_SetItemString(d,"IMAGE_LIST_SMALL", SWIG_PyObj_FromInt((int)wxIMAGE_LIST_SMALL)); + PyDict_SetItemString(d,"IMAGE_LIST_STATE", SWIG_PyObj_FromInt((int)wxIMAGE_LIST_STATE)); PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"NORMAL_FONT",_wrap_NORMAL_FONT_get, _wrap_NORMAL_FONT_set); SWIG_addvarlink(SWIG_globals,(char*)"SMALL_FONT",_wrap_SMALL_FONT_get, _wrap_SMALL_FONT_set); @@ -18578,7 +20066,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(); }