X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41f1cec7ae286b1bc5cc189bbf31c060c7ff812a..700c96d420c7413ff2220e16e848962bdd2e45eb:/wxPython/src/mac/misc_wrap.cpp diff --git a/wxPython/src/mac/misc_wrap.cpp b/wxPython/src/mac/misc_wrap.cpp index 25de0654bb..c49a479ee6 100644 --- a/wxPython/src/mac/misc_wrap.cpp +++ b/wxPython/src/mac/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 @@ -97,10 +98,10 @@ typedef void *(*swig_converter_func)(void *); typedef struct swig_type_info *(*swig_dycast_func)(void **); typedef struct swig_type_info { - const char *name; + const char *name; swig_converter_func converter; const char *str; - void *clientdata; + void *clientdata; swig_dycast_func dcast; struct swig_type_info *next; struct swig_type_info *prev; @@ -114,6 +115,8 @@ 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 @@ -121,6 +124,7 @@ SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); #endif + /*********************************************************************** * pyrun.swg for wxPython * @@ -131,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 @@ -162,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) @@ -171,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() @@ -179,34 +352,27 @@ 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_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else - #ifdef __cplusplus } #endif @@ -314,16 +480,13 @@ static swig_type_info *swig_types[84]; #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; @@ -530,7 +693,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); } @@ -592,12 +756,14 @@ class wxWave : public wxObject public: 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(); } @@ -845,10 +1011,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 @@ -1049,8 +1214,6 @@ PyObject *wxCustomDataObject_GetData(wxCustomDataObject *self){ #include - - IMP_PYCALLBACK_BOOL_DR(wxPyDropSource, wxDropSource, GiveFeedback); @@ -1519,6 +1682,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; @@ -1638,8 +1861,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(); @@ -1942,8 +2167,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); @@ -1967,8 +2194,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); @@ -2257,7 +2486,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; @@ -2714,8 +2943,10 @@ static PyObject *_wrap_GetTextFromUser(PyObject *self, PyObject *args, PyObject 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(); @@ -2892,8 +3123,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(); @@ -2981,8 +3214,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(); @@ -3602,6 +3837,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[] = { @@ -3887,8 +4145,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); @@ -5390,7 +5650,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; @@ -5461,8 +5721,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); @@ -5531,8 +5793,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(); @@ -5566,8 +5830,10 @@ static PyObject *_wrap_CreateFileTipProvider(PyObject *self, PyObject *args, PyO if (arg1 == NULL) SWIG_fail; temp1 = True; } - arg2 = (size_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SPyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxTipProvider *)wxCreateFileTipProvider((wxString const &)*arg1,arg2); @@ -5715,8 +5981,10 @@ static PyObject *_wrap_Timer_Start(PyObject *self, PyObject *args, PyObject *kwa 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 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg3 = (bool) SPyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -5831,6 +6099,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; @@ -5934,8 +6227,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(); @@ -5988,14 +6283,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); @@ -6047,8 +6354,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(); @@ -6126,8 +6435,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(); @@ -6156,11 +6467,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); @@ -6319,8 +6634,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(); @@ -6345,8 +6662,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); @@ -6391,8 +6710,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); @@ -6590,7 +6911,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; @@ -6637,7 +6958,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; @@ -6839,12 +7160,16 @@ static PyObject *_wrap_new_LogWindow(PyObject *self, PyObject *args, PyObject *k 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(); @@ -6881,8 +7206,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(); @@ -6987,8 +7314,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); @@ -7074,8 +7403,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); @@ -7162,7 +7493,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; @@ -7180,8 +7511,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(); @@ -7576,44 +7909,47 @@ 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 ; @@ -7621,11 +7957,8 @@ static PyObject *_wrap_LogTraceMask(PyObject *self, PyObject *args, PyObject *kw 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; @@ -7666,6 +7999,73 @@ 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 ; @@ -7678,8 +8078,10 @@ 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; @@ -10301,8 +10703,10 @@ static PyObject *_wrap_new_Wave(PyObject *self, PyObject *args, PyObject *kwargs 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(); @@ -10429,12 +10833,16 @@ 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(); @@ -10741,7 +11149,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; @@ -10769,7 +11183,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; @@ -10797,7 +11217,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; @@ -10825,7 +11251,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; @@ -10853,7 +11285,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; @@ -10936,7 +11374,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; @@ -11387,8 +11831,10 @@ static PyObject *_wrap_FileType_SetCommand(PyObject *self, PyObject *args, PyObj 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(); @@ -11838,8 +12284,10 @@ static PyObject *_wrap_MimeTypesManager_ReadMailcap(PyObject *self, PyObject *ar 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(); @@ -13165,8 +13613,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(); @@ -13286,7 +13736,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; @@ -13409,8 +13865,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(); @@ -13419,7 +13877,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; @@ -13440,8 +13898,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(); @@ -13450,7 +13910,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; @@ -13793,8 +14253,10 @@ static PyObject *_wrap_ConfigBase_ReadBool(PyObject *self, PyObject *args, PyObj 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(); @@ -13980,8 +14442,10 @@ static PyObject *_wrap_ConfigBase_WriteBool(PyObject *self, PyObject *args, PyOb if (arg2 == NULL) SWIG_fail; temp2 = True; } - 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)(arg1)->Write((wxString const &)*arg2,arg3); @@ -14018,8 +14482,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(); @@ -14171,8 +14637,10 @@ static PyObject *_wrap_ConfigBase_DeleteEntry(PyObject *self, PyObject *args, Py 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(); @@ -14300,8 +14768,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(); @@ -14330,8 +14800,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(); @@ -14704,7 +15176,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; @@ -15022,6 +15500,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 ; @@ -15318,6 +15836,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[] = { @@ -15325,8 +15845,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); @@ -15335,8 +15863,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; } @@ -15531,8 +16075,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); @@ -15690,8 +16236,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(); { @@ -16630,8 +17178,10 @@ static PyObject *_wrap_DateTime_ToTimezone(PyObject *self, PyObject *args, PyObj 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(); @@ -16678,8 +17228,10 @@ static PyObject *_wrap_DateTime_MakeTimezone(PyObject *self, PyObject *args, PyO 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(); @@ -16718,8 +17270,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(); @@ -16753,8 +17307,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(); @@ -16842,7 +17398,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; @@ -21395,7 +21951,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; @@ -21418,7 +21974,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; @@ -21506,7 +22062,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); @@ -21595,7 +22157,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); @@ -21823,7 +22391,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; @@ -21886,7 +22454,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; @@ -21976,8 +22544,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(); @@ -22280,7 +22850,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; @@ -22771,7 +23341,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; @@ -23023,7 +23593,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 ; wxCursor const &arg2_defvalue = wxNullCursor ; wxCursor *arg2 = (wxCursor *) &arg2_defvalue ; wxCursor const &arg3_defvalue = wxNullCursor ; @@ -23039,10 +23609,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_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -23275,7 +23843,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; @@ -23284,7 +23852,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; } @@ -24235,8 +24803,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(); @@ -24424,6 +24994,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 }, @@ -24511,6 +25082,7 @@ static PyMethodDef SwigMethods[] = { { (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 }, @@ -24577,8 +25149,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 }, @@ -25066,7 +25637,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 }, @@ -26176,6 +26747,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)); @@ -26185,7 +26760,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); @@ -26228,6 +26802,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");