X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e0c87227cf6b6215d169985d2bb5d2421a74512..1de47c7cb466d25dcb2135f5315d9c06927e0f2f:/wxPython/src/gtk/misc_wrap.cpp diff --git a/wxPython/src/gtk/misc_wrap.cpp b/wxPython/src/gtk/misc_wrap.cpp index 3b577c5ca9..c54d8de5f6 100644 --- a/wxPython/src/gtk/misc_wrap.cpp +++ b/wxPython/src/gtk/misc_wrap.cpp @@ -45,6 +45,8 @@ private: #define SWIG_TypeName SWIG_Python_TypeName #define SWIG_TypeQuery SWIG_Python_TypeQuery #define SWIG_TypeClientData SWIG_Python_TypeClientData +#define SWIG_PackData SWIG_Python_PackData +#define SWIG_UnpackData SWIG_Python_UnpackData /*********************************************************************** @@ -59,36 +61,35 @@ private: #include -#if defined(_WIN32) || defined(__WIN32__) -# if defined(_MSC_VER) -# if defined(STATIC_LINKED) -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) extern a -# else -# define SWIGEXPORT(a) __declspec(dllexport) a -# define SWIGIMPORT(a) extern a -# endif -# else -# if defined(__BORLANDC__) -# define SWIGEXPORT(a) a _export -# define SWIGIMPORT(a) a _export -# else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a -# endif -# endif +#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(_MSC_VER) || defined(__GNUC__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) extern a +# else +# define SWIGEXPORT(a) __declspec(dllexport) a +# define SWIGIMPORT(a) extern a +# endif +# else +# if defined(__BORLANDC__) +# define SWIGEXPORT(a) a _export +# define SWIGIMPORT(a) a _export +# else +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) a +# endif +# endif #else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) a #endif #ifdef SWIG_GLOBAL -#define SWIGRUNTIME(a) SWIGEXPORT(a) +# define SWIGRUNTIME(a) SWIGEXPORT(a) #else -#define SWIGRUNTIME(a) static a +# define SWIGRUNTIME(a) static a #endif - #ifdef __cplusplus extern "C" { #endif @@ -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,7 +135,6 @@ SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); * ************************************************************************/ - #include "Python.h" #ifdef __cplusplus @@ -162,8 +165,6 @@ typedef struct swig_const_info { swig_type_info **ptype; } swig_const_info; - - /* Common SWIG API */ #define SWIG_ConvertPtr(obj, pp, type, flags) \ SWIG_Python_ConvertPtr(obj, pp, type, flags) @@ -179,34 +180,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 @@ -313,16 +307,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; @@ -352,7 +343,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() {} @@ -536,7 +531,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); } @@ -598,12 +594,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(); } @@ -851,10 +849,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 @@ -1055,12 +1052,10 @@ PyObject *wxCustomDataObject_GetData(wxCustomDataObject *self){ class wxMetafileDataObject : public wxDataObjectSimple { public: - wxMetafileDataObject() { PyErr_SetNone(PyExc_NotImplementedError); } + wxMetafileDataObject() { wxPyRaiseNotImplemented(); } }; - - IMP_PYCALLBACK_BOOL_DR(wxPyDropSource, wxDropSource, GiveFeedback); @@ -1529,6 +1524,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; @@ -3612,6 +3667,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[] = { @@ -5841,6 +5919,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; @@ -7586,44 +7689,45 @@ 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 = (unsigned long) PyInt_AsLong(obj0); + if (PyErr_Occurred()) 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(); - 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 ; @@ -7631,11 +7735,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; @@ -7676,6 +7777,67 @@ 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; + { + _v = (PyInt_Check(argv[0]) || PyLong_Check(argv[0])) ? 1 : 0; + } + 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 ; @@ -10751,7 +10913,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; @@ -10779,7 +10947,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; @@ -10807,7 +10981,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; @@ -10835,7 +11015,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; @@ -10863,7 +11049,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; @@ -10946,7 +11138,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; @@ -13296,7 +13494,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; @@ -14714,7 +14918,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; @@ -15032,6 +15242,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 ; @@ -15328,6 +15578,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[] = { @@ -15335,8 +15587,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); @@ -15345,8 +15605,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; } @@ -22974,7 +23250,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 ; @@ -22990,10 +23266,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) { @@ -23226,7 +23500,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; @@ -23235,7 +23509,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; } @@ -24375,6 +24649,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 }, @@ -24462,6 +24737,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 }, @@ -24528,8 +24804,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 }, @@ -25015,7 +25290,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 }, @@ -26123,6 +26398,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)); @@ -26132,7 +26411,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); @@ -26175,6 +26453,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");