X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..83448d71476c44b449f09395cda06fa72b19a50e:/wxPython/src/gtk/misc_wrap.cpp?ds=sidebyside diff --git a/wxPython/src/gtk/misc_wrap.cpp b/wxPython/src/gtk/misc_wrap.cpp index b9299c6ba3..bc7b845d90 100644 --- a/wxPython/src/gtk/misc_wrap.cpp +++ b/wxPython/src/gtk/misc_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,16 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **); SWIGIMPORT(const char *) SWIG_TypeName(const swig_type_info *); SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *); SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); +SWIGIMPORT(char *) SWIG_PackData(char *, void *, int); +SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } + #endif + /*********************************************************************** * pyrun.swg for wxPython * @@ -130,9 +135,180 @@ SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); * ************************************************************************/ - #include "Python.h" +#include +#include + +#ifdef __cplusplus +#define SWIG_STATIC_INLINE static inline +#else +#define SWIG_STATIC_INLINE static +#endif + +SWIG_STATIC_INLINE long +SPyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} + +SWIG_STATIC_INLINE unsigned long +SPyObj_AsUnsignedLong(PyObject * obj) +{ + if (PyLong_Check(obj)) { + return PyLong_AsUnsignedLong(obj); + } else { + long i = PyInt_AsLong(obj); + if ( !PyErr_Occurred() && (i < 0)) { + PyErr_SetString(PyExc_TypeError, "negative value for unsigned type"); + } + return i; + } +} + +#if !defined(_MSC_VER) +SWIG_STATIC_INLINE PyObject* +SPyObj_FromLongLong(long long value) +{ + return (value > (long)(LONG_MAX)) ? + PyLong_FromLongLong(value) : PyInt_FromLong((long)value); +} +#endif + +SWIG_STATIC_INLINE PyObject* +SPyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + +#if !defined(_MSC_VER) +SWIG_STATIC_INLINE PyObject* +SPyObj_FromUnsignedLongLong(unsigned long long value) +{ + return (value > (unsigned long long)(LONG_MAX)) ? + PyLong_FromUnsignedLongLong(value) : PyInt_FromLong((long)value); +} +#endif + +SWIG_STATIC_INLINE long +SPyObj_AsLongInRange(PyObject * obj, long min_value, long max_value) +{ + long value = SPyObj_AsLong(obj); + if (!PyErr_Occurred()) { + if (value < min_value) { + PyErr_SetString(PyExc_OverflowError,"value is smaller than type minimum"); + } else if (value > max_value) { + PyErr_SetString(PyExc_OverflowError,"value is greater than type maximum"); + } + } + return value; +} + +SWIG_STATIC_INLINE unsigned long +SPyObj_AsUnsignedLongInRange(PyObject *obj, unsigned long max_value) +{ + unsigned long value = SPyObj_AsUnsignedLong(obj); + if (!PyErr_Occurred()) { + if (value > max_value) { + PyErr_SetString(PyExc_OverflowError,"value is greater than type maximum"); + } + } + return value; +} + +SWIG_STATIC_INLINE signed char +SPyObj_AsSignedChar(PyObject *obj) { + return (signed char)SPyObj_AsLongInRange(obj, SCHAR_MIN, SCHAR_MAX); +} + +SWIG_STATIC_INLINE short +SPyObj_AsShort(PyObject *obj) { + return (short)SPyObj_AsLongInRange(obj, SHRT_MIN, SHRT_MAX); +} + +SWIG_STATIC_INLINE int +SPyObj_AsInt(PyObject *obj) { + return SPyObj_AsLongInRange(obj, INT_MIN, INT_MAX); +} + +SWIG_STATIC_INLINE unsigned char +SPyObj_AsUnsignedChar(PyObject *obj) { + return (unsigned char)SPyObj_AsUnsignedLongInRange(obj, UCHAR_MAX); +} + +SWIG_STATIC_INLINE unsigned short +SPyObj_AsUnsignedShort(PyObject *obj) { + return (unsigned short)SPyObj_AsUnsignedLongInRange(obj, USHRT_MAX); +} + +SWIG_STATIC_INLINE unsigned int +SPyObj_AsUnsignedInt(PyObject *obj) { + return SPyObj_AsUnsignedLongInRange(obj, UINT_MAX); +} + +#if !defined(_MSC_VER) +SWIG_STATIC_INLINE long long +SPyObj_AsLongLong(PyObject *obj) { + return PyInt_Check(obj) ? + PyInt_AsLong(obj) : PyLong_AsLongLong(obj); +} + +SWIG_STATIC_INLINE unsigned long long +SPyObj_AsUnsignedLongLong(PyObject *obj) { + return PyLong_Check(obj) ? + PyLong_AsUnsignedLongLong(obj) : SPyObj_AsUnsignedLong(obj); +} +#endif + +SWIG_STATIC_INLINE double +SPyObj_AsDouble(PyObject *obj) { + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +} + +SWIG_STATIC_INLINE float +SPyObj_AsFloat(PyObject *obj) { + double value = SPyObj_AsDouble(obj); + if (!PyErr_Occurred()) { + if (value < FLT_MIN) { + PyErr_SetString(PyExc_OverflowError,"float is smaller than flt_min"); + } else if (value > FLT_MAX) { + PyErr_SetString(PyExc_OverflowError,"float is greater than flt_max"); + } + } + return (float) value; +} + +SWIG_STATIC_INLINE char +SPyObj_AsChar(PyObject *obj) { + char c = (PyString_Check(obj) && PyString_Size(obj) == 1) ? + PyString_AsString(obj)[0] + : (char) SPyObj_AsLongInRange(obj, CHAR_MIN, CHAR_MAX); + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a char is required"); + } + return c; +} + +SWIG_STATIC_INLINE PyObject * +SPyObj_FromChar(char c) { + return PyString_FromStringAndSize(&c,1); +} + +SWIG_STATIC_INLINE PyObject * +SPyObj_FromCharPtr(const char* cptr) { + return cptr ? PyString_FromString(cptr) : Py_BuildValue((char*)""); +} + +SWIG_STATIC_INLINE int +SPyObj_AsBool(PyObject *obj) { + return SPyObj_AsLong/*Long*/(obj) ? 1 : 0; +} + + + #ifdef __cplusplus extern "C" { #endif @@ -161,8 +337,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 +344,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 +352,26 @@ typedef struct swig_const_info { SWIG_Python_addvarlink(p, name, get_attr, set_attr) #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \ SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) -#define SWIG_PackData(c, ptr, sz) \ - SWIG_Python_PackData(c, ptr, sz) -#define SWIG_UnpackData(c, ptr, sz) \ - SWIG_Python_UnpackData(c, ptr, sz) #define SWIG_NewPackedObj(ptr, sz, type) \ SWIG_Python_NewPackedObj(ptr, sz, type) #define SWIG_InstallConstants(d, constants) \ SWIG_Python_InstallConstants(d, constants) -SWIGEXPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); -SWIGEXPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); -SWIGEXPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); +SWIGIMPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); +SWIGIMPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); +SWIGIMPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); +SWIGIMPORT(PyObject *) SWIG_Python_newvarlink(void); +SWIGIMPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); +SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); +SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); +SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); -SWIGEXPORT(PyObject *) SWIG_Python_newvarlink(void); -SWIGEXPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); -SWIGEXPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); -SWIGEXPORT(char *) SWIG_Python_PackData(char *c, void *, int); -SWIGEXPORT(char *) SWIG_Python_UnpackData(char *c, void *, int); -SWIGEXPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); -SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); /* Contract support */ -#define SWIG_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else - -#define SWIG_inherit_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_inherit_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else - -#define SWIG_invariant(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_begin(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_end(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else +#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else #ifdef __cplusplus } @@ -319,16 +479,13 @@ static swig_type_info *swig_types[83]; #include "wx/wxPython/pyclasses.h" #include "wx/wxPython/pyistream.h" - DECLARE_DEF_STRING(EmptyString); - - + static const wxString wxPyEmptyString(wxEmptyString); - DECLARE_DEF_STRING(FileSelectorPromptStr); - DECLARE_DEF_STRING(FileSelectorDefaultWildcardStr); - DECLARE_DEF_STRING(DirSelectorPromptStr); - + static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); + static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr); + static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; @@ -358,7 +515,11 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { long wxGetFreeMemory() - { PyErr_SetNone(PyExc_NotImplementedError); return 0; } + { wxPyRaiseNotImplemented(); return 0; } + + + bool wxGetKeyState(wxKeyCode key) + { wxPyRaiseNotImplemented(); return False; } void wxWakeUpMainThread() {} @@ -368,7 +529,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { #ifdef WXP_WITH_THREAD return wxThread::IsMain(); #else - return TRUE; + return True; #endif } @@ -437,12 +598,12 @@ void wxDrawWindowOnDC(wxWindow* window, const wxDC& dc, int method) // WM_PRINT. For most native widgets nothing is drawn to the dc // at all, with or without Themes. typedef BOOL (WINAPI *PrintWindow_t)(HWND, HDC, UINT); - static bool s_triedToLoad = false; + static bool s_triedToLoad = False; static PrintWindow_t pfnPrintWindow = NULL; if ( !s_triedToLoad ) { - s_triedToLoad = true; + s_triedToLoad = True; wxDynamicLibrary dllUser32(_T("user32.dll")); if ( dllUser32.IsLoaded() ) { @@ -542,7 +703,8 @@ class wxJoystick : public wxObject { public: wxJoystick(int joystick = wxJOYSTICK1) { wxPyBeginBlockThreads(); - PyErr_SetString(PyExc_NotImplementedError, "wxJoystick is not available on this platform."); + PyErr_SetString(PyExc_NotImplementedError, + "wxJoystick is not available on this platform."); wxPyEndBlockThreads(); } wxPoint GetPosition() { return wxPoint(-1,-1); } @@ -556,7 +718,7 @@ public: int GetMovementThreshold() { return -1; } void SetMovementThreshold(int threshold) {} - bool IsOk(void) { return FALSE; } + bool IsOk(void) { return False; } int GetNumberJoysticks() { return -1; } int GetManufacturerId() { return -1; } int GetProductId() { return -1; } @@ -580,16 +742,16 @@ public: int GetVMin() { return -1; } int GetVMax() { return -1; } - bool HasRudder() { return FALSE; } - bool HasZ() { return FALSE; } - bool HasU() { return FALSE; } - bool HasV() { return FALSE; } - bool HasPOV() { return FALSE; } - bool HasPOV4Dir() { return FALSE; } - bool HasPOVCTS() { return FALSE; } + bool HasRudder() { return False; } + bool HasZ() { return False; } + bool HasU() { return False; } + bool HasV() { return False; } + bool HasPOV() { return False; } + bool HasPOV4Dir() { return False; } + bool HasPOVCTS() { return False; } - bool SetCapture(wxWindow* win, int pollingFreq = 0) { return FALSE; } - bool ReleaseCapture() { return FALSE; } + bool SetCapture(wxWindow* win, int pollingFreq = 0) { return False; } + bool ReleaseCapture() { return False; } }; #endif @@ -602,21 +764,23 @@ public: class wxWave : public wxObject { public: - wxWave(const wxString& fileName, bool isResource = FALSE) { + wxWave(const wxString& fileName, bool isResource = False) { wxPyBeginBlockThreads(); - PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform."); + PyErr_SetString(PyExc_NotImplementedError, + "wxWave is not available on this platform."); wxPyEndBlockThreads(); } wxWave(int size, const wxByte* data) { wxPyBeginBlockThreads(); - PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform."); + PyErr_SetString(PyExc_NotImplementedError, + "wxWave is not available on this platform."); wxPyEndBlockThreads(); } ~wxWave() {} - bool IsOk() const { return FALSE; } - bool Play(bool async = TRUE, bool looped = FALSE) const { return FALSE; } + bool IsOk() const { return False; } + bool Play(bool async = True, bool looped = False) const { return False; } }; #endif @@ -667,7 +831,7 @@ PyObject *wxFileType_GetIconInfo(wxFileType *self){ wxPyBeginBlockThreads(); PyObject* tuple = PyTuple_New(3); PyTuple_SetItem(tuple, 0, wxPyConstructObject(new wxIcon(loc), - wxT("wxIcon"), TRUE)); + wxT("wxIcon"), True)); PyTuple_SetItem(tuple, 1, wx2PyString(iconFile)); PyTuple_SetItem(tuple, 2, PyInt_FromLong(iconIndex)); wxPyEndBlockThreads(); @@ -795,6 +959,7 @@ public: PYPRIVATE; }; +void wxPyArtProvider_Destroy(wxPyArtProvider *self){ delete self; } @@ -856,10 +1021,9 @@ bool wxConfigBase_ReadBool(wxConfigBase *self,wxString const &key,bool defaultVa #include - DECLARE_DEF_STRING2(DateFormatStr, wxT("%c")); - DECLARE_DEF_STRING2(TimeSpanFormatStr, wxT("%H:%M:%S")); - + static const wxString wxPyDateFormatStr(wxT("%c")); + static const wxString wxPyTimeSpanFormatStr(wxT("%H:%M:%S")); #define LOCAL_TZ wxDateTime::Local @@ -948,7 +1112,7 @@ bool wxPyDataObjectSimple::GetDataHere(void *buf) const { // return either a string or None and then act appropriately with the // C++ version. - bool rval = FALSE; + bool rval = False; wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "GetDataHere")) { PyObject* ro; @@ -967,7 +1131,7 @@ bool wxPyDataObjectSimple::GetDataHere(void *buf) const { bool wxPyDataObjectSimple::SetData(size_t len, const void *buf) const{ // For this one we simply need to make a string from buf and len // and send it to the Python method. - bool rval = FALSE; + bool rval = False; wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "SetData")) { PyObject* data = PyString_FromStringAndSize((char*)buf, len); @@ -1026,7 +1190,7 @@ wxBitmap wxPyBitmapDataObject::GetBitmap() const { void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) { wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "SetBitmap")) { - PyObject* bo = wxPyConstructObject((void*)&bitmap, wxT("wxBitmap"), false); + PyObject* bo = wxPyConstructObject((void*)&bitmap, wxT("wxBitmap"), False); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", bo)); Py_DECREF(bo); } @@ -1050,7 +1214,7 @@ bool wxCustomDataObject_SetData(wxCustomDataObject *self,PyObject *data){ else { // raise a TypeError if not a string PyErr_SetString(PyExc_TypeError, "String expected."); - return FALSE; + return False; } } PyObject *wxCustomDataObject_GetData(wxCustomDataObject *self){ @@ -1060,69 +1224,13 @@ PyObject *wxCustomDataObject_GetData(wxCustomDataObject *self){ class wxMetafileDataObject : public wxDataObjectSimple { public: - wxMetafileDataObject() { PyErr_SetNone(PyExc_NotImplementedError); } + wxMetafileDataObject() { wxPyRaiseNotImplemented(); } }; -#include - - -class wxPyDropSource : public wxDropSource { -public: -#ifndef __WXGTK__ - wxPyDropSource(wxWindow *win = NULL, - const wxCursor © = wxNullCursor, - const wxCursor &move = wxNullCursor, - const wxCursor &none = wxNullCursor) - : wxDropSource(win, copy, move, none) {} -#else - wxPyDropSource(wxWindow *win = NULL, - const wxIcon& copy = wxNullIcon, - const wxIcon& move = wxNullIcon, - const wxIcon& none = wxNullIcon) - : wxDropSource(win, copy, move, none) {} -#endif - ~wxPyDropSource() { } - - DEC_PYCALLBACK_BOOL_DR(GiveFeedback); - PYPRIVATE; -}; - IMP_PYCALLBACK_BOOL_DR(wxPyDropSource, wxDropSource, GiveFeedback); - -class wxPyDropTarget : public wxDropTarget { -public: - wxPyDropTarget(wxDataObject *dataObject = NULL) - : wxDropTarget(dataObject) {} - - // called when mouse leaves the window: might be used to remove the - // feedback which was given in OnEnter() - DEC_PYCALLBACK__(OnLeave); - - // called when the mouse enters the window (only once until OnLeave()) - DEC_PYCALLBACK_DR_2WXCDR(OnEnter); - - // called when the mouse moves in the window - shouldn't take long to - // execute or otherwise mouse movement would be too slow - DEC_PYCALLBACK_DR_2WXCDR(OnDragOver); - - // called after OnDrop() returns TRUE: you will usually just call - // GetData() from here and, probably, also refresh something to update the - // new data and, finally, return the code indicating how did the operation - // complete (returning default value in case of success and wxDragError on - // failure is usually ok) - DEC_PYCALLBACK_DR_2WXCDR_pure(OnData); - - // this function is called when data is dropped at position (x, y) - if it - // returns TRUE, OnData() will be called immediately afterwards which will - // allow to retrieve the data dropped. - DEC_PYCALLBACK_BOOL_INTINT(OnDrop); - - PYPRIVATE; -}; - IMP_PYCALLBACK__(wxPyDropTarget, wxDropTarget, OnLeave); IMP_PYCALLBACK_DR_2WXCDR(wxPyDropTarget, wxDropTarget, OnEnter); IMP_PYCALLBACK_DR_2WXCDR(wxPyDropTarget, wxDropTarget, OnDragOver); @@ -1130,7 +1238,6 @@ IMP_PYCALLBACK_DR_2WXCDR_pure(wxPyDropTarget, wxDropTarget, OnData); IMP_PYCALLBACK_BOOL_INTINT(wxPyDropTarget, wxDropTarget, OnDrop); - class wxPyTextDropTarget : public wxTextDropTarget { public: wxPyTextDropTarget() {} @@ -1172,7 +1279,7 @@ public: bool wxPyFileDropTarget::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames) { - bool rval = FALSE; + bool rval = False; wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "OnDropFiles")) { PyObject* list = wxArrayString2PyList_helper(filenames); @@ -1375,8 +1482,8 @@ static PyObject *_wrap_SystemOptions_SetOption(PyObject *self, PyObject *args, P PyObject *resultobj; wxString *arg1 = 0 ; wxString *arg2 = 0 ; - bool temp1 = false ; - bool temp2 = false ; + bool temp1 = False ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -1387,12 +1494,12 @@ static PyObject *_wrap_SystemOptions_SetOption(PyObject *self, PyObject *args, P { 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; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1428,7 +1535,7 @@ static PyObject *_wrap_SystemOptions_SetOptionInt(PyObject *self, PyObject *args PyObject *resultobj; wxString *arg1 = 0 ; int arg2 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "name",(char *) "value", NULL @@ -1438,7 +1545,7 @@ static PyObject *_wrap_SystemOptions_SetOptionInt(PyObject *self, PyObject *args { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1466,7 +1573,7 @@ static PyObject *_wrap_SystemOptions_GetOption(PyObject *self, PyObject *args, P PyObject *resultobj; wxString *arg1 = 0 ; wxString result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "name", NULL @@ -1476,7 +1583,7 @@ static PyObject *_wrap_SystemOptions_GetOption(PyObject *self, PyObject *args, P { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1510,7 +1617,7 @@ static PyObject *_wrap_SystemOptions_GetOptionInt(PyObject *self, PyObject *args PyObject *resultobj; wxString *arg1 = 0 ; int result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "name", NULL @@ -1520,7 +1627,7 @@ static PyObject *_wrap_SystemOptions_GetOptionInt(PyObject *self, PyObject *args { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1548,7 +1655,7 @@ static PyObject *_wrap_SystemOptions_HasOption(PyObject *self, PyObject *args, P PyObject *resultobj; wxString *arg1 = 0 ; bool result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "name", NULL @@ -1558,7 +1665,7 @@ static PyObject *_wrap_SystemOptions_HasOption(PyObject *self, PyObject *args, P { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1589,6 +1696,66 @@ static PyObject * SystemOptions_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static int _wrap_FileSelectorPromptStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable FileSelectorPromptStr is read-only."); + return 1; +} + + +static PyObject *_wrap_FileSelectorPromptStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyFileSelectorPromptStr)->c_str(), (&wxPyFileSelectorPromptStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyFileSelectorPromptStr)->c_str(), (&wxPyFileSelectorPromptStr)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_FileSelectorDefaultWildcardStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable FileSelectorDefaultWildcardStr is read-only."); + return 1; +} + + +static PyObject *_wrap_FileSelectorDefaultWildcardStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyFileSelectorDefaultWildcardStr)->c_str(), (&wxPyFileSelectorDefaultWildcardStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyFileSelectorDefaultWildcardStr)->c_str(), (&wxPyFileSelectorDefaultWildcardStr)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_DirSelectorPromptStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable DirSelectorPromptStr is read-only."); + return 1; +} + + +static PyObject *_wrap_DirSelectorPromptStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyDirSelectorPromptStr)->c_str(), (&wxPyDirSelectorPromptStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyDirSelectorPromptStr)->c_str(), (&wxPyDirSelectorPromptStr)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_NewId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; long result; @@ -1699,7 +1866,7 @@ static PyObject *_wrap_EndBusyCursor(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_GetElapsedTime(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - bool arg1 = (bool) TRUE ; + bool arg1 = (bool) True ; long result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -1708,8 +1875,10 @@ static PyObject *_wrap_GetElapsedTime(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:GetElapsedTime",kwnames,&obj0)) goto fail; if (obj0) { - arg1 = PyInt_AsLong(obj0) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (bool) SPyObj_AsBool(obj0); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -1815,7 +1984,7 @@ static PyObject *_wrap_Shell(PyObject *self, PyObject *args, PyObject *kwargs) { wxString const &arg1_defvalue = wxPyEmptyString ; wxString *arg1 = (wxString *) &arg1_defvalue ; bool result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "command", NULL @@ -1826,7 +1995,7 @@ static PyObject *_wrap_Shell(PyObject *self, PyObject *args, PyObject *kwargs) { { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } } { @@ -2012,8 +2181,10 @@ static PyObject *_wrap_Usleep(PyObject *self, PyObject *args, PyObject *kwargs) }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Usleep",kwnames,&obj0)) goto fail; - arg1 = (unsigned long) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (unsigned long) SPyObj_AsUnsignedLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxUsleep(arg1); @@ -2037,8 +2208,10 @@ static PyObject *_wrap_EnableTopLevelWindows(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EnableTopLevelWindows",kwnames,&obj0)) goto fail; - arg1 = PyInt_AsLong(obj0) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (bool) SPyObj_AsBool(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxEnableTopLevelWindows(arg1); @@ -2057,7 +2230,7 @@ static PyObject *_wrap_StripMenuCodes(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; wxString *arg1 = 0 ; wxString result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "in", NULL @@ -2067,7 +2240,7 @@ static PyObject *_wrap_StripMenuCodes(PyObject *self, PyObject *args, PyObject * { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2270,7 +2443,7 @@ static PyObject *_wrap_GetUserHome(PyObject *self, PyObject *args, PyObject *kwa wxString const &arg1_defvalue = wxPyEmptyString ; wxString *arg1 = (wxString *) &arg1_defvalue ; wxString result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "user", NULL @@ -2281,7 +2454,7 @@ static PyObject *_wrap_GetUserHome(PyObject *self, PyObject *args, PyObject *kwa { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } } { @@ -2327,7 +2500,7 @@ static PyObject *_wrap_GetProcessId(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SPyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -2372,11 +2545,11 @@ static PyObject *_wrap_FileSelector(PyObject *self, PyObject *args, PyObject *kw int arg8 = (int) -1 ; int arg9 = (int) -1 ; wxString result; - bool temp1 = false ; - bool temp2 = false ; - bool temp3 = false ; - bool temp4 = false ; - bool temp5 = false ; + bool temp1 = False ; + bool temp2 = False ; + bool temp3 = False ; + bool temp4 = False ; + bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -2392,35 +2565,35 @@ static PyObject *_wrap_FileSelector(PyObject *self, PyObject *args, PyObject *kw { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } } if (obj1) { { 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 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; - temp5 = true; + temp5 = True; } } if (obj6) { @@ -2494,9 +2667,9 @@ static PyObject *_wrap_LoadFileSelector(PyObject *self, PyObject *args, PyObject wxString *arg3 = (wxString *) &arg3_defvalue ; wxWindow *arg4 = (wxWindow *) NULL ; wxString result; - bool temp1 = false ; - bool temp2 = false ; - bool temp3 = false ; + bool temp1 = False ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -2509,18 +2682,18 @@ static PyObject *_wrap_LoadFileSelector(PyObject *self, PyObject *args, PyObject { 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; } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } if (obj3) { @@ -2578,9 +2751,9 @@ static PyObject *_wrap_SaveFileSelector(PyObject *self, PyObject *args, PyObject wxString *arg3 = (wxString *) &arg3_defvalue ; wxWindow *arg4 = (wxWindow *) NULL ; wxString result; - bool temp1 = false ; - bool temp2 = false ; - bool temp3 = false ; + bool temp1 = False ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -2593,18 +2766,18 @@ static PyObject *_wrap_SaveFileSelector(PyObject *self, PyObject *args, PyObject { 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; } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } if (obj3) { @@ -2665,8 +2838,8 @@ static PyObject *_wrap_DirSelector(PyObject *self, PyObject *args, PyObject *kwa wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxWindow *arg5 = (wxWindow *) NULL ; wxString result; - bool temp1 = false ; - bool temp2 = false ; + bool temp1 = False ; + bool temp2 = False ; wxPoint temp4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -2681,14 +2854,14 @@ static PyObject *_wrap_DirSelector(PyObject *self, PyObject *args, PyObject *kwa { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } } if (obj1) { { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } } if (obj3) { @@ -2746,11 +2919,11 @@ static PyObject *_wrap_GetTextFromUser(PyObject *self, PyObject *args, PyObject wxWindow *arg4 = (wxWindow *) NULL ; int arg5 = (int) -1 ; int arg6 = (int) -1 ; - bool arg7 = (bool) TRUE ; + bool arg7 = (bool) True ; wxString result; - bool temp1 = false ; - bool temp2 = false ; - bool temp3 = false ; + bool temp1 = False ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -2764,28 +2937,30 @@ static PyObject *_wrap_GetTextFromUser(PyObject *self, PyObject *args, PyObject { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } if (obj1) { { 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) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } if (obj6) { - arg7 = PyInt_AsLong(obj6) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg7 = (bool) SPyObj_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2840,9 +3015,9 @@ static PyObject *_wrap_GetPasswordFromUser(PyObject *self, PyObject *args, PyObj wxString *arg3 = (wxString *) &arg3_defvalue ; wxWindow *arg4 = (wxWindow *) NULL ; wxString result; - bool temp1 = false ; - bool temp2 = false ; - bool temp3 = false ; + bool temp1 = False ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -2855,20 +3030,20 @@ static PyObject *_wrap_GetPasswordFromUser(PyObject *self, PyObject *args, PyObj { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } if (obj1) { { 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) { @@ -2927,12 +3102,12 @@ static PyObject *_wrap_GetSingleChoice(PyObject *self, PyObject *args, PyObject wxWindow *arg5 = (wxWindow *) NULL ; int arg6 = (int) -1 ; int arg7 = (int) -1 ; - bool arg8 = (bool) TRUE ; + bool arg8 = (bool) True ; int arg9 = (int) 150 ; int arg10 = (int) 200 ; wxString result; - bool temp1 = false ; - bool temp2 = false ; + bool temp1 = False ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -2946,12 +3121,12 @@ static PyObject *_wrap_GetSingleChoice(PyObject *self, PyObject *args, PyObject { 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 = PyList_Size(obj2); @@ -2962,8 +3137,10 @@ static PyObject *_wrap_GetSingleChoice(PyObject *self, PyObject *args, PyObject if ((SWIG_ConvertPtr(obj3,(void **) &arg5, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } if (obj6) { - arg8 = PyInt_AsLong(obj6) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg8 = (bool) SPyObj_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3016,12 +3193,12 @@ static PyObject *_wrap_GetSingleChoiceIndex(PyObject *self, PyObject *args, PyOb wxWindow *arg5 = (wxWindow *) NULL ; int arg6 = (int) -1 ; int arg7 = (int) -1 ; - bool arg8 = (bool) TRUE ; + bool arg8 = (bool) True ; int arg9 = (int) 150 ; int arg10 = (int) 200 ; int result; - bool temp1 = false ; - bool temp2 = false ; + bool temp1 = False ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -3035,12 +3212,12 @@ static PyObject *_wrap_GetSingleChoiceIndex(PyObject *self, PyObject *args, PyOb { 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 = PyList_Size(obj2); @@ -3051,8 +3228,10 @@ static PyObject *_wrap_GetSingleChoiceIndex(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj3,(void **) &arg5, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } if (obj6) { - arg8 = PyInt_AsLong(obj6) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg8 = (bool) SPyObj_AsBool(obj6); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3100,8 +3279,8 @@ static PyObject *_wrap_MessageBox(PyObject *self, PyObject *args, PyObject *kwar int arg5 = (int) -1 ; int arg6 = (int) -1 ; int result; - bool temp1 = false ; - bool temp2 = false ; + bool temp1 = False ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj3 = 0 ; @@ -3113,13 +3292,13 @@ static PyObject *_wrap_MessageBox(PyObject *self, PyObject *args, PyObject *kwar { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } if (obj1) { { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } } if (obj3) { @@ -3167,9 +3346,9 @@ static PyObject *_wrap_GetNumberFromUser(PyObject *self, PyObject *args, PyObjec wxPoint const &arg8_defvalue = wxDefaultPosition ; wxPoint *arg8 = (wxPoint *) &arg8_defvalue ; long result; - bool temp1 = false ; - bool temp2 = false ; - bool temp3 = false ; + bool temp1 = False ; + bool temp2 = False ; + bool temp3 = False ; wxPoint temp8 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -3184,17 +3363,17 @@ static PyObject *_wrap_GetNumberFromUser(PyObject *self, PyObject *args, PyObjec { 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 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj6) { if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -3672,6 +3851,29 @@ static PyObject *_wrap_GetTopLevelParent(PyObject *self, PyObject *args, PyObjec } +static PyObject *_wrap_GetKeyState(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 ; + bool result; + char *kwnames[] = { + (char *) "key", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:GetKeyState",kwnames,&arg1)) goto fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)wxGetKeyState((wxKeyCode )arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = PyInt_FromLong((long)result); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_WakeUpMainThread(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; char *kwnames[] = { @@ -3814,7 +4016,7 @@ static PyObject *_wrap_new_ToolTip(PyObject *self, PyObject *args, PyObject *kwa PyObject *resultobj; wxString *arg1 = 0 ; wxToolTip *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "tip", NULL @@ -3824,7 +4026,7 @@ static PyObject *_wrap_new_ToolTip(PyObject *self, PyObject *args, PyObject *kwa { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3854,7 +4056,7 @@ static PyObject *_wrap_ToolTip_SetTip(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; wxToolTip *arg1 = (wxToolTip *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -3866,7 +4068,7 @@ static PyObject *_wrap_ToolTip_SetTip(PyObject *self, PyObject *args, PyObject * { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3957,8 +4159,10 @@ static PyObject *_wrap_ToolTip_Enable(PyObject *self, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ToolTip_Enable",kwnames,&obj0)) goto fail; - arg1 = PyInt_AsLong(obj0) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (bool) SPyObj_AsBool(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxToolTip::Enable(arg1); @@ -4108,6 +4312,35 @@ static PyObject *_wrap_Caret_IsVisible(PyObject *self, PyObject *args, PyObject } +static PyObject *_wrap_Caret_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxCaret *arg1 = (wxCaret *) 0 ; + wxPoint result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Caret_GetPosition",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCaret,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->GetPosition(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxPoint * resultptr; + resultptr = new wxPoint((wxPoint &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Caret_GetPositionTuple(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCaret *arg1 = (wxCaret *) 0 ; @@ -4146,28 +4379,28 @@ static PyObject *_wrap_Caret_GetPositionTuple(PyObject *self, PyObject *args, Py } -static PyObject *_wrap_Caret_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Caret_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCaret *arg1 = (wxCaret *) 0 ; - wxPoint result; + wxSize result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Caret_GetPosition",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Caret_GetSize",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCaret,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetPosition(); + result = (arg1)->GetSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } { - wxPoint * resultptr; - resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + wxSize * resultptr; + resultptr = new wxSize((wxSize &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); } return resultobj; fail: @@ -4213,35 +4446,6 @@ static PyObject *_wrap_Caret_GetSizeTuple(PyObject *self, PyObject *args, PyObje } -static PyObject *_wrap_Caret_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxCaret *arg1 = (wxCaret *) 0 ; - wxSize result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Caret_GetSize",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCaret,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetSize(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - wxSize * resultptr; - resultptr = new wxSize((wxSize &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxSize, 1); - } - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_Caret_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCaret *arg1 = (wxCaret *) 0 ; @@ -4386,7 +4590,7 @@ static PyObject *_wrap_Caret_SetSize(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_Caret_Show(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCaret *arg1 = (wxCaret *) 0 ; - int arg2 = (int) TRUE ; + int arg2 = (int) True ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self",(char *) "show", NULL @@ -4603,7 +4807,7 @@ static PyObject *_wrap_new_BusyInfo(PyObject *self, PyObject *args, PyObject *kw PyObject *resultobj; wxString *arg1 = 0 ; wxBusyInfo *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "message", NULL @@ -4613,7 +4817,7 @@ static PyObject *_wrap_new_BusyInfo(PyObject *self, PyObject *args, PyObject *kw { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4846,7 +5050,7 @@ static PyObject *_wrap_FileHistory_AddFileToHistory(PyObject *self, PyObject *ar PyObject *resultobj; wxFileHistory *arg1 = (wxFileHistory *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -4858,7 +5062,7 @@ static PyObject *_wrap_FileHistory_AddFileToHistory(PyObject *self, PyObject *ar { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5167,8 +5371,8 @@ static PyObject *_wrap_new_SingleInstanceChecker(PyObject *self, PyObject *args, wxString const &arg2_defvalue = wxPyEmptyString ; wxString *arg2 = (wxString *) &arg2_defvalue ; wxSingleInstanceChecker *result; - bool temp1 = false ; - bool temp2 = false ; + bool temp1 = False ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5179,13 +5383,13 @@ static PyObject *_wrap_new_SingleInstanceChecker(PyObject *self, PyObject *args, { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } if (obj1) { { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } } { @@ -5271,8 +5475,8 @@ static PyObject *_wrap_SingleInstanceChecker_Create(PyObject *self, PyObject *ar wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; bool result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -5285,13 +5489,13 @@ static PyObject *_wrap_SingleInstanceChecker_Create(PyObject *self, PyObject *ar { 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; } } { @@ -5460,7 +5664,7 @@ static PyObject *_wrap_TipProvider_GetCurrentTip(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SPyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -5472,7 +5676,7 @@ static PyObject *_wrap_TipProvider_PreprocessTip(PyObject *self, PyObject *args, wxTipProvider *arg1 = (wxTipProvider *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5484,7 +5688,7 @@ static PyObject *_wrap_TipProvider_PreprocessTip(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5531,8 +5735,10 @@ static PyObject *_wrap_new_PyTipProvider(PyObject *self, PyObject *args, PyObjec }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PyTipProvider",kwnames,&obj0)) goto fail; - arg1 = (size_t) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (size_t) SPyObj_AsUnsignedLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyTipProvider *)new wxPyTipProvider(arg1); @@ -5588,7 +5794,7 @@ static PyObject *_wrap_ShowTip(PyObject *self, PyObject *args, PyObject *kwargs) PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxTipProvider *arg2 = (wxTipProvider *) 0 ; - bool arg3 = (bool) TRUE ; + bool arg3 = (bool) True ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -5601,8 +5807,10 @@ static PyObject *_wrap_ShowTip(PyObject *self, PyObject *args, PyObject *kwargs) if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTipProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (bool) SPyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5623,7 +5831,7 @@ static PyObject *_wrap_CreateFileTipProvider(PyObject *self, PyObject *args, PyO wxString *arg1 = 0 ; size_t arg2 ; wxTipProvider *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -5634,10 +5842,12 @@ static PyObject *_wrap_CreateFileTipProvider(PyObject *self, PyObject *args, PyO { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; + } + { + arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; } - arg2 = (size_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxTipProvider *)wxCreateFileTipProvider((wxString const &)*arg1,arg2); @@ -5712,23 +5922,25 @@ static PyObject *_wrap_delete_Timer(PyObject *self, PyObject *args, PyObject *kw } -static PyObject *_wrap_Timer_SetOwner(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Timer__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTimer *arg1 = (wxPyTimer *) 0 ; - wxEvtHandler *arg2 = (wxEvtHandler *) 0 ; - int arg3 = (int) -1 ; + PyObject *arg2 = (PyObject *) 0 ; + PyObject *arg3 = (PyObject *) 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "owner",(char *) "id", NULL + (char *) "self",(char *) "self",(char *) "_class", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Timer_SetOwner",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Timer__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTimer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + arg2 = obj1; + arg3 = obj2; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetOwner(arg2,arg3); + (arg1)->_setCallbackInfo(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -5740,63 +5952,69 @@ static PyObject *_wrap_Timer_SetOwner(PyObject *self, PyObject *args, PyObject * } -static PyObject *_wrap_Timer_Start(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Timer_SetOwner(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTimer *arg1 = (wxPyTimer *) 0 ; - int arg2 = (int) -1 ; - bool arg3 = (bool) FALSE ; - bool result; + wxEvtHandler *arg2 = (wxEvtHandler *) 0 ; + int arg3 = (int) -1 ; PyObject * obj0 = 0 ; - PyObject * obj2 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "milliseconds",(char *) "oneShot", NULL + (char *) "self",(char *) "owner",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:Timer_Start",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Timer_SetOwner",kwnames,&obj0,&obj1,&arg3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTimer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; - } + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxEvtHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Start(arg2,arg3); + (arg1)->SetOwner(arg2,arg3); 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_Timer_Stop(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Timer_Start(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTimer *arg1 = (wxPyTimer *) 0 ; + int arg2 = (int) -1 ; + bool arg3 = (bool) False ; + bool result; PyObject * obj0 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "milliseconds",(char *) "oneShot", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Timer_Stop",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iO:Timer_Start",kwnames,&obj0,&arg2,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTimer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (bool) SPyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Stop(); + result = (bool)(arg1)->Start(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + resultobj = PyInt_FromLong((long)result); return resultobj; fail: return NULL; } -static PyObject *_wrap_Timer_Notify(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Timer_Stop(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTimer *arg1 = (wxPyTimer *) 0 ; PyObject * obj0 = 0 ; @@ -5804,11 +6022,11 @@ static PyObject *_wrap_Timer_Notify(PyObject *self, PyObject *args, PyObject *kw (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Timer_Notify",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Timer_Stop",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTimer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Notify(); + (arg1)->Stop(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -5895,6 +6113,31 @@ static PyObject *_wrap_Timer_IsOneShot(PyObject *self, PyObject *args, PyObject } +static PyObject *_wrap_Timer_GetId(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyTimer *arg1 = (wxPyTimer *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Timer_GetId",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTimer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxPyTimer const *)arg1)->GetId(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = PyInt_FromLong((long)result); + return resultobj; + fail: + return NULL; +} + + static PyObject * Timer_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -5987,7 +6230,7 @@ static PyObject *_wrap_new_TimerRunner__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; wxTimer *arg1 = 0 ; int arg2 ; - bool arg3 = (bool) FALSE ; + bool arg3 = (bool) False ; wxTimerRunner *result; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; @@ -5998,8 +6241,10 @@ static PyObject *_wrap_new_TimerRunner__SWIG_1(PyObject *self, PyObject *args) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (bool) SPyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6052,14 +6297,26 @@ static PyObject *_wrap_new_TimerRunner(PyObject *self, PyObject *args) { } if (_v) { { - _v = (PyInt_Check(argv[1]) || PyLong_Check(argv[1])) ? 1 : 0; + SPyObj_AsInt(argv[1]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } } if (_v) { if (argc <= 2) { return _wrap_new_TimerRunner__SWIG_1(self,args); } { - _v = (PyInt_Check(argv[2]) || PyLong_Check(argv[2])) ? 1 : 0; + SPyObj_AsBool(argv[2]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } } if (_v) { return _wrap_new_TimerRunner__SWIG_1(self,args); @@ -6101,7 +6358,7 @@ static PyObject *_wrap_TimerRunner_Start(PyObject *self, PyObject *args, PyObjec PyObject *resultobj; wxTimerRunner *arg1 = (wxTimerRunner *) 0 ; int arg2 ; - bool arg3 = (bool) FALSE ; + bool arg3 = (bool) False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { @@ -6111,8 +6368,10 @@ static PyObject *_wrap_TimerRunner_Start(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:TimerRunner_Start",kwnames,&obj0,&arg2,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTimerRunner,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (bool) SPyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6181,7 +6440,7 @@ static PyObject *_wrap_Log_IsEnabled(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_Log_EnableLogging(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - bool arg1 = (bool) TRUE ; + bool arg1 = (bool) True ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -6190,8 +6449,10 @@ static PyObject *_wrap_Log_EnableLogging(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Log_EnableLogging",kwnames,&obj0)) goto fail; if (obj0) { - arg1 = PyInt_AsLong(obj0) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (bool) SPyObj_AsBool(obj0); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6220,11 +6481,15 @@ static PyObject *_wrap_Log_OnLog(PyObject *self, PyObject *args, PyObject *kwarg }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Log_OnLog",kwnames,&obj0,&obj1,&obj2)) goto fail; - arg1 = (wxLogLevel) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (wxLogLevel) SPyObj_AsUnsignedLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxChar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg3 = (time_t) PyInt_AsLong(obj2); - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (time_t) SPyObj_AsUnsignedInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxLog::OnLog(arg1,(wxChar const *)arg2,arg3); @@ -6375,7 +6640,7 @@ static PyObject *_wrap_Log_Resume(PyObject *self, PyObject *args, PyObject *kwar static PyObject *_wrap_Log_SetVerbose(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - bool arg1 = (bool) TRUE ; + bool arg1 = (bool) True ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "bVerbose", NULL @@ -6383,8 +6648,10 @@ static PyObject *_wrap_Log_SetVerbose(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Log_SetVerbose",kwnames,&obj0)) goto fail; if (obj0) { - arg1 = PyInt_AsLong(obj0) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (bool) SPyObj_AsBool(obj0); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6409,8 +6676,10 @@ static PyObject *_wrap_Log_SetLogLevel(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Log_SetLogLevel",kwnames,&obj0)) goto fail; - arg1 = (wxLogLevel) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (wxLogLevel) SPyObj_AsUnsignedLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxLog::SetLogLevel(arg1); @@ -6455,8 +6724,10 @@ static PyObject *_wrap_Log_SetTraceMask(PyObject *self, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Log_SetTraceMask",kwnames,&obj0)) goto fail; - arg1 = (wxTraceMask) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (wxTraceMask) SPyObj_AsUnsignedLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxLog::SetTraceMask(arg1); @@ -6474,7 +6745,7 @@ static PyObject *_wrap_Log_SetTraceMask(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_Log_AddTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "str", NULL @@ -6484,7 +6755,7 @@ static PyObject *_wrap_Log_AddTraceMask(PyObject *self, PyObject *args, PyObject { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6511,7 +6782,7 @@ static PyObject *_wrap_Log_AddTraceMask(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_Log_RemoveTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "str", NULL @@ -6521,7 +6792,7 @@ static PyObject *_wrap_Log_RemoveTraceMask(PyObject *self, PyObject *args, PyObj { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6654,7 +6925,7 @@ static PyObject *_wrap_Log_GetTraceMask(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SPyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -6701,7 +6972,7 @@ static PyObject *_wrap_Log_GetLogLevel(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SPyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -6883,10 +7154,10 @@ static PyObject *_wrap_new_LogWindow(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxFrame *arg1 = (wxFrame *) 0 ; wxString *arg2 = 0 ; - bool arg3 = (bool) TRUE ; - bool arg4 = (bool) TRUE ; + bool arg3 = (bool) True ; + bool arg4 = (bool) True ; wxLogWindow *result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -6900,15 +7171,19 @@ static PyObject *_wrap_new_LogWindow(PyObject *self, PyObject *args, PyObject *k { 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) SPyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } if (obj3) { - arg4 = PyInt_AsLong(obj3) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg4 = (bool) SPyObj_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -6935,7 +7210,7 @@ static PyObject *_wrap_new_LogWindow(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_LogWindow_Show(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxLogWindow *arg1 = (wxLogWindow *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -6945,8 +7220,10 @@ static PyObject *_wrap_LogWindow_Show(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:LogWindow_Show",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLogWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SPyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7051,8 +7328,10 @@ static PyObject *_wrap_LogWindow_PassMessages(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogWindow_PassMessages",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLogWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SPyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PassMessages(arg2); @@ -7138,8 +7417,10 @@ static PyObject *_wrap_LogChain_PassMessages(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogChain_PassMessages",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLogChain,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SPyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PassMessages(arg2); @@ -7226,7 +7507,7 @@ static PyObject *_wrap_SysErrorCode(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SPyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -7244,8 +7525,10 @@ static PyObject *_wrap_SysErrorMsg(PyObject *self, PyObject *args, PyObject *kwa if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:SysErrorMsg",kwnames,&obj0)) goto fail; if (obj0) { - arg1 = (unsigned long) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (unsigned long) SPyObj_AsUnsignedLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7270,7 +7553,7 @@ static PyObject *_wrap_SysErrorMsg(PyObject *self, PyObject *args, PyObject *kwa static PyObject *_wrap_LogFatalError(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "msg", NULL @@ -7280,7 +7563,7 @@ static PyObject *_wrap_LogFatalError(PyObject *self, PyObject *args, PyObject *k { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7307,7 +7590,7 @@ static PyObject *_wrap_LogFatalError(PyObject *self, PyObject *args, PyObject *k static PyObject *_wrap_LogError(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "msg", NULL @@ -7317,7 +7600,7 @@ static PyObject *_wrap_LogError(PyObject *self, PyObject *args, PyObject *kwargs { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7344,7 +7627,7 @@ static PyObject *_wrap_LogError(PyObject *self, PyObject *args, PyObject *kwargs static PyObject *_wrap_LogWarning(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "msg", NULL @@ -7354,7 +7637,7 @@ static PyObject *_wrap_LogWarning(PyObject *self, PyObject *args, PyObject *kwar { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7381,7 +7664,7 @@ static PyObject *_wrap_LogWarning(PyObject *self, PyObject *args, PyObject *kwar static PyObject *_wrap_LogMessage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "msg", NULL @@ -7391,7 +7674,7 @@ static PyObject *_wrap_LogMessage(PyObject *self, PyObject *args, PyObject *kwar { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7418,7 +7701,7 @@ static PyObject *_wrap_LogMessage(PyObject *self, PyObject *args, PyObject *kwar static PyObject *_wrap_LogInfo(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "msg", NULL @@ -7428,7 +7711,7 @@ static PyObject *_wrap_LogInfo(PyObject *self, PyObject *args, PyObject *kwargs) { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7455,7 +7738,7 @@ static PyObject *_wrap_LogInfo(PyObject *self, PyObject *args, PyObject *kwargs) static PyObject *_wrap_LogDebug(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "msg", NULL @@ -7465,7 +7748,7 @@ static PyObject *_wrap_LogDebug(PyObject *self, PyObject *args, PyObject *kwargs { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7492,7 +7775,7 @@ static PyObject *_wrap_LogDebug(PyObject *self, PyObject *args, PyObject *kwargs static PyObject *_wrap_LogVerbose(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "msg", NULL @@ -7502,7 +7785,7 @@ static PyObject *_wrap_LogVerbose(PyObject *self, PyObject *args, PyObject *kwar { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7529,7 +7812,7 @@ static PyObject *_wrap_LogVerbose(PyObject *self, PyObject *args, PyObject *kwar static PyObject *_wrap_LogStatus(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "msg", NULL @@ -7539,7 +7822,7 @@ static PyObject *_wrap_LogStatus(PyObject *self, PyObject *args, PyObject *kwarg { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7567,7 +7850,7 @@ static PyObject *_wrap_LogStatusFrame(PyObject *self, PyObject *args, PyObject * PyObject *resultobj; wxFrame *arg1 = (wxFrame *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7579,7 +7862,7 @@ static PyObject *_wrap_LogStatusFrame(PyObject *self, PyObject *args, PyObject * { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7606,7 +7889,7 @@ static PyObject *_wrap_LogStatusFrame(PyObject *self, PyObject *args, PyObject * static PyObject *_wrap_LogSysError(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "msg", NULL @@ -7616,7 +7899,7 @@ static PyObject *_wrap_LogSysError(PyObject *self, PyObject *args, PyObject *kwa { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7640,65 +7923,65 @@ static PyObject *_wrap_LogSysError(PyObject *self, PyObject *args, PyObject *kwa } -static PyObject *_wrap_LogTrace(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_LogTrace__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; - wxString *arg1 = 0 ; - bool temp1 = false ; + unsigned long arg1 ; + wxString *arg2 = 0 ; + bool temp2 = False ; PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "msg", NULL - }; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LogTrace",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:LogTrace",&obj0,&obj1)) goto fail; { - arg1 = wxString_in_helper(obj0); - if (arg1 == NULL) SWIG_fail; - temp1 = true; + arg1 = (unsigned long) SPyObj_AsUnsignedLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxLogTrace((wxString const &)*arg1); + wxLogTrace(arg1,(wxString const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; { - if (temp1) - delete arg1; + if (temp2) + delete arg2; } return resultobj; fail: { - if (temp1) - delete arg1; + if (temp2) + delete arg2; } return NULL; } -static PyObject *_wrap_LogTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_LogTrace__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; wxString *arg1 = 0 ; wxString *arg2 = 0 ; - bool temp1 = false ; - bool temp2 = false ; + bool temp1 = False ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "mask",(char *) "msg", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogTraceMask",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:LogTrace",&obj0,&obj1)) goto fail; { 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; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7730,11 +8013,78 @@ static PyObject *_wrap_LogTraceMask(PyObject *self, PyObject *args, PyObject *kw } +static PyObject *_wrap_LogTrace(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_wxString, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + void *ptr; + if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxString, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_LogTrace__SWIG_1(self,args); + } + } + } + if (argc == 2) { + int _v; + { + SPyObj_AsUnsignedLong(argv[0]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + void *ptr; + if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxString, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_LogTrace__SWIG_0(self,args); + } + } + } + + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'LogTrace'"); + return NULL; +} + + static PyObject *_wrap_LogGeneric(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; unsigned long arg1 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7742,12 +8092,14 @@ static PyObject *_wrap_LogGeneric(PyObject *self, PyObject *args, PyObject *kwar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogGeneric",kwnames,&obj0,&obj1)) goto fail; - arg1 = (unsigned long) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (unsigned long) SPyObj_AsUnsignedLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7775,8 +8127,8 @@ static PyObject *_wrap_SafeShowMessage(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxString *arg1 = 0 ; wxString *arg2 = 0 ; - bool temp1 = false ; - bool temp2 = false ; + bool temp1 = False ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7787,12 +8139,12 @@ static PyObject *_wrap_SafeShowMessage(PyObject *self, PyObject *args, PyObject { 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; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7988,7 +8340,7 @@ static PyObject *_wrap_Process_Open(PyObject *self, PyObject *args, PyObject *kw wxString *arg1 = 0 ; int arg2 = (int) wxEXEC_ASYNC ; wxPyProcess *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "cmd",(char *) "flags", NULL @@ -7998,7 +8350,7 @@ static PyObject *_wrap_Process_Open(PyObject *self, PyObject *args, PyObject *kw { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -8203,7 +8555,7 @@ static PyObject *_wrap_Process_GetInputStream(PyObject *self, PyObject *args, Py if (result) { _ptr = new wxPyInputStream(result); } - resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), true); + resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), True); } return resultobj; fail: @@ -8235,7 +8587,7 @@ static PyObject *_wrap_Process_GetErrorStream(PyObject *self, PyObject *args, Py if (result) { _ptr = new wxPyInputStream(result); } - resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), true); + resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), True); } return resultobj; fail: @@ -8542,7 +8894,7 @@ static PyObject *_wrap_Execute(PyObject *self, PyObject *args, PyObject *kwargs) int arg2 = (int) wxEXEC_ASYNC ; wxPyProcess *arg3 = (wxPyProcess *) NULL ; long result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { @@ -8553,7 +8905,7 @@ static PyObject *_wrap_Execute(PyObject *self, PyObject *args, PyObject *kwargs) { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } if (obj2) { if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyProcess,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -10349,9 +10701,9 @@ static PyObject * JoystickEvent_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_Wave(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; wxWave *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10362,11 +10714,13 @@ static PyObject *_wrap_new_Wave(PyObject *self, PyObject *args, PyObject *kwargs { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SPyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10394,7 +10748,7 @@ static PyObject *_wrap_new_WaveData(PyObject *self, PyObject *args, PyObject *kw PyObject *resultobj; wxString *arg1 = 0 ; wxWave *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "data", NULL @@ -10404,7 +10758,7 @@ static PyObject *_wrap_new_WaveData(PyObject *self, PyObject *args, PyObject *kw { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10480,8 +10834,8 @@ static PyObject *_wrap_Wave_IsOk(PyObject *self, PyObject *args, PyObject *kwarg static PyObject *_wrap_Wave_Play(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWave *arg1 = (wxWave *) 0 ; - bool arg2 = (bool) TRUE ; - bool arg3 = (bool) FALSE ; + bool arg2 = (bool) True ; + bool arg3 = (bool) False ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -10493,16 +10847,20 @@ static PyObject *_wrap_Wave_Play(PyObject *self, PyObject *args, PyObject *kwarg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Wave_Play",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWave,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SPyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (bool) SPyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxWave const *)arg1)->Play(arg2,arg3); + result = (bool)(arg1)->Play(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -10528,10 +10886,10 @@ static PyObject *_wrap_new_FileTypeInfo(PyObject *self, PyObject *args, PyObject wxString *arg3 = 0 ; wxString *arg4 = 0 ; wxFileTypeInfo *result; - bool temp1 = false ; - bool temp2 = false ; - bool temp3 = false ; - bool temp4 = false ; + bool temp1 = False ; + bool temp2 = False ; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -10544,22 +10902,22 @@ static PyObject *_wrap_new_FileTypeInfo(PyObject *self, PyObject *args, PyObject { 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 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10708,7 +11066,7 @@ static PyObject *_wrap_FileTypeInfo_SetIcon(PyObject *self, PyObject *args, PyOb wxFileTypeInfo *arg1 = (wxFileTypeInfo *) 0 ; wxString *arg2 = 0 ; int arg3 = (int) 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10720,7 +11078,7 @@ static PyObject *_wrap_FileTypeInfo_SetIcon(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10748,7 +11106,7 @@ static PyObject *_wrap_FileTypeInfo_SetShortDesc(PyObject *self, PyObject *args, PyObject *resultobj; wxFileTypeInfo *arg1 = (wxFileTypeInfo *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10760,7 +11118,7 @@ static PyObject *_wrap_FileTypeInfo_SetShortDesc(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10805,7 +11163,13 @@ static PyObject *_wrap_FileTypeInfo_GetMimeType(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; @@ -10833,7 +11197,13 @@ static PyObject *_wrap_FileTypeInfo_GetOpenCommand(PyObject *self, PyObject *arg 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; @@ -10861,7 +11231,13 @@ static PyObject *_wrap_FileTypeInfo_GetPrintCommand(PyObject *self, PyObject *ar 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; @@ -10889,7 +11265,13 @@ static PyObject *_wrap_FileTypeInfo_GetShortDesc(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; @@ -10917,7 +11299,13 @@ static PyObject *_wrap_FileTypeInfo_GetDescription(PyObject *self, PyObject *arg 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; @@ -11000,7 +11388,13 @@ static PyObject *_wrap_FileTypeInfo_GetIconFile(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; @@ -11248,8 +11642,8 @@ static PyObject *_wrap_FileType_GetOpenCommand(PyObject *self, PyObject *args, P wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; PyObject *result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11262,13 +11656,13 @@ static PyObject *_wrap_FileType_GetOpenCommand(PyObject *self, PyObject *args, P { 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; } } { @@ -11308,8 +11702,8 @@ static PyObject *_wrap_FileType_GetPrintCommand(PyObject *self, PyObject *args, wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; PyObject *result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11322,13 +11716,13 @@ static PyObject *_wrap_FileType_GetPrintCommand(PyObject *self, PyObject *args, { 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; } } { @@ -11368,8 +11762,8 @@ static PyObject *_wrap_FileType_GetAllCommands(PyObject *self, PyObject *args, P wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; PyObject *result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11382,13 +11776,13 @@ static PyObject *_wrap_FileType_GetAllCommands(PyObject *self, PyObject *args, P { 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; } } { @@ -11426,10 +11820,10 @@ static PyObject *_wrap_FileType_SetCommand(PyObject *self, PyObject *args, PyObj wxFileType *arg1 = (wxFileType *) 0 ; wxString *arg2 = 0 ; wxString *arg3 = 0 ; - bool arg4 = (bool) TRUE ; + bool arg4 = (bool) True ; bool result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11443,16 +11837,18 @@ static PyObject *_wrap_FileType_SetCommand(PyObject *self, PyObject *args, PyObj { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { 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) SPyObj_AsBool(obj3); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11491,7 +11887,7 @@ static PyObject *_wrap_FileType_SetDefaultIcon(PyObject *self, PyObject *args, P wxString *arg2 = (wxString *) &arg2_defvalue ; int arg3 = (int) 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -11504,7 +11900,7 @@ static PyObject *_wrap_FileType_SetDefaultIcon(PyObject *self, PyObject *args, P { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } } { @@ -11561,9 +11957,9 @@ static PyObject *_wrap_FileType_ExpandCommand(PyObject *self, PyObject *args, Py wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; wxString result; - bool temp1 = false ; - bool temp2 = false ; - bool temp3 = false ; + bool temp1 = False ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11575,18 +11971,18 @@ static PyObject *_wrap_FileType_ExpandCommand(PyObject *self, PyObject *args, Py { 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; } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } { @@ -11659,8 +12055,8 @@ static PyObject *_wrap_MimeTypesManager_IsOfType(PyObject *self, PyObject *args, wxString *arg1 = 0 ; wxString *arg2 = 0 ; bool result; - bool temp1 = false ; - bool temp2 = false ; + bool temp1 = False ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -11671,12 +12067,12 @@ static PyObject *_wrap_MimeTypesManager_IsOfType(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; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11736,7 +12132,7 @@ static PyObject *_wrap_MimeTypesManager_Initialize(PyObject *self, PyObject *arg int arg2 = (int) wxMAILCAP_ALL ; wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { @@ -11749,7 +12145,7 @@ static PyObject *_wrap_MimeTypesManager_Initialize(PyObject *self, PyObject *arg { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } { @@ -11803,7 +12199,7 @@ static PyObject *_wrap_MimeTypesManager_GetFileTypeFromExtension(PyObject *self, wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ; wxString *arg2 = 0 ; wxFileType *result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -11815,7 +12211,7 @@ static PyObject *_wrap_MimeTypesManager_GetFileTypeFromExtension(PyObject *self, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11844,7 +12240,7 @@ static PyObject *_wrap_MimeTypesManager_GetFileTypeFromMimeType(PyObject *self, wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ; wxString *arg2 = 0 ; wxFileType *result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -11856,7 +12252,7 @@ static PyObject *_wrap_MimeTypesManager_GetFileTypeFromMimeType(PyObject *self, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11884,9 +12280,9 @@ static PyObject *_wrap_MimeTypesManager_ReadMailcap(PyObject *self, PyObject *ar PyObject *resultobj; wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ; wxString *arg2 = 0 ; - bool arg3 = (bool) FALSE ; + bool arg3 = (bool) False ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11899,11 +12295,13 @@ static PyObject *_wrap_MimeTypesManager_ReadMailcap(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) SPyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11932,7 +12330,7 @@ static PyObject *_wrap_MimeTypesManager_ReadMimeTypes(PyObject *self, PyObject * wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -11944,7 +12342,7 @@ static PyObject *_wrap_MimeTypesManager_ReadMimeTypes(PyObject *self, PyObject * { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12895,30 +13293,6 @@ static PyObject *_wrap_new_ArtProvider(PyObject *self, PyObject *args, PyObject } -static PyObject *_wrap_delete_ArtProvider(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ArtProvider",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyArtProvider,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_ArtProvider__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ; @@ -13028,8 +13402,8 @@ static PyObject *_wrap_ArtProvider_GetBitmap(PyObject *self, PyObject *args, PyO wxSize const &arg3_defvalue = wxDefaultSize ; wxSize *arg3 = (wxSize *) &arg3_defvalue ; wxBitmap result; - bool temp1 = false ; - bool temp2 = false ; + bool temp1 = False ; + bool temp2 = False ; wxSize temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -13042,13 +13416,13 @@ static PyObject *_wrap_ArtProvider_GetBitmap(PyObject *self, PyObject *args, PyO { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } if (obj1) { { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } } if (obj2) { @@ -13099,8 +13473,8 @@ static PyObject *_wrap_ArtProvider_GetIcon(PyObject *self, PyObject *args, PyObj wxSize const &arg3_defvalue = wxDefaultSize ; wxSize *arg3 = (wxSize *) &arg3_defvalue ; wxIcon result; - bool temp1 = false ; - bool temp2 = false ; + bool temp1 = False ; + bool temp2 = False ; wxSize temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -13113,13 +13487,13 @@ static PyObject *_wrap_ArtProvider_GetIcon(PyObject *self, PyObject *args, PyObj { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } if (obj1) { { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } } if (obj2) { @@ -13162,6 +13536,30 @@ static PyObject *_wrap_ArtProvider_GetIcon(PyObject *self, PyObject *args, PyObj } +static PyObject *_wrap_ArtProvider_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_Destroy",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyArtProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPyArtProvider_Destroy(arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject * ArtProvider_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -13220,7 +13618,7 @@ static PyObject *_wrap_ConfigBase_Set(PyObject *self, PyObject *args, PyObject * static PyObject *_wrap_ConfigBase_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - bool arg1 = (bool) TRUE ; + bool arg1 = (bool) True ; wxConfigBase *result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -13229,8 +13627,10 @@ static PyObject *_wrap_ConfigBase_Get(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:ConfigBase_Get",kwnames,&obj0)) goto fail; if (obj0) { - arg1 = PyInt_AsLong(obj0) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (bool) SPyObj_AsBool(obj0); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13293,7 +13693,7 @@ static PyObject *_wrap_ConfigBase_SetPath(PyObject *self, PyObject *args, PyObje PyObject *resultobj; wxConfigBase *arg1 = (wxConfigBase *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -13305,7 +13705,7 @@ static PyObject *_wrap_ConfigBase_SetPath(PyObject *self, PyObject *args, PyObje { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13350,7 +13750,13 @@ static PyObject *_wrap_ConfigBase_GetPath(PyObject *self, PyObject *args, PyObje 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; @@ -13462,7 +13868,7 @@ static PyObject *_wrap_ConfigBase_GetNextEntry(PyObject *self, PyObject *args, P static PyObject *_wrap_ConfigBase_GetNumberOfEntries(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxConfigBase *arg1 = (wxConfigBase *) 0 ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; size_t result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -13473,8 +13879,10 @@ static PyObject *_wrap_ConfigBase_GetNumberOfEntries(PyObject *self, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ConfigBase_GetNumberOfEntries",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SPyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13483,7 +13891,7 @@ static PyObject *_wrap_ConfigBase_GetNumberOfEntries(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SPyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -13493,7 +13901,7 @@ static PyObject *_wrap_ConfigBase_GetNumberOfEntries(PyObject *self, PyObject *a static PyObject *_wrap_ConfigBase_GetNumberOfGroups(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxConfigBase *arg1 = (wxConfigBase *) 0 ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; size_t result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -13504,8 +13912,10 @@ static PyObject *_wrap_ConfigBase_GetNumberOfGroups(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ConfigBase_GetNumberOfGroups",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SPyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13514,7 +13924,7 @@ static PyObject *_wrap_ConfigBase_GetNumberOfGroups(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SPyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -13526,7 +13936,7 @@ static PyObject *_wrap_ConfigBase_HasGroup(PyObject *self, PyObject *args, PyObj wxConfigBase *arg1 = (wxConfigBase *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -13538,7 +13948,7 @@ static PyObject *_wrap_ConfigBase_HasGroup(PyObject *self, PyObject *args, PyObj { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13567,7 +13977,7 @@ static PyObject *_wrap_ConfigBase_HasEntry(PyObject *self, PyObject *args, PyObj wxConfigBase *arg1 = (wxConfigBase *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -13579,7 +13989,7 @@ static PyObject *_wrap_ConfigBase_HasEntry(PyObject *self, PyObject *args, PyObj { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13608,7 +14018,7 @@ static PyObject *_wrap_ConfigBase_Exists(PyObject *self, PyObject *args, PyObjec wxConfigBase *arg1 = (wxConfigBase *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -13620,7 +14030,7 @@ static PyObject *_wrap_ConfigBase_Exists(PyObject *self, PyObject *args, PyObjec { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13649,7 +14059,7 @@ static PyObject *_wrap_ConfigBase_GetEntryType(PyObject *self, PyObject *args, P wxConfigBase *arg1 = (wxConfigBase *) 0 ; wxString *arg2 = 0 ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -13661,7 +14071,7 @@ static PyObject *_wrap_ConfigBase_GetEntryType(PyObject *self, PyObject *args, P { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13692,8 +14102,8 @@ static PyObject *_wrap_ConfigBase_Read(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 ; @@ -13706,13 +14116,13 @@ static PyObject *_wrap_ConfigBase_Read(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; } } { @@ -13757,7 +14167,7 @@ static PyObject *_wrap_ConfigBase_ReadInt(PyObject *self, PyObject *args, PyObje wxString *arg2 = 0 ; long arg3 = (long) 0 ; long result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -13769,7 +14179,7 @@ static PyObject *_wrap_ConfigBase_ReadInt(PyObject *self, PyObject *args, PyObje { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13799,7 +14209,7 @@ static PyObject *_wrap_ConfigBase_ReadFloat(PyObject *self, PyObject *args, PyOb wxString *arg2 = 0 ; double arg3 = (double) 0.0 ; double result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -13811,7 +14221,7 @@ static PyObject *_wrap_ConfigBase_ReadFloat(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13839,9 +14249,9 @@ static PyObject *_wrap_ConfigBase_ReadBool(PyObject *self, PyObject *args, PyObj PyObject *resultobj; wxConfigBase *arg1 = (wxConfigBase *) 0 ; wxString *arg2 = 0 ; - bool arg3 = (bool) FALSE ; + bool arg3 = (bool) False ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -13854,11 +14264,13 @@ static PyObject *_wrap_ConfigBase_ReadBool(PyObject *self, PyObject *args, PyObj { 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) SPyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13888,8 +14300,8 @@ static PyObject *_wrap_ConfigBase_Write(PyObject *self, PyObject *args, PyObject wxString *arg2 = 0 ; wxString *arg3 = 0 ; bool result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -13902,12 +14314,12 @@ static PyObject *_wrap_ConfigBase_Write(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13945,7 +14357,7 @@ static PyObject *_wrap_ConfigBase_WriteInt(PyObject *self, PyObject *args, PyObj wxString *arg2 = 0 ; long arg3 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -13957,7 +14369,7 @@ static PyObject *_wrap_ConfigBase_WriteInt(PyObject *self, PyObject *args, PyObj { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -13987,7 +14399,7 @@ static PyObject *_wrap_ConfigBase_WriteFloat(PyObject *self, PyObject *args, PyO wxString *arg2 = 0 ; double arg3 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -13999,7 +14411,7 @@ static PyObject *_wrap_ConfigBase_WriteFloat(PyObject *self, PyObject *args, PyO { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14029,7 +14441,7 @@ static PyObject *_wrap_ConfigBase_WriteBool(PyObject *self, PyObject *args, PyOb wxString *arg2 = 0 ; bool arg3 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -14042,10 +14454,12 @@ static PyObject *_wrap_ConfigBase_WriteBool(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + { + arg3 = (bool) SPyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Write((wxString const &)*arg2,arg3); @@ -14071,7 +14485,7 @@ static PyObject *_wrap_ConfigBase_WriteBool(PyObject *self, PyObject *args, PyOb static PyObject *_wrap_ConfigBase_Flush(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxConfigBase *arg1 = (wxConfigBase *) 0 ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -14082,8 +14496,10 @@ static PyObject *_wrap_ConfigBase_Flush(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ConfigBase_Flush",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SPyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14105,8 +14521,8 @@ static PyObject *_wrap_ConfigBase_RenameEntry(PyObject *self, PyObject *args, Py wxString *arg2 = 0 ; wxString *arg3 = 0 ; bool result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -14119,12 +14535,12 @@ static PyObject *_wrap_ConfigBase_RenameEntry(PyObject *self, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14162,8 +14578,8 @@ static PyObject *_wrap_ConfigBase_RenameGroup(PyObject *self, PyObject *args, Py wxString *arg2 = 0 ; wxString *arg3 = 0 ; bool result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -14176,12 +14592,12 @@ static PyObject *_wrap_ConfigBase_RenameGroup(PyObject *self, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14217,9 +14633,9 @@ static PyObject *_wrap_ConfigBase_DeleteEntry(PyObject *self, PyObject *args, Py PyObject *resultobj; wxConfigBase *arg1 = (wxConfigBase *) 0 ; wxString *arg2 = 0 ; - bool arg3 = (bool) TRUE ; + bool arg3 = (bool) True ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -14232,11 +14648,13 @@ static PyObject *_wrap_ConfigBase_DeleteEntry(PyObject *self, PyObject *args, Py { 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) SPyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14265,7 +14683,7 @@ static PyObject *_wrap_ConfigBase_DeleteGroup(PyObject *self, PyObject *args, Py wxConfigBase *arg1 = (wxConfigBase *) 0 ; wxString *arg2 = 0 ; bool result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -14277,7 +14695,7 @@ static PyObject *_wrap_ConfigBase_DeleteGroup(PyObject *self, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14354,7 +14772,7 @@ static PyObject *_wrap_ConfigBase_IsExpandingEnvVars(PyObject *self, PyObject *a static PyObject *_wrap_ConfigBase_SetExpandEnvVars(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxConfigBase *arg1 = (wxConfigBase *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -14364,8 +14782,10 @@ static PyObject *_wrap_ConfigBase_SetExpandEnvVars(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ConfigBase_SetExpandEnvVars",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SPyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14384,7 +14804,7 @@ static PyObject *_wrap_ConfigBase_SetExpandEnvVars(PyObject *self, PyObject *arg static PyObject *_wrap_ConfigBase_SetRecordDefaults(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxConfigBase *arg1 = (wxConfigBase *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -14394,8 +14814,10 @@ static PyObject *_wrap_ConfigBase_SetRecordDefaults(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ConfigBase_SetRecordDefaults",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SPyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14441,7 +14863,7 @@ static PyObject *_wrap_ConfigBase_ExpandEnvVars(PyObject *self, PyObject *args, wxConfigBase *arg1 = (wxConfigBase *) 0 ; wxString *arg2 = 0 ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -14453,7 +14875,7 @@ static PyObject *_wrap_ConfigBase_ExpandEnvVars(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14549,7 +14971,7 @@ static PyObject *_wrap_ConfigBase_SetAppName(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxConfigBase *arg1 = (wxConfigBase *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -14561,7 +14983,7 @@ static PyObject *_wrap_ConfigBase_SetAppName(PyObject *self, PyObject *args, PyO { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14589,7 +15011,7 @@ static PyObject *_wrap_ConfigBase_SetVendorName(PyObject *self, PyObject *args, PyObject *resultobj; wxConfigBase *arg1 = (wxConfigBase *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -14601,7 +15023,7 @@ static PyObject *_wrap_ConfigBase_SetVendorName(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14687,7 +15109,7 @@ static PyObject *_wrap_new_ConfigPathChanger(PyObject *self, PyObject *args, PyO wxConfigBase *arg1 = (wxConfigBase *) 0 ; wxString *arg2 = 0 ; wxConfigPathChanger *result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -14699,7 +15121,7 @@ static PyObject *_wrap_new_ConfigPathChanger(PyObject *self, PyObject *args, PyO { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -14768,7 +15190,13 @@ static PyObject *_wrap_ConfigPathChanger_Name(PyObject *self, PyObject *args, Py 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; @@ -14794,10 +15222,10 @@ static PyObject *_wrap_new_Config(PyObject *self, PyObject *args, PyObject *kwar wxString *arg4 = (wxString *) &arg4_defvalue ; long arg5 = (long) 0 ; wxConfig *result; - bool temp1 = false ; - bool temp2 = false ; - bool temp3 = false ; - bool temp4 = false ; + bool temp1 = False ; + bool temp2 = False ; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -14811,28 +15239,28 @@ static PyObject *_wrap_new_Config(PyObject *self, PyObject *args, PyObject *kwar { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } } if (obj1) { { 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; } } { @@ -14924,10 +15352,10 @@ static PyObject *_wrap_new_FileConfig(PyObject *self, PyObject *args, PyObject * wxString *arg4 = (wxString *) &arg4_defvalue ; long arg5 = (long) 0 ; wxFileConfig *result; - bool temp1 = false ; - bool temp2 = false ; - bool temp3 = false ; - bool temp4 = false ; + bool temp1 = False ; + bool temp2 = False ; + bool temp3 = False ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -14941,28 +15369,28 @@ static PyObject *_wrap_new_FileConfig(PyObject *self, PyObject *args, PyObject * { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } } if (obj1) { { 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; } } { @@ -15046,7 +15474,7 @@ static PyObject *_wrap_ExpandEnvVars(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxString *arg1 = 0 ; wxString result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "sz", NULL @@ -15056,7 +15484,7 @@ static PyObject *_wrap_ExpandEnvVars(PyObject *self, PyObject *args, PyObject *k { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15086,6 +15514,46 @@ static PyObject *_wrap_ExpandEnvVars(PyObject *self, PyObject *args, PyObject *k } +static int _wrap_DateFormatStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable DateFormatStr is read-only."); + return 1; +} + + +static PyObject *_wrap_DateFormatStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyDateFormatStr)->c_str(), (&wxPyDateFormatStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyDateFormatStr)->c_str(), (&wxPyDateFormatStr)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_TimeSpanFormatStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable TimeSpanFormatStr is read-only."); + return 1; +} + + +static PyObject *_wrap_TimeSpanFormatStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyTimeSpanFormatStr)->c_str(), (&wxPyTimeSpanFormatStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyTimeSpanFormatStr)->c_str(), (&wxPyTimeSpanFormatStr)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_DateTime_SetCountry(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 ; @@ -15273,7 +15741,7 @@ static PyObject *_wrap_DateTime_GetNumberOfDaysinYear(PyObject *self, PyObject * PyObject *resultobj; int arg1 ; int arg2 = (int) wxDateTime::Gregorian ; - wxDateTime::wxDateTime_t result; + int result; char *kwnames[] = { (char *) "year",(char *) "cal", NULL }; @@ -15281,7 +15749,7 @@ static PyObject *_wrap_DateTime_GetNumberOfDaysinYear(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|i:DateTime_GetNumberOfDaysinYear",kwnames,&arg1,&arg2)) goto fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDateTime::wxDateTime_t)wxDateTime::GetNumberOfDays(arg1,(wxDateTime::Calendar )arg2); + result = (int)wxDateTime::GetNumberOfDays(arg1,(wxDateTime::Calendar )arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -15298,7 +15766,7 @@ static PyObject *_wrap_DateTime_GetNumberOfDaysInMonth(PyObject *self, PyObject int arg1 ; int arg2 = (int) wxDateTime::Inv_Year ; int arg3 = (int) wxDateTime::Gregorian ; - wxDateTime::wxDateTime_t result; + int result; char *kwnames[] = { (char *) "month",(char *) "year",(char *) "cal", NULL }; @@ -15306,7 +15774,7 @@ static PyObject *_wrap_DateTime_GetNumberOfDaysInMonth(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|ii:DateTime_GetNumberOfDaysInMonth",kwnames,&arg1,&arg2,&arg3)) goto fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDateTime::wxDateTime_t)wxDateTime::GetNumberOfDays((wxDateTime::Month )arg1,arg2,(wxDateTime::Calendar )arg3); + result = (int)wxDateTime::GetNumberOfDays((wxDateTime::Month )arg1,arg2,(wxDateTime::Calendar )arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -15382,6 +15850,8 @@ static PyObject *_wrap_DateTime_GetAmPmStrings(PyObject *self, PyObject *args, P PyObject *resultobj; wxString *arg1 = (wxString *) 0 ; wxString *arg2 = (wxString *) 0 ; + bool temp1 = False ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -15389,8 +15859,16 @@ static PyObject *_wrap_DateTime_GetAmPmStrings(PyObject *self, PyObject *args, P }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_GetAmPmStrings",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = True; + } + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); wxDateTime::GetAmPmStrings(arg1,arg2); @@ -15399,8 +15877,24 @@ static PyObject *_wrap_DateTime_GetAmPmStrings(PyObject *self, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + if (temp1) + delete arg1; + } + { + if (temp2) + delete arg2; + } return resultobj; fail: + { + if (temp1) + delete arg1; + } + { + if (temp2) + delete arg2; + } return NULL; } @@ -15595,8 +16089,10 @@ static PyObject *_wrap_new_DateTimeFromTimeT(PyObject *self, PyObject *args, PyO }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_DateTimeFromTimeT",kwnames,&obj0)) goto fail; - arg1 = (time_t) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; + { + arg1 = (time_t) SPyObj_AsUnsignedInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDateTime *)new wxDateTime(arg1); @@ -15636,34 +16132,16 @@ static PyObject *_wrap_new_DateTimeFromJDN(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_new_DateTimeFromHMS(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxDateTime::wxDateTime_t arg1 ; - wxDateTime::wxDateTime_t arg2 = (wxDateTime::wxDateTime_t) 0 ; - wxDateTime::wxDateTime_t arg3 = (wxDateTime::wxDateTime_t) 0 ; - wxDateTime::wxDateTime_t arg4 = (wxDateTime::wxDateTime_t) 0 ; + int arg1 ; + int arg2 = (int) 0 ; + int arg3 = (int) 0 ; + int arg4 = (int) 0 ; wxDateTime *result; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "hour",(char *) "minute",(char *) "second",(char *) "millisec", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:new_DateTimeFromHMS",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - arg1 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; - if (obj1) { - arg2 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj2) { - arg3 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj3) { - arg4 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj3); - if (PyErr_Occurred()) SWIG_fail; - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|iii:new_DateTimeFromHMS",kwnames,&arg1,&arg2,&arg3,&arg4)) goto fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDateTime *)new wxDateTime(arg1,arg2,arg3,arg4); @@ -15680,42 +16158,19 @@ static PyObject *_wrap_new_DateTimeFromHMS(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_new_DateTimeFromDMY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxDateTime::wxDateTime_t arg1 ; + int arg1 ; int arg2 = (int) wxDateTime::Inv_Month ; int arg3 = (int) wxDateTime::Inv_Year ; - wxDateTime::wxDateTime_t arg4 = (wxDateTime::wxDateTime_t) 0 ; - wxDateTime::wxDateTime_t arg5 = (wxDateTime::wxDateTime_t) 0 ; - wxDateTime::wxDateTime_t arg6 = (wxDateTime::wxDateTime_t) 0 ; - wxDateTime::wxDateTime_t arg7 = (wxDateTime::wxDateTime_t) 0 ; + int arg4 = (int) 0 ; + int arg5 = (int) 0 ; + int arg6 = (int) 0 ; + int arg7 = (int) 0 ; wxDateTime *result; - PyObject * obj0 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - PyObject * obj5 = 0 ; - PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "day",(char *) "month",(char *) "year",(char *) "hour",(char *) "minute",(char *) "second",(char *) "millisec", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iiOOOO:new_DateTimeFromDMY",kwnames,&obj0,&arg2,&arg3,&obj3,&obj4,&obj5,&obj6)) goto fail; - arg1 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; - if (obj3) { - arg4 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj4) { - arg5 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj5) { - arg6 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj5); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj6) { - arg7 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj6); - if (PyErr_Occurred()) SWIG_fail; - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i|iiiiii:new_DateTimeFromDMY",kwnames,&arg1,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7)) goto fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxDateTime *)new wxDateTime(arg1,(wxDateTime::Month )arg2,arg3,arg4,arg5,arg6,arg7); @@ -15795,8 +16250,10 @@ static PyObject *_wrap_DateTime_SetTimeT(PyObject *self, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetTimeT",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (time_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (time_t) SPyObj_AsUnsignedInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -15846,36 +16303,18 @@ static PyObject *_wrap_DateTime_SetJDN(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_DateTime_SetHMS(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime::wxDateTime_t arg2 ; - wxDateTime::wxDateTime_t arg3 = (wxDateTime::wxDateTime_t) 0 ; - wxDateTime::wxDateTime_t arg4 = (wxDateTime::wxDateTime_t) 0 ; - wxDateTime::wxDateTime_t arg5 = (wxDateTime::wxDateTime_t) 0 ; + int arg2 ; + int arg3 = (int) 0 ; + int arg4 = (int) 0 ; + int arg5 = (int) 0 ; wxDateTime *result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "hour",(char *) "minute",(char *) "second",(char *) "millisec", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:DateTime_SetHMS",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|iii:DateTime_SetHMS",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; - if (obj2) { - arg3 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj3) { - arg4 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj4) { - arg5 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj4); - if (PyErr_Occurred()) SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -15896,44 +16335,21 @@ static PyObject *_wrap_DateTime_SetHMS(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_DateTime_Set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime::wxDateTime_t arg2 ; + int arg2 ; int arg3 = (int) wxDateTime::Inv_Month ; int arg4 = (int) wxDateTime::Inv_Year ; - wxDateTime::wxDateTime_t arg5 = (wxDateTime::wxDateTime_t) 0 ; - wxDateTime::wxDateTime_t arg6 = (wxDateTime::wxDateTime_t) 0 ; - wxDateTime::wxDateTime_t arg7 = (wxDateTime::wxDateTime_t) 0 ; - wxDateTime::wxDateTime_t arg8 = (wxDateTime::wxDateTime_t) 0 ; + int arg5 = (int) 0 ; + int arg6 = (int) 0 ; + int arg7 = (int) 0 ; + int arg8 = (int) 0 ; wxDateTime *result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj4 = 0 ; - PyObject * obj5 = 0 ; - PyObject * obj6 = 0 ; - PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "self",(char *) "day",(char *) "month",(char *) "year",(char *) "hour",(char *) "minute",(char *) "second",(char *) "millisec", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iiOOOO:DateTime_Set",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4,&obj5,&obj6,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|iiiiii:DateTime_Set",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; - if (obj4) { - arg5 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj4); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj5) { - arg6 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj5); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj6) { - arg7 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj6); - if (PyErr_Occurred()) SWIG_fail; - } - if (obj7) { - arg8 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj7); - if (PyErr_Occurred()) SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16040,18 +16456,15 @@ static PyObject *_wrap_DateTime_SetMonth(PyObject *self, PyObject *args, PyObjec static PyObject *_wrap_DateTime_SetDay(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime::wxDateTime_t arg2 ; + int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "day", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetDay",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetDay",kwnames,&obj0,&arg2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16072,18 +16485,15 @@ static PyObject *_wrap_DateTime_SetDay(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_DateTime_SetHour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime::wxDateTime_t arg2 ; + int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "hour", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetHour",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetHour",kwnames,&obj0,&arg2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16104,18 +16514,15 @@ static PyObject *_wrap_DateTime_SetHour(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_DateTime_SetMinute(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime::wxDateTime_t arg2 ; + int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "minute", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetMinute",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetMinute",kwnames,&obj0,&arg2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16136,18 +16543,15 @@ static PyObject *_wrap_DateTime_SetMinute(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_DateTime_SetSecond(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime::wxDateTime_t arg2 ; + int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "second", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetSecond",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetSecond",kwnames,&obj0,&arg2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16168,18 +16572,15 @@ static PyObject *_wrap_DateTime_SetSecond(PyObject *self, PyObject *args, PyObje static PyObject *_wrap_DateTime_SetMillisecond(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime::wxDateTime_t arg2 ; + int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "millisecond", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetMillisecond",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetMillisecond",kwnames,&obj0,&arg2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16468,20 +16869,17 @@ static PyObject *_wrap_DateTime_GetLastWeekDay(PyObject *self, PyObject *args, P static PyObject *_wrap_DateTime_SetToTheWeek(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime::wxDateTime_t arg2 ; + int arg2 ; int arg3 = (int) wxDateTime::Mon ; int arg4 = (int) wxDateTime::Monday_First ; bool result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "numWeek",(char *) "weekday",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|ii:DateTime_SetToTheWeek",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:DateTime_SetToTheWeek",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetToTheWeek(arg2,(wxDateTime::WeekDay )arg3,(wxDateTime::WeekFlags )arg4); @@ -16499,20 +16897,17 @@ static PyObject *_wrap_DateTime_SetToTheWeek(PyObject *self, PyObject *args, PyO static PyObject *_wrap_DateTime_GetWeek(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime::wxDateTime_t arg2 ; + int arg2 ; int arg3 = (int) wxDateTime::Mon ; int arg4 = (int) wxDateTime::Monday_First ; wxDateTime result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "numWeek",(char *) "weekday",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|ii:DateTime_GetWeek",kwnames,&obj0,&obj1,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:DateTime_GetWeek",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetWeek(arg2,(wxDateTime::WeekDay )arg3,(wxDateTime::WeekFlags )arg4); @@ -16595,18 +16990,15 @@ static PyObject *_wrap_DateTime_GetLastMonthDay(PyObject *self, PyObject *args, static PyObject *_wrap_DateTime_SetToYearDay(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime::wxDateTime_t arg2 ; + int arg2 ; wxDateTime *result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "yday", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetToYearDay",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_SetToYearDay",kwnames,&obj0,&arg2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); { @@ -16627,18 +17019,15 @@ static PyObject *_wrap_DateTime_SetToYearDay(PyObject *self, PyObject *args, PyO static PyObject *_wrap_DateTime_GetYearDay(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxDateTime::wxDateTime_t arg2 ; + int arg2 ; wxDateTime result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "yday", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_GetYearDay",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:DateTime_GetYearDay",kwnames,&obj0,&arg2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (wxDateTime::wxDateTime_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetYearDay(arg2); @@ -16786,8 +17175,9 @@ static PyObject *_wrap_DateTime_ToTimezone(PyObject *self, PyObject *args, PyObj PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; wxDateTime::TimeZone *arg2 = 0 ; - bool arg3 = (bool) FALSE ; + bool arg3 = (bool) False ; wxDateTime result; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -16799,10 +17189,13 @@ static PyObject *_wrap_DateTime_ToTimezone(PyObject *self, PyObject *args, PyObj if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj1)); + temp2 = True; } if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (bool) SPyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16817,12 +17210,12 @@ static PyObject *_wrap_DateTime_ToTimezone(PyObject *self, PyObject *args, PyObj resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxDateTime, 1); } { - if (arg2) delete arg2; + if (temp2) delete arg2; } return resultobj; fail: { - if (arg2) delete arg2; + if (temp2) delete arg2; } return NULL; } @@ -16832,8 +17225,9 @@ static PyObject *_wrap_DateTime_MakeTimezone(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; wxDateTime::TimeZone *arg2 = 0 ; - bool arg3 = (bool) FALSE ; + bool arg3 = (bool) False ; wxDateTime *result; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -16845,10 +17239,13 @@ static PyObject *_wrap_DateTime_MakeTimezone(PyObject *self, PyObject *args, PyO if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj1)); + temp2 = True; } if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (bool) SPyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16862,12 +17259,12 @@ static PyObject *_wrap_DateTime_MakeTimezone(PyObject *self, PyObject *args, PyO } resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxDateTime, 0); { - if (arg2) delete arg2; + if (temp2) delete arg2; } return resultobj; fail: { - if (arg2) delete arg2; + if (temp2) delete arg2; } return NULL; } @@ -16876,7 +17273,7 @@ static PyObject *_wrap_DateTime_MakeTimezone(PyObject *self, PyObject *args, PyO static PyObject *_wrap_DateTime_ToGMT(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; wxDateTime result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -16887,8 +17284,10 @@ static PyObject *_wrap_DateTime_ToGMT(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DateTime_ToGMT",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SPyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16911,7 +17310,7 @@ static PyObject *_wrap_DateTime_ToGMT(PyObject *self, PyObject *args, PyObject * static PyObject *_wrap_DateTime_MakeGMT(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; wxDateTime *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -16922,8 +17321,10 @@ static PyObject *_wrap_DateTime_MakeGMT(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DateTime_MakeGMT",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SPyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -17011,7 +17412,7 @@ static PyObject *_wrap_DateTime_GetTicks(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SPyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -17024,6 +17425,7 @@ static PyObject *_wrap_DateTime_GetYear(PyObject *self, PyObject *args, PyObject wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ; wxDateTime::TimeZone *arg2 = (wxDateTime::TimeZone *) &arg2_defvalue ; int result; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17035,6 +17437,7 @@ static PyObject *_wrap_DateTime_GetYear(PyObject *self, PyObject *args, PyObject if (obj1) { { arg2 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj1)); + temp2 = True; } } { @@ -17046,12 +17449,12 @@ static PyObject *_wrap_DateTime_GetYear(PyObject *self, PyObject *args, PyObject } resultobj = PyInt_FromLong((long)result); { - if (arg2) delete arg2; + if (temp2) delete arg2; } return resultobj; fail: { - if (arg2) delete arg2; + if (temp2) delete arg2; } return NULL; } @@ -17063,6 +17466,7 @@ static PyObject *_wrap_DateTime_GetMonth(PyObject *self, PyObject *args, PyObjec wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ; wxDateTime::TimeZone *arg2 = (wxDateTime::TimeZone *) &arg2_defvalue ; int result; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17074,6 +17478,7 @@ static PyObject *_wrap_DateTime_GetMonth(PyObject *self, PyObject *args, PyObjec if (obj1) { { arg2 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj1)); + temp2 = True; } } { @@ -17085,12 +17490,12 @@ static PyObject *_wrap_DateTime_GetMonth(PyObject *self, PyObject *args, PyObjec } resultobj = PyInt_FromLong((long)result); { - if (arg2) delete arg2; + if (temp2) delete arg2; } return resultobj; fail: { - if (arg2) delete arg2; + if (temp2) delete arg2; } return NULL; } @@ -17101,7 +17506,8 @@ static PyObject *_wrap_DateTime_GetDay(PyObject *self, PyObject *args, PyObject wxDateTime *arg1 = (wxDateTime *) 0 ; wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ; wxDateTime::TimeZone *arg2 = (wxDateTime::TimeZone *) &arg2_defvalue ; - wxDateTime::wxDateTime_t result; + int result; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17113,23 +17519,24 @@ static PyObject *_wrap_DateTime_GetDay(PyObject *self, PyObject *args, PyObject if (obj1) { { arg2 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj1)); + temp2 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDateTime::wxDateTime_t)((wxDateTime const *)arg1)->GetDay((wxDateTime::TimeZone const &)*arg2); + result = (int)((wxDateTime const *)arg1)->GetDay((wxDateTime::TimeZone const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = PyInt_FromLong((long)result); { - if (arg2) delete arg2; + if (temp2) delete arg2; } return resultobj; fail: { - if (arg2) delete arg2; + if (temp2) delete arg2; } return NULL; } @@ -17141,6 +17548,7 @@ static PyObject *_wrap_DateTime_GetWeekDay(PyObject *self, PyObject *args, PyObj wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ; wxDateTime::TimeZone *arg2 = (wxDateTime::TimeZone *) &arg2_defvalue ; int result; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17152,6 +17560,7 @@ static PyObject *_wrap_DateTime_GetWeekDay(PyObject *self, PyObject *args, PyObj if (obj1) { { arg2 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj1)); + temp2 = True; } } { @@ -17163,12 +17572,12 @@ static PyObject *_wrap_DateTime_GetWeekDay(PyObject *self, PyObject *args, PyObj } resultobj = PyInt_FromLong((long)result); { - if (arg2) delete arg2; + if (temp2) delete arg2; } return resultobj; fail: { - if (arg2) delete arg2; + if (temp2) delete arg2; } return NULL; } @@ -17179,7 +17588,8 @@ static PyObject *_wrap_DateTime_GetHour(PyObject *self, PyObject *args, PyObject wxDateTime *arg1 = (wxDateTime *) 0 ; wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ; wxDateTime::TimeZone *arg2 = (wxDateTime::TimeZone *) &arg2_defvalue ; - wxDateTime::wxDateTime_t result; + int result; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17191,23 +17601,24 @@ static PyObject *_wrap_DateTime_GetHour(PyObject *self, PyObject *args, PyObject if (obj1) { { arg2 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj1)); + temp2 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDateTime::wxDateTime_t)((wxDateTime const *)arg1)->GetHour((wxDateTime::TimeZone const &)*arg2); + result = (int)((wxDateTime const *)arg1)->GetHour((wxDateTime::TimeZone const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = PyInt_FromLong((long)result); { - if (arg2) delete arg2; + if (temp2) delete arg2; } return resultobj; fail: { - if (arg2) delete arg2; + if (temp2) delete arg2; } return NULL; } @@ -17218,7 +17629,8 @@ static PyObject *_wrap_DateTime_GetMinute(PyObject *self, PyObject *args, PyObje wxDateTime *arg1 = (wxDateTime *) 0 ; wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ; wxDateTime::TimeZone *arg2 = (wxDateTime::TimeZone *) &arg2_defvalue ; - wxDateTime::wxDateTime_t result; + int result; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17230,23 +17642,24 @@ static PyObject *_wrap_DateTime_GetMinute(PyObject *self, PyObject *args, PyObje if (obj1) { { arg2 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj1)); + temp2 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDateTime::wxDateTime_t)((wxDateTime const *)arg1)->GetMinute((wxDateTime::TimeZone const &)*arg2); + result = (int)((wxDateTime const *)arg1)->GetMinute((wxDateTime::TimeZone const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = PyInt_FromLong((long)result); { - if (arg2) delete arg2; + if (temp2) delete arg2; } return resultobj; fail: { - if (arg2) delete arg2; + if (temp2) delete arg2; } return NULL; } @@ -17257,7 +17670,8 @@ static PyObject *_wrap_DateTime_GetSecond(PyObject *self, PyObject *args, PyObje wxDateTime *arg1 = (wxDateTime *) 0 ; wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ; wxDateTime::TimeZone *arg2 = (wxDateTime::TimeZone *) &arg2_defvalue ; - wxDateTime::wxDateTime_t result; + int result; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17269,23 +17683,24 @@ static PyObject *_wrap_DateTime_GetSecond(PyObject *self, PyObject *args, PyObje if (obj1) { { arg2 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj1)); + temp2 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDateTime::wxDateTime_t)((wxDateTime const *)arg1)->GetSecond((wxDateTime::TimeZone const &)*arg2); + result = (int)((wxDateTime const *)arg1)->GetSecond((wxDateTime::TimeZone const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = PyInt_FromLong((long)result); { - if (arg2) delete arg2; + if (temp2) delete arg2; } return resultobj; fail: { - if (arg2) delete arg2; + if (temp2) delete arg2; } return NULL; } @@ -17296,7 +17711,8 @@ static PyObject *_wrap_DateTime_GetMillisecond(PyObject *self, PyObject *args, P wxDateTime *arg1 = (wxDateTime *) 0 ; wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ; wxDateTime::TimeZone *arg2 = (wxDateTime::TimeZone *) &arg2_defvalue ; - wxDateTime::wxDateTime_t result; + int result; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17308,23 +17724,24 @@ static PyObject *_wrap_DateTime_GetMillisecond(PyObject *self, PyObject *args, P if (obj1) { { arg2 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj1)); + temp2 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDateTime::wxDateTime_t)((wxDateTime const *)arg1)->GetMillisecond((wxDateTime::TimeZone const &)*arg2); + result = (int)((wxDateTime const *)arg1)->GetMillisecond((wxDateTime::TimeZone const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = PyInt_FromLong((long)result); { - if (arg2) delete arg2; + if (temp2) delete arg2; } return resultobj; fail: { - if (arg2) delete arg2; + if (temp2) delete arg2; } return NULL; } @@ -17335,7 +17752,8 @@ static PyObject *_wrap_DateTime_GetDayOfYear(PyObject *self, PyObject *args, PyO wxDateTime *arg1 = (wxDateTime *) 0 ; wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ; wxDateTime::TimeZone *arg2 = (wxDateTime::TimeZone *) &arg2_defvalue ; - wxDateTime::wxDateTime_t result; + int result; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -17347,23 +17765,24 @@ static PyObject *_wrap_DateTime_GetDayOfYear(PyObject *self, PyObject *args, PyO if (obj1) { { arg2 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj1)); + temp2 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDateTime::wxDateTime_t)((wxDateTime const *)arg1)->GetDayOfYear((wxDateTime::TimeZone const &)*arg2); + result = (int)((wxDateTime const *)arg1)->GetDayOfYear((wxDateTime::TimeZone const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = PyInt_FromLong((long)result); { - if (arg2) delete arg2; + if (temp2) delete arg2; } return resultobj; fail: { - if (arg2) delete arg2; + if (temp2) delete arg2; } return NULL; } @@ -17375,7 +17794,8 @@ static PyObject *_wrap_DateTime_GetWeekOfYear(PyObject *self, PyObject *args, Py int arg2 = (int) wxDateTime::Monday_First ; wxDateTime::TimeZone const &arg3_defvalue = LOCAL_TZ ; wxDateTime::TimeZone *arg3 = (wxDateTime::TimeZone *) &arg3_defvalue ; - wxDateTime::wxDateTime_t result; + int result; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { @@ -17387,23 +17807,24 @@ static PyObject *_wrap_DateTime_GetWeekOfYear(PyObject *self, PyObject *args, Py if (obj2) { { arg3 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj2)); + temp3 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDateTime::wxDateTime_t)((wxDateTime const *)arg1)->GetWeekOfYear((wxDateTime::WeekFlags )arg2,(wxDateTime::TimeZone const &)*arg3); + result = (int)((wxDateTime const *)arg1)->GetWeekOfYear((wxDateTime::WeekFlags )arg2,(wxDateTime::TimeZone const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = PyInt_FromLong((long)result); { - if (arg3) delete arg3; + if (temp3) delete arg3; } return resultobj; fail: { - if (arg3) delete arg3; + if (temp3) delete arg3; } return NULL; } @@ -17415,7 +17836,8 @@ static PyObject *_wrap_DateTime_GetWeekOfMonth(PyObject *self, PyObject *args, P int arg2 = (int) wxDateTime::Monday_First ; wxDateTime::TimeZone const &arg3_defvalue = LOCAL_TZ ; wxDateTime::TimeZone *arg3 = (wxDateTime::TimeZone *) &arg3_defvalue ; - wxDateTime::wxDateTime_t result; + int result; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { @@ -17427,23 +17849,24 @@ static PyObject *_wrap_DateTime_GetWeekOfMonth(PyObject *self, PyObject *args, P if (obj2) { { arg3 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj2)); + temp3 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDateTime::wxDateTime_t)((wxDateTime const *)arg1)->GetWeekOfMonth((wxDateTime::WeekFlags )arg2,(wxDateTime::TimeZone const &)*arg3); + result = (int)((wxDateTime const *)arg1)->GetWeekOfMonth((wxDateTime::WeekFlags )arg2,(wxDateTime::TimeZone const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = PyInt_FromLong((long)result); { - if (arg3) delete arg3; + if (temp3) delete arg3; } return resultobj; fail: { - if (arg3) delete arg3; + if (temp3) delete arg3; } return NULL; } @@ -18663,7 +19086,7 @@ static PyObject *_wrap_DateTime_ParseRfc822Date(PyObject *self, PyObject *args, wxDateTime *arg1 = (wxDateTime *) 0 ; wxString *arg2 = 0 ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -18675,7 +19098,7 @@ static PyObject *_wrap_DateTime_ParseRfc822Date(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18708,8 +19131,8 @@ static PyObject *_wrap_DateTime_ParseFormat(PyObject *self, PyObject *args, PyOb wxDateTime const &arg4_defvalue = wxDefaultDateTime ; wxDateTime *arg4 = (wxDateTime *) &arg4_defvalue ; int result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -18723,13 +19146,13 @@ static PyObject *_wrap_DateTime_ParseFormat(PyObject *self, PyObject *args, PyOb { 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) { @@ -18773,7 +19196,7 @@ static PyObject *_wrap_DateTime_ParseDateTime(PyObject *self, PyObject *args, Py wxDateTime *arg1 = (wxDateTime *) 0 ; wxString *arg2 = 0 ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -18785,7 +19208,7 @@ static PyObject *_wrap_DateTime_ParseDateTime(PyObject *self, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18814,7 +19237,7 @@ static PyObject *_wrap_DateTime_ParseDate(PyObject *self, PyObject *args, PyObje wxDateTime *arg1 = (wxDateTime *) 0 ; wxString *arg2 = 0 ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -18826,7 +19249,7 @@ static PyObject *_wrap_DateTime_ParseDate(PyObject *self, PyObject *args, PyObje { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18855,7 +19278,7 @@ static PyObject *_wrap_DateTime_ParseTime(PyObject *self, PyObject *args, PyObje wxDateTime *arg1 = (wxDateTime *) 0 ; wxString *arg2 = 0 ; int result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -18867,7 +19290,7 @@ static PyObject *_wrap_DateTime_ParseTime(PyObject *self, PyObject *args, PyObje { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18899,7 +19322,8 @@ static PyObject *_wrap_DateTime_Format(PyObject *self, PyObject *args, PyObject wxDateTime::TimeZone const &arg3_defvalue = LOCAL_TZ ; wxDateTime::TimeZone *arg3 = (wxDateTime::TimeZone *) &arg3_defvalue ; wxString result; - bool temp2 = false ; + bool temp2 = False ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -18913,12 +19337,13 @@ static PyObject *_wrap_DateTime_Format(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } } if (obj2) { { arg3 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj2)); + temp3 = True; } } { @@ -18940,7 +19365,7 @@ static PyObject *_wrap_DateTime_Format(PyObject *self, PyObject *args, PyObject delete arg2; } { - if (arg3) delete arg3; + if (temp3) delete arg3; } return resultobj; fail: @@ -18949,7 +19374,7 @@ static PyObject *_wrap_DateTime_Format(PyObject *self, PyObject *args, PyObject delete arg2; } { - if (arg3) delete arg3; + if (temp3) delete arg3; } return NULL; } @@ -20342,7 +20767,7 @@ static PyObject *_wrap_TimeSpan_Format(PyObject *self, PyObject *args, PyObject wxString const &arg2_defvalue = wxPyTimeSpanFormatStr ; wxString *arg2 = (wxString *) &arg2_defvalue ; wxString result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -20355,7 +20780,7 @@ static PyObject *_wrap_TimeSpan_Format(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } } { @@ -21471,7 +21896,7 @@ static PyObject *_wrap_new_CustomDataFormat(PyObject *self, PyObject *args, PyOb PyObject *resultobj; wxString *arg1 = 0 ; wxDataFormat *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "format", NULL @@ -21481,7 +21906,7 @@ static PyObject *_wrap_new_CustomDataFormat(PyObject *self, PyObject *args, PyOb { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21540,7 +21965,7 @@ static PyObject *_wrap_DataFormat___eq____SWIG_0(PyObject *self, PyObject *args) if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxDataFormat const *)arg1)->operator ==((wxDataFormatId )arg2); + result = (bool)((wxDataFormat const *)arg1)->operator ==(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -21563,7 +21988,7 @@ static PyObject *_wrap_DataFormat___ne____SWIG_0(PyObject *self, PyObject *args) if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxDataFormat const *)arg1)->operator !=((wxDataFormatId )arg2); + result = (bool)((wxDataFormat const *)arg1)->operator !=(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -21651,7 +22076,13 @@ static PyObject *_wrap_DataFormat___eq__(PyObject *self, PyObject *args) { } if (_v) { { - _v = (PyInt_Check(argv[1]) || PyLong_Check(argv[1])) ? 1 : 0; + SPyObj_AsInt(argv[1]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } } if (_v) { return _wrap_DataFormat___eq____SWIG_0(self,args); @@ -21740,7 +22171,13 @@ static PyObject *_wrap_DataFormat___ne__(PyObject *self, PyObject *args) { } if (_v) { { - _v = (PyInt_Check(argv[1]) || PyLong_Check(argv[1])) ? 1 : 0; + SPyObj_AsInt(argv[1]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } } if (_v) { return _wrap_DataFormat___ne____SWIG_0(self,args); @@ -21838,7 +22275,7 @@ static PyObject *_wrap_DataFormat_SetId(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxDataFormat *arg1 = (wxDataFormat *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -21850,7 +22287,7 @@ static PyObject *_wrap_DataFormat_SetId(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -21968,7 +22405,7 @@ static PyObject *_wrap_DataObject_GetFormatCount(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SPyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -22031,7 +22468,7 @@ static PyObject *_wrap_DataObject_GetDataSize(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SPyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -22121,8 +22558,10 @@ static PyObject *_wrap_DataObject_SetData(PyObject *self, PyObject *args, PyObje if (arg2 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } - arg3 = (size_t) PyInt_AsLong(obj2); - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (size_t) SPyObj_AsUnsignedLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22335,7 +22774,7 @@ static PyObject *_wrap_DataObjectComposite_Add(PyObject *self, PyObject *args, P PyObject *resultobj; wxDataObjectComposite *arg1 = (wxDataObjectComposite *) 0 ; wxDataObjectSimple *arg2 = (wxDataObjectSimple *) 0 ; - int arg3 = (int) FALSE ; + int arg3 = (int) False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -22371,7 +22810,7 @@ static PyObject *_wrap_new_TextDataObject(PyObject *self, PyObject *args, PyObje wxString const &arg1_defvalue = wxPyEmptyString ; wxString *arg1 = (wxString *) &arg1_defvalue ; wxTextDataObject *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "text", NULL @@ -22382,7 +22821,7 @@ static PyObject *_wrap_new_TextDataObject(PyObject *self, PyObject *args, PyObje { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } } { @@ -22425,7 +22864,7 @@ static PyObject *_wrap_TextDataObject_GetTextLength(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SPyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -22467,7 +22906,7 @@ static PyObject *_wrap_TextDataObject_SetText(PyObject *self, PyObject *args, Py PyObject *resultobj; wxTextDataObject *arg1 = (wxTextDataObject *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -22479,7 +22918,7 @@ static PyObject *_wrap_TextDataObject_SetText(PyObject *self, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -22515,7 +22954,7 @@ static PyObject *_wrap_new_PyTextDataObject(PyObject *self, PyObject *args, PyOb wxString const &arg1_defvalue = wxPyEmptyString ; wxString *arg1 = (wxString *) &arg1_defvalue ; wxPyTextDataObject *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "text", NULL @@ -22526,7 +22965,7 @@ static PyObject *_wrap_new_PyTextDataObject(PyObject *self, PyObject *args, PyOb { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } } { @@ -22916,7 +23355,7 @@ static PyObject *_wrap_CustomDataObject_GetSize(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SPyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -23012,7 +23451,7 @@ static PyObject *_wrap_URLDataObject_SetURL(PyObject *self, PyObject *args, PyOb PyObject *resultobj; wxURLDataObject *arg1 = (wxURLDataObject *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -23024,7 +23463,7 @@ static PyObject *_wrap_URLDataObject_SetURL(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23109,7 +23548,7 @@ static PyObject *_wrap_IsDragResultOk(PyObject *self, PyObject *args, PyObject * static PyObject *_wrap_new_DropSource(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) NULL ; + wxWindow *arg1 = (wxWindow *) 0 ; wxIcon const &arg2_defvalue = wxNullIcon ; wxIcon *arg2 = (wxIcon *) &arg2_defvalue ; wxIcon const &arg3_defvalue = wxNullIcon ; @@ -23125,10 +23564,8 @@ static PyObject *_wrap_new_DropSource(PyObject *self, PyObject *args, PyObject * (char *) "win",(char *) "copy",(char *) "move",(char *) "none", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_DropSource",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:new_DropSource",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -23361,7 +23798,7 @@ static PyObject * DropSource_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_DropTarget(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_PyDropTarget(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDataObject *arg1 = (wxDataObject *) NULL ; wxPyDropTarget *result; @@ -23370,7 +23807,7 @@ static PyObject *_wrap_new_DropTarget(PyObject *self, PyObject *args, PyObject * (char *) "dataObject", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_DropTarget",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PyDropTarget",kwnames,&obj0)) goto fail; if (obj0) { if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -23497,8 +23934,8 @@ static PyObject *_wrap_DropTarget_SetDataObject(PyObject *self, PyObject *args, static PyObject *_wrap_DropTarget_base_OnEnter(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; int arg4 ; int result; PyObject * obj0 = 0 ; @@ -23525,8 +23962,8 @@ static PyObject *_wrap_DropTarget_base_OnEnter(PyObject *self, PyObject *args, P static PyObject *_wrap_DropTarget_base_OnDragOver(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; int arg4 ; int result; PyObject * obj0 = 0 ; @@ -23577,8 +24014,8 @@ static PyObject *_wrap_DropTarget_base_OnLeave(PyObject *self, PyObject *args, P static PyObject *_wrap_DropTarget_base_OnDrop(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -23688,8 +24125,8 @@ static PyObject *_wrap_TextDropTarget__setCallbackInfo(PyObject *self, PyObject static PyObject *_wrap_TextDropTarget_base_OnEnter(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; int arg4 ; int result; PyObject * obj0 = 0 ; @@ -23716,8 +24153,8 @@ static PyObject *_wrap_TextDropTarget_base_OnEnter(PyObject *self, PyObject *arg static PyObject *_wrap_TextDropTarget_base_OnDragOver(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; int arg4 ; int result; PyObject * obj0 = 0 ; @@ -23768,8 +24205,8 @@ static PyObject *_wrap_TextDropTarget_base_OnLeave(PyObject *self, PyObject *arg static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -23795,8 +24232,8 @@ static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *self, PyObject *args static PyObject *_wrap_TextDropTarget_base_OnData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; int arg4 ; int result; PyObject * obj0 = 0 ; @@ -23882,8 +24319,8 @@ static PyObject *_wrap_FileDropTarget__setCallbackInfo(PyObject *self, PyObject static PyObject *_wrap_FileDropTarget_base_OnEnter(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; int arg4 ; int result; PyObject * obj0 = 0 ; @@ -23910,8 +24347,8 @@ static PyObject *_wrap_FileDropTarget_base_OnEnter(PyObject *self, PyObject *arg static PyObject *_wrap_FileDropTarget_base_OnDragOver(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; int arg4 ; int result; PyObject * obj0 = 0 ; @@ -23962,8 +24399,8 @@ static PyObject *_wrap_FileDropTarget_base_OnLeave(PyObject *self, PyObject *arg static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; bool result; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -23989,8 +24426,8 @@ static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *self, PyObject *args static PyObject *_wrap_FileDropTarget_base_OnData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; int arg4 ; int result; PyObject * obj0 = 0 ; @@ -24311,7 +24748,7 @@ static PyObject *_wrap_Clipboard_Flush(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_Clipboard_UsePrimarySelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxClipboard *arg1 = (wxClipboard *) 0 ; - bool arg2 = (bool) FALSE ; + bool arg2 = (bool) False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -24321,8 +24758,10 @@ static PyObject *_wrap_Clipboard_UsePrimarySelection(PyObject *self, PyObject *a if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Clipboard_UsePrimarySelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxClipboard,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SPyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -24510,6 +24949,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GenericFindWindowAtPoint", (PyCFunction) _wrap_GenericFindWindowAtPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"FindWindowAtPoint", (PyCFunction) _wrap_FindWindowAtPoint, METH_VARARGS | METH_KEYWORDS }, { (char *)"GetTopLevelParent", (PyCFunction) _wrap_GetTopLevelParent, METH_VARARGS | METH_KEYWORDS }, + { (char *)"GetKeyState", (PyCFunction) _wrap_GetKeyState, METH_VARARGS | METH_KEYWORDS }, { (char *)"WakeUpMainThread", (PyCFunction) _wrap_WakeUpMainThread, METH_VARARGS | METH_KEYWORDS }, { (char *)"MutexGuiEnter", (PyCFunction) _wrap_MutexGuiEnter, METH_VARARGS | METH_KEYWORDS }, { (char *)"MutexGuiLeave", (PyCFunction) _wrap_MutexGuiLeave, METH_VARARGS | METH_KEYWORDS }, @@ -24528,10 +24968,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"delete_Caret", (PyCFunction) _wrap_delete_Caret, METH_VARARGS | METH_KEYWORDS }, { (char *)"Caret_IsOk", (PyCFunction) _wrap_Caret_IsOk, METH_VARARGS | METH_KEYWORDS }, { (char *)"Caret_IsVisible", (PyCFunction) _wrap_Caret_IsVisible, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Caret_GetPositionTuple", (PyCFunction) _wrap_Caret_GetPositionTuple, METH_VARARGS | METH_KEYWORDS }, { (char *)"Caret_GetPosition", (PyCFunction) _wrap_Caret_GetPosition, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Caret_GetSizeTuple", (PyCFunction) _wrap_Caret_GetSizeTuple, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Caret_GetPositionTuple", (PyCFunction) _wrap_Caret_GetPositionTuple, METH_VARARGS | METH_KEYWORDS }, { (char *)"Caret_GetSize", (PyCFunction) _wrap_Caret_GetSize, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Caret_GetSizeTuple", (PyCFunction) _wrap_Caret_GetSizeTuple, METH_VARARGS | METH_KEYWORDS }, { (char *)"Caret_GetWindow", (PyCFunction) _wrap_Caret_GetWindow, METH_VARARGS | METH_KEYWORDS }, { (char *)"Caret_MoveXY", (PyCFunction) _wrap_Caret_MoveXY, METH_VARARGS | METH_KEYWORDS }, { (char *)"Caret_Move", (PyCFunction) _wrap_Caret_Move, METH_VARARGS | METH_KEYWORDS }, @@ -24590,13 +25030,14 @@ static PyMethodDef SwigMethods[] = { { (char *)"CreateFileTipProvider", (PyCFunction) _wrap_CreateFileTipProvider, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_Timer", (PyCFunction) _wrap_new_Timer, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_Timer", (PyCFunction) _wrap_delete_Timer, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Timer__setCallbackInfo", (PyCFunction) _wrap_Timer__setCallbackInfo, METH_VARARGS | METH_KEYWORDS }, { (char *)"Timer_SetOwner", (PyCFunction) _wrap_Timer_SetOwner, METH_VARARGS | METH_KEYWORDS }, { (char *)"Timer_Start", (PyCFunction) _wrap_Timer_Start, METH_VARARGS | METH_KEYWORDS }, { (char *)"Timer_Stop", (PyCFunction) _wrap_Timer_Stop, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Timer_Notify", (PyCFunction) _wrap_Timer_Notify, METH_VARARGS | METH_KEYWORDS }, { (char *)"Timer_IsRunning", (PyCFunction) _wrap_Timer_IsRunning, METH_VARARGS | METH_KEYWORDS }, { (char *)"Timer_GetInterval", (PyCFunction) _wrap_Timer_GetInterval, METH_VARARGS | METH_KEYWORDS }, { (char *)"Timer_IsOneShot", (PyCFunction) _wrap_Timer_IsOneShot, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Timer_GetId", (PyCFunction) _wrap_Timer_GetId, METH_VARARGS | METH_KEYWORDS }, { (char *)"Timer_swigregister", Timer_swigregister, METH_VARARGS }, { (char *)"new_TimerEvent", (PyCFunction) _wrap_new_TimerEvent, METH_VARARGS | METH_KEYWORDS }, { (char *)"TimerEvent_GetInterval", (PyCFunction) _wrap_TimerEvent_GetInterval, METH_VARARGS | METH_KEYWORDS }, @@ -24663,8 +25104,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"LogStatus", (PyCFunction) _wrap_LogStatus, METH_VARARGS | METH_KEYWORDS }, { (char *)"LogStatusFrame", (PyCFunction) _wrap_LogStatusFrame, METH_VARARGS | METH_KEYWORDS }, { (char *)"LogSysError", (PyCFunction) _wrap_LogSysError, METH_VARARGS | METH_KEYWORDS }, - { (char *)"LogTrace", (PyCFunction) _wrap_LogTrace, METH_VARARGS | METH_KEYWORDS }, - { (char *)"LogTraceMask", (PyCFunction) _wrap_LogTraceMask, METH_VARARGS | METH_KEYWORDS }, + { (char *)"LogTrace", _wrap_LogTrace, METH_VARARGS }, { (char *)"LogGeneric", (PyCFunction) _wrap_LogGeneric, METH_VARARGS | METH_KEYWORDS }, { (char *)"SafeShowMessage", (PyCFunction) _wrap_SafeShowMessage, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_LogNull", (PyCFunction) _wrap_new_LogNull, METH_VARARGS | METH_KEYWORDS }, @@ -24825,13 +25265,13 @@ static PyMethodDef SwigMethods[] = { { (char *)"delete_MimeTypesManager", (PyCFunction) _wrap_delete_MimeTypesManager, METH_VARARGS | METH_KEYWORDS }, { (char *)"MimeTypesManager_swigregister", MimeTypesManager_swigregister, METH_VARARGS }, { (char *)"new_ArtProvider", (PyCFunction) _wrap_new_ArtProvider, METH_VARARGS | METH_KEYWORDS }, - { (char *)"delete_ArtProvider", (PyCFunction) _wrap_delete_ArtProvider, METH_VARARGS | METH_KEYWORDS }, { (char *)"ArtProvider__setCallbackInfo", (PyCFunction) _wrap_ArtProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS }, { (char *)"ArtProvider_PushProvider", (PyCFunction) _wrap_ArtProvider_PushProvider, METH_VARARGS | METH_KEYWORDS }, { (char *)"ArtProvider_PopProvider", (PyCFunction) _wrap_ArtProvider_PopProvider, METH_VARARGS | METH_KEYWORDS }, { (char *)"ArtProvider_RemoveProvider", (PyCFunction) _wrap_ArtProvider_RemoveProvider, METH_VARARGS | METH_KEYWORDS }, { (char *)"ArtProvider_GetBitmap", (PyCFunction) _wrap_ArtProvider_GetBitmap, METH_VARARGS | METH_KEYWORDS }, { (char *)"ArtProvider_GetIcon", (PyCFunction) _wrap_ArtProvider_GetIcon, METH_VARARGS | METH_KEYWORDS }, + { (char *)"ArtProvider_Destroy", (PyCFunction) _wrap_ArtProvider_Destroy, METH_VARARGS | METH_KEYWORDS }, { (char *)"ArtProvider_swigregister", ArtProvider_swigregister, METH_VARARGS }, { (char *)"delete_ConfigBase", (PyCFunction) _wrap_delete_ConfigBase, METH_VARARGS | METH_KEYWORDS }, { (char *)"ConfigBase_Set", (PyCFunction) _wrap_ConfigBase_Set, METH_VARARGS | METH_KEYWORDS }, @@ -25150,7 +25590,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"DropSource_DoDragDrop", (PyCFunction) _wrap_DropSource_DoDragDrop, METH_VARARGS | METH_KEYWORDS }, { (char *)"DropSource_base_GiveFeedback", (PyCFunction) _wrap_DropSource_base_GiveFeedback, METH_VARARGS | METH_KEYWORDS }, { (char *)"DropSource_swigregister", DropSource_swigregister, METH_VARARGS }, - { (char *)"new_DropTarget", (PyCFunction) _wrap_new_DropTarget, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_PyDropTarget", (PyCFunction) _wrap_new_PyDropTarget, METH_VARARGS | METH_KEYWORDS }, { (char *)"DropTarget__setCallbackInfo", (PyCFunction) _wrap_DropTarget__setCallbackInfo, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_DropTarget", (PyCFunction) _wrap_delete_DropTarget, METH_VARARGS | METH_KEYWORDS }, { (char *)"DropTarget_GetDataObject", (PyCFunction) _wrap_DropTarget_GetDataObject, METH_VARARGS | METH_KEYWORDS }, @@ -25578,6 +26018,9 @@ static void *_p_wxTIFFHandlerTo_p_wxObject(void *x) { static void *_p_wxEvtHandlerTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxEvtHandler *) 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)); } @@ -25759,7 +26202,7 @@ static swig_type_info _swigt__p_wxSystemOptions[] = {{"_p_wxSystemOptions", 0, " static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0},{"_p_wxPoint"},{0}}; static swig_type_info _swigt__p_wxJoystickEvent[] = {{"_p_wxJoystickEvent", 0, "wxJoystickEvent *", 0},{"_p_wxJoystickEvent"},{0}}; static swig_type_info _swigt__p_wxCursor[] = {{"_p_wxCursor", 0, "wxCursor *", 0},{"_p_wxCursor"},{0}}; -static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_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_wxFileHistory", _p_wxFileHistoryTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_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_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxTimerEvent", _p_wxTimerEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxClipboard", _p_wxClipboardTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxToolTip", _p_wxToolTipTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_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_wxGIFHandler", _p_wxGIFHandlerTo_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_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxSystemOptions", _p_wxSystemOptionsTo_p_wxObject},{"_p_wxJoystickEvent", _p_wxJoystickEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxPyProcess", _p_wxPyProcessTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_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_wxBusyInfo", _p_wxBusyInfoTo_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_wxProcessEvent", _p_wxProcessEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyTimer", _p_wxPyTimerTo_p_wxObject},{0}}; +static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_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_wxFileHistory", _p_wxFileHistoryTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_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_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxTimerEvent", _p_wxTimerEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxClipboard", _p_wxClipboardTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxToolTip", _p_wxToolTipTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_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_wxGIFHandler", _p_wxGIFHandlerTo_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_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxSystemOptions", _p_wxSystemOptionsTo_p_wxObject},{"_p_wxJoystickEvent", _p_wxJoystickEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxPyProcess", _p_wxPyProcessTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_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_wxBusyInfo", _p_wxBusyInfoTo_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_wxProcessEvent", _p_wxProcessEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyTimer", _p_wxPyTimerTo_p_wxObject},{0}}; static swig_type_info _swigt__p_wxOutputStream[] = {{"_p_wxOutputStream", 0, "wxOutputStream *", 0},{"_p_wxOutputStream"},{0}}; static swig_type_info _swigt__p_wxDateTime[] = {{"_p_wxDateTime", 0, "wxDateTime *", 0},{"_p_wxDateTime"},{0}}; static swig_type_info _swigt__p_wxPyDropSource[] = {{"_p_wxPyDropSource", 0, "wxPyDropSource *", 0},{"_p_wxPyDropSource"},{0}}; @@ -26255,6 +26698,10 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); + PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); + SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorPromptStr",_wrap_FileSelectorPromptStr_get, _wrap_FileSelectorPromptStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorDefaultWildcardStr",_wrap_FileSelectorDefaultWildcardStr_get, _wrap_FileSelectorDefaultWildcardStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"DirSelectorPromptStr",_wrap_DirSelectorPromptStr_get, _wrap_DirSelectorPromptStr_set); PyDict_SetItemString(d, "wxEVT_TIMER", PyInt_FromLong(wxEVT_TIMER)); PyDict_SetItemString(d, "wxEVT_END_PROCESS", PyInt_FromLong(wxEVT_END_PROCESS)); @@ -26264,7 +26711,6 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_JOY_BUTTON_UP", PyInt_FromLong(wxEVT_JOY_BUTTON_UP)); PyDict_SetItemString(d, "wxEVT_JOY_MOVE", PyInt_FromLong(wxEVT_JOY_MOVE)); PyDict_SetItemString(d, "wxEVT_JOY_ZMOVE", PyInt_FromLong(wxEVT_JOY_ZMOVE)); - PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"TheMimeTypesManager",_wrap_TheMimeTypesManager_get, _wrap_TheMimeTypesManager_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_TOOLBAR",_wrap_ART_TOOLBAR_get, _wrap_ART_TOOLBAR_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_MENU",_wrap_ART_MENU_get, _wrap_ART_MENU_set); @@ -26307,6 +26753,8 @@ SWIGEXPORT(void) SWIG_init(void) { wxPyPtrTypeMap_Add("wxArtProvider", "wxPyArtProvider"); + SWIG_addvarlink(SWIG_globals,(char*)"DateFormatStr",_wrap_DateFormatStr_get, _wrap_DateFormatStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"TimeSpanFormatStr",_wrap_TimeSpanFormatStr_get, _wrap_TimeSpanFormatStr_set); SWIG_addvarlink(SWIG_globals,(char*)"FormatInvalid",_wrap_FormatInvalid_get, _wrap_FormatInvalid_set); wxPyPtrTypeMap_Add("wxDropSource", "wxPyDropSource");