X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..41378d3480c2b4fe70c052b89084c7ec59c7ed1e:/wxPython/src/msw/misc_wrap.cpp diff --git a/wxPython/src/msw/misc_wrap.cpp b/wxPython/src/msw/misc_wrap.cpp index ed823760c6..1de1723f34 100644 --- a/wxPython/src/msw/misc_wrap.cpp +++ b/wxPython/src/msw/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 @@ -114,12 +115,16 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **); SWIGIMPORT(const char *) SWIG_TypeName(const swig_type_info *); SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *); SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); +SWIGIMPORT(char *) SWIG_PackData(char *, void *, int); +SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } + #endif + /*********************************************************************** * pyrun.swg for wxPython * @@ -130,7 +135,6 @@ SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); * ************************************************************************/ - #include "Python.h" #ifdef __cplusplus @@ -161,8 +165,6 @@ typedef struct swig_const_info { swig_type_info **ptype; } swig_const_info; - - /* Common SWIG API */ #define SWIG_ConvertPtr(obj, pp, type, flags) \ SWIG_Python_ConvertPtr(obj, pp, type, flags) @@ -178,40 +180,26 @@ typedef struct swig_const_info { SWIG_Python_addvarlink(p, name, get_attr, set_attr) #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \ SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) -#define SWIG_PackData(c, ptr, sz) \ - SWIG_Python_PackData(c, ptr, sz) -#define SWIG_UnpackData(c, ptr, sz) \ - SWIG_Python_UnpackData(c, ptr, sz) #define SWIG_NewPackedObj(ptr, sz, type) \ SWIG_Python_NewPackedObj(ptr, sz, type) #define SWIG_InstallConstants(d, constants) \ SWIG_Python_InstallConstants(d, constants) -SWIGEXPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); -SWIGEXPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); -SWIGEXPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); +SWIGIMPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); +SWIGIMPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); +SWIGIMPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); +SWIGIMPORT(PyObject *) SWIG_Python_newvarlink(void); +SWIGIMPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); +SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); +SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); +SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); -SWIGEXPORT(PyObject *) SWIG_Python_newvarlink(void); -SWIGEXPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); -SWIGEXPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); -SWIGEXPORT(char *) SWIG_Python_PackData(char *c, void *, int); -SWIGEXPORT(char *) SWIG_Python_UnpackData(char *c, void *, int); -SWIGEXPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); -SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); /* Contract support */ -#define SWIG_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else - -#define SWIG_inherit_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_inherit_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else - -#define SWIG_invariant(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_begin(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_end(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else +#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else #ifdef __cplusplus } @@ -223,88 +211,87 @@ SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxLogChain swig_types[0] #define SWIGTYPE_p_wxMutexGuiLocker swig_types[1] -#define SWIGTYPE_p_wxMetafile swig_types[2] -#define SWIGTYPE_p_wxFileHistory swig_types[3] -#define SWIGTYPE_p_wxLog swig_types[4] -#define SWIGTYPE_p_wxDateTime__TimeZone swig_types[5] -#define SWIGTYPE_p_wxMenu swig_types[6] -#define SWIGTYPE_p_wxEvent swig_types[7] -#define SWIGTYPE_p_wxConfigBase swig_types[8] -#define SWIGTYPE_p_wxWave swig_types[9] -#define SWIGTYPE_p_wxFileType swig_types[10] -#define SWIGTYPE_p_wxLogGui swig_types[11] -#define SWIGTYPE_p_wxFont swig_types[12] -#define SWIGTYPE_p_wxDataFormat swig_types[13] -#define SWIGTYPE_p_wxTimerEvent swig_types[14] -#define SWIGTYPE_p_wxCaret swig_types[15] -#define SWIGTYPE_p_int swig_types[16] -#define SWIGTYPE_p_wxSize swig_types[17] -#define SWIGTYPE_p_wxClipboard swig_types[18] -#define SWIGTYPE_p_wxStopWatch swig_types[19] -#define SWIGTYPE_p_wxDC swig_types[20] -#define SWIGTYPE_p_wxClipboardLocker swig_types[21] -#define SWIGTYPE_p_wxIcon swig_types[22] -#define SWIGTYPE_p_wxLogStderr swig_types[23] -#define SWIGTYPE_p_wxLogTextCtrl swig_types[24] -#define SWIGTYPE_p_wxTextCtrl swig_types[25] -#define SWIGTYPE_p_wxBusyCursor swig_types[26] -#define SWIGTYPE_p_wxFileDataObject swig_types[27] -#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[28] -#define SWIGTYPE_p_wxPyTextDataObject swig_types[29] -#define SWIGTYPE_p_wxBitmapDataObject swig_types[30] -#define SWIGTYPE_p_wxTextDataObject swig_types[31] -#define SWIGTYPE_p_wxDataObject swig_types[32] -#define SWIGTYPE_p_wxCustomDataObject swig_types[33] -#define SWIGTYPE_p_wxURLDataObject swig_types[34] -#define SWIGTYPE_p_wxMetafileDataObject swig_types[35] -#define SWIGTYPE_p_wxTimerRunner swig_types[36] -#define SWIGTYPE_p_wxLogWindow swig_types[37] -#define SWIGTYPE_p_wxTimeSpan swig_types[38] -#define SWIGTYPE_p_wxArrayString swig_types[39] -#define SWIGTYPE_p_wxWindowDisabler swig_types[40] -#define SWIGTYPE_p_wxToolTip swig_types[41] -#define SWIGTYPE_p_wxDataObjectComposite swig_types[42] -#define SWIGTYPE_p_wxFileConfig swig_types[43] -#define SWIGTYPE_p_wxSystemSettings swig_types[44] -#define SWIGTYPE_p_wxPyDataObjectSimple swig_types[45] -#define SWIGTYPE_p_wxDataObjectSimple swig_types[46] -#define SWIGTYPE_p_wxEvtHandler swig_types[47] -#define SWIGTYPE_p_wxRect swig_types[48] -#define SWIGTYPE_p_wxSingleInstanceChecker swig_types[49] -#define SWIGTYPE_p_wxFileTypeInfo swig_types[50] -#define SWIGTYPE_p_wxFrame swig_types[51] -#define SWIGTYPE_p_wxTimer swig_types[52] -#define SWIGTYPE_p_wxMimeTypesManager swig_types[53] -#define SWIGTYPE_p_wxPyArtProvider swig_types[54] -#define SWIGTYPE_p_wxPyTipProvider swig_types[55] -#define SWIGTYPE_p_wxTipProvider swig_types[56] -#define SWIGTYPE_p_wxJoystick swig_types[57] -#define SWIGTYPE_p_wxSystemOptions swig_types[58] -#define SWIGTYPE_p_wxPoint swig_types[59] -#define SWIGTYPE_p_wxJoystickEvent swig_types[60] -#define SWIGTYPE_p_wxCursor swig_types[61] -#define SWIGTYPE_p_wxObject swig_types[62] -#define SWIGTYPE_p_wxOutputStream swig_types[63] -#define SWIGTYPE_p_wxDateTime swig_types[64] -#define SWIGTYPE_p_wxPyDropSource swig_types[65] -#define SWIGTYPE_p_wxWindow swig_types[66] -#define SWIGTYPE_p_wxString swig_types[67] -#define SWIGTYPE_p_wxPyProcess swig_types[68] -#define SWIGTYPE_p_wxBitmap swig_types[69] -#define SWIGTYPE_p_wxConfig swig_types[70] -#define SWIGTYPE_p_wxChar swig_types[71] -#define SWIGTYPE_p_wxBusyInfo swig_types[72] -#define SWIGTYPE_p_wxPyDropTarget swig_types[73] -#define SWIGTYPE_p_wxPyTextDropTarget swig_types[74] -#define SWIGTYPE_p_wxPyFileDropTarget swig_types[75] -#define SWIGTYPE_p_wxProcessEvent swig_types[76] -#define SWIGTYPE_p_wxPyLog swig_types[77] -#define SWIGTYPE_p_wxLogNull swig_types[78] -#define SWIGTYPE_p_wxColour swig_types[79] -#define SWIGTYPE_p_wxConfigPathChanger swig_types[80] -#define SWIGTYPE_p_wxPyTimer swig_types[81] -#define SWIGTYPE_p_wxDateSpan swig_types[82] -static swig_type_info *swig_types[84]; +#define SWIGTYPE_p_wxFileHistory swig_types[2] +#define SWIGTYPE_p_wxLog swig_types[3] +#define SWIGTYPE_p_wxDateTime__TimeZone swig_types[4] +#define SWIGTYPE_p_wxMenu swig_types[5] +#define SWIGTYPE_p_wxEvent swig_types[6] +#define SWIGTYPE_p_wxConfigBase swig_types[7] +#define SWIGTYPE_p_wxWave swig_types[8] +#define SWIGTYPE_p_wxFileType swig_types[9] +#define SWIGTYPE_p_wxLogGui swig_types[10] +#define SWIGTYPE_p_wxFont swig_types[11] +#define SWIGTYPE_p_wxDataFormat swig_types[12] +#define SWIGTYPE_p_wxTimerEvent swig_types[13] +#define SWIGTYPE_p_wxCaret swig_types[14] +#define SWIGTYPE_p_int swig_types[15] +#define SWIGTYPE_p_wxSize swig_types[16] +#define SWIGTYPE_p_wxClipboard swig_types[17] +#define SWIGTYPE_p_wxStopWatch swig_types[18] +#define SWIGTYPE_p_wxDC swig_types[19] +#define SWIGTYPE_p_wxClipboardLocker swig_types[20] +#define SWIGTYPE_p_wxIcon swig_types[21] +#define SWIGTYPE_p_wxLogStderr swig_types[22] +#define SWIGTYPE_p_wxLogTextCtrl swig_types[23] +#define SWIGTYPE_p_wxTextCtrl swig_types[24] +#define SWIGTYPE_p_wxBusyCursor swig_types[25] +#define SWIGTYPE_p_wxFileDataObject swig_types[26] +#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[27] +#define SWIGTYPE_p_wxPyTextDataObject swig_types[28] +#define SWIGTYPE_p_wxBitmapDataObject swig_types[29] +#define SWIGTYPE_p_wxTextDataObject swig_types[30] +#define SWIGTYPE_p_wxDataObject swig_types[31] +#define SWIGTYPE_p_wxCustomDataObject swig_types[32] +#define SWIGTYPE_p_wxURLDataObject swig_types[33] +#define SWIGTYPE_p_wxMetafileDataObject swig_types[34] +#define SWIGTYPE_p_wxTimerRunner swig_types[35] +#define SWIGTYPE_p_wxLogWindow swig_types[36] +#define SWIGTYPE_p_wxTimeSpan swig_types[37] +#define SWIGTYPE_p_wxArrayString swig_types[38] +#define SWIGTYPE_p_wxWindowDisabler swig_types[39] +#define SWIGTYPE_p_wxToolTip swig_types[40] +#define SWIGTYPE_p_wxDataObjectComposite swig_types[41] +#define SWIGTYPE_p_wxFileConfig swig_types[42] +#define SWIGTYPE_p_wxSystemSettings swig_types[43] +#define SWIGTYPE_p_wxPyDataObjectSimple swig_types[44] +#define SWIGTYPE_p_wxDataObjectSimple swig_types[45] +#define SWIGTYPE_p_wxEvtHandler swig_types[46] +#define SWIGTYPE_p_wxRect swig_types[47] +#define SWIGTYPE_p_wxSingleInstanceChecker swig_types[48] +#define SWIGTYPE_p_wxFileTypeInfo swig_types[49] +#define SWIGTYPE_p_wxFrame swig_types[50] +#define SWIGTYPE_p_wxTimer swig_types[51] +#define SWIGTYPE_p_wxMimeTypesManager swig_types[52] +#define SWIGTYPE_p_wxPyArtProvider swig_types[53] +#define SWIGTYPE_p_wxPyTipProvider swig_types[54] +#define SWIGTYPE_p_wxTipProvider swig_types[55] +#define SWIGTYPE_p_wxJoystick swig_types[56] +#define SWIGTYPE_p_wxSystemOptions swig_types[57] +#define SWIGTYPE_p_wxPoint swig_types[58] +#define SWIGTYPE_p_wxJoystickEvent swig_types[59] +#define SWIGTYPE_p_wxCursor swig_types[60] +#define SWIGTYPE_p_wxObject swig_types[61] +#define SWIGTYPE_p_wxOutputStream swig_types[62] +#define SWIGTYPE_p_wxDateTime swig_types[63] +#define SWIGTYPE_p_wxPyDropSource swig_types[64] +#define SWIGTYPE_p_wxWindow swig_types[65] +#define SWIGTYPE_p_wxString swig_types[66] +#define SWIGTYPE_p_wxPyProcess swig_types[67] +#define SWIGTYPE_p_wxBitmap swig_types[68] +#define SWIGTYPE_p_wxConfig swig_types[69] +#define SWIGTYPE_p_wxChar swig_types[70] +#define SWIGTYPE_p_wxBusyInfo swig_types[71] +#define SWIGTYPE_p_wxPyDropTarget swig_types[72] +#define SWIGTYPE_p_wxPyTextDropTarget swig_types[73] +#define SWIGTYPE_p_wxPyFileDropTarget swig_types[74] +#define SWIGTYPE_p_wxProcessEvent swig_types[75] +#define SWIGTYPE_p_wxPyLog swig_types[76] +#define SWIGTYPE_p_wxLogNull swig_types[77] +#define SWIGTYPE_p_wxColour swig_types[78] +#define SWIGTYPE_p_wxConfigPathChanger swig_types[79] +#define SWIGTYPE_p_wxPyTimer swig_types[80] +#define SWIGTYPE_p_wxDateSpan swig_types[81] +static swig_type_info *swig_types[83]; /* -------- TYPES TABLE (END) -------- */ @@ -320,16 +307,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; @@ -362,7 +346,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { #ifdef WXP_WITH_THREAD return wxThread::IsMain(); #else - return TRUE; + return True; #endif } @@ -431,12 +415,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() ) { @@ -536,7 +520,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); } @@ -550,7 +535,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; } @@ -574,16 +559,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 @@ -596,21 +581,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 @@ -661,7 +648,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(); @@ -789,6 +776,7 @@ public: PYPRIVATE; }; +void wxPyArtProvider_Destroy(wxPyArtProvider *self){ delete self; } @@ -850,10 +838,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 @@ -942,7 +929,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; @@ -961,7 +948,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); @@ -1020,7 +1007,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); } @@ -1044,75 +1031,23 @@ 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){ return PyString_FromStringAndSize((char*)self->GetData(), self->GetSize()); } -#include - - -#include - - -class wxPyDropSource : public wxDropSource { +class wxMetafileDataObject : public wxDataObjectSimple +{ 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() { } + wxMetafileDataObject() { wxPyRaiseNotImplemented(); } +}; - 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); @@ -1120,7 +1055,6 @@ IMP_PYCALLBACK_DR_2WXCDR_pure(wxPyDropTarget, wxDropTarget, OnData); IMP_PYCALLBACK_BOOL_INTINT(wxPyDropTarget, wxDropTarget, OnDrop); - class wxPyTextDropTarget : public wxTextDropTarget { public: wxPyTextDropTarget() {} @@ -1162,7 +1096,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); @@ -1365,8 +1299,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[] = { @@ -1377,12 +1311,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(); @@ -1418,7 +1352,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 @@ -1428,7 +1362,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(); @@ -1456,7 +1390,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 @@ -1466,7 +1400,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(); @@ -1500,7 +1434,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 @@ -1510,7 +1444,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(); @@ -1538,7 +1472,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 @@ -1548,7 +1482,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(); @@ -1579,6 +1513,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; @@ -1689,7 +1683,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[] = { @@ -1805,7 +1799,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 @@ -1816,7 +1810,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; } } { @@ -2047,7 +2041,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 @@ -2057,7 +2051,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(); @@ -2260,7 +2254,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 @@ -2271,7 +2265,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; } } { @@ -2362,11 +2356,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 ; @@ -2382,35 +2376,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) { @@ -2484,9 +2478,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 ; @@ -2499,18 +2493,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) { @@ -2568,9 +2562,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 ; @@ -2583,18 +2577,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) { @@ -2655,8 +2649,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 ; @@ -2671,14 +2665,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) { @@ -2736,11 +2730,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 ; @@ -2754,20 +2748,20 @@ 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) { @@ -2830,9 +2824,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 ; @@ -2845,20 +2839,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) { @@ -2917,12 +2911,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 ; @@ -2936,12 +2930,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); @@ -3006,12 +3000,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 ; @@ -3025,12 +3019,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); @@ -3090,8 +3084,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 ; @@ -3103,13 +3097,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) { @@ -3157,9 +3151,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 ; @@ -3174,17 +3168,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; @@ -3662,6 +3656,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[] = { @@ -3804,7 +3821,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 @@ -3814,7 +3831,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(); @@ -3844,7 +3861,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[] = { @@ -3856,7 +3873,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(); @@ -4098,6 +4115,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 ; @@ -4136,28 +4182,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: @@ -4203,35 +4249,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 ; @@ -4376,7 +4393,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 @@ -4593,7 +4610,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 @@ -4603,7 +4620,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(); @@ -4836,7 +4853,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[] = { @@ -4848,7 +4865,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(); @@ -5157,8 +5174,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[] = { @@ -5169,13 +5186,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; } } { @@ -5261,8 +5278,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 ; @@ -5275,13 +5292,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; } } { @@ -5462,7 +5479,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[] = { @@ -5474,7 +5491,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(); @@ -5578,7 +5595,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 ; @@ -5613,7 +5630,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[] = { @@ -5624,7 +5641,7 @@ 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) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; @@ -5702,6 +5719,36 @@ static PyObject *_wrap_delete_Timer(PyObject *self, PyObject *args, PyObject *kw } +static PyObject *_wrap_Timer__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyTimer *arg1 = (wxPyTimer *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + PyObject *arg3 = (PyObject *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "self",(char *) "_class", NULL + }; + + 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; + arg2 = obj1; + arg3 = obj2; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->_setCallbackInfo(arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Timer_SetOwner(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTimer *arg1 = (wxPyTimer *) 0 ; @@ -5734,7 +5781,7 @@ static PyObject *_wrap_Timer_Start(PyObject *self, PyObject *args, PyObject *kwa PyObject *resultobj; wxPyTimer *arg1 = (wxPyTimer *) 0 ; int arg2 = (int) -1 ; - bool arg3 = (bool) FALSE ; + bool arg3 = (bool) False ; bool result; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; @@ -5786,44 +5833,45 @@ static PyObject *_wrap_Timer_Stop(PyObject *self, PyObject *args, PyObject *kwar } -static PyObject *_wrap_Timer_Notify(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Timer_IsRunning(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTimer *arg1 = (wxPyTimer *) 0 ; + bool result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Timer_Notify",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Timer_IsRunning",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(); + result = (bool)((wxPyTimer const *)arg1)->IsRunning(); 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_IsRunning(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Timer_GetInterval(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTimer *arg1 = (wxPyTimer *) 0 ; - bool result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Timer_IsRunning",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Timer_GetInterval",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTimer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyTimer const *)arg1)->IsRunning(); + result = (int)((wxPyTimer const *)arg1)->GetInterval(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -5835,20 +5883,20 @@ static PyObject *_wrap_Timer_IsRunning(PyObject *self, PyObject *args, PyObject } -static PyObject *_wrap_Timer_GetInterval(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Timer_IsOneShot(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTimer *arg1 = (wxPyTimer *) 0 ; - int result; + bool result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Timer_GetInterval",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Timer_IsOneShot",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)->GetInterval(); + result = (bool)((wxPyTimer const *)arg1)->IsOneShot(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -5860,20 +5908,20 @@ static PyObject *_wrap_Timer_GetInterval(PyObject *self, PyObject *args, PyObjec } -static PyObject *_wrap_Timer_IsOneShot(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Timer_GetId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyTimer *arg1 = (wxPyTimer *) 0 ; - bool result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Timer_IsOneShot",kwnames,&obj0)) goto fail; + 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 = (bool)((wxPyTimer const *)arg1)->IsOneShot(); + result = (int)((wxPyTimer const *)arg1)->GetId(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -5977,7 +6025,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 ; @@ -6091,7 +6139,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[] = { @@ -6171,7 +6219,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[] = { @@ -6365,7 +6413,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 @@ -6464,7 +6512,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 @@ -6474,7 +6522,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(); @@ -6501,7 +6549,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 @@ -6511,7 +6559,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(); @@ -6873,10 +6921,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 ; @@ -6890,7 +6938,7 @@ 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; @@ -6925,7 +6973,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[] = { @@ -7260,7 +7308,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 @@ -7270,7 +7318,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(); @@ -7297,7 +7345,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 @@ -7307,7 +7355,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(); @@ -7334,7 +7382,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 @@ -7344,7 +7392,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(); @@ -7371,7 +7419,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 @@ -7381,7 +7429,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(); @@ -7408,7 +7456,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 @@ -7418,7 +7466,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(); @@ -7445,7 +7493,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 @@ -7455,7 +7503,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(); @@ -7482,7 +7530,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 @@ -7492,7 +7540,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(); @@ -7519,7 +7567,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 @@ -7529,7 +7577,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(); @@ -7557,7 +7605,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[] = { @@ -7569,7 +7617,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(); @@ -7596,7 +7644,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 @@ -7606,7 +7654,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(); @@ -7630,65 +7678,63 @@ 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 ; - 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(); @@ -7720,11 +7766,72 @@ 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 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7737,7 +7844,7 @@ static PyObject *_wrap_LogGeneric(PyObject *self, PyObject *args, PyObject *kwar { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7765,8 +7872,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[] = { @@ -7777,12 +7884,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(); @@ -7978,7 +8085,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 @@ -7988,7 +8095,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(); @@ -8193,7 +8300,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: @@ -8225,7 +8332,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: @@ -8532,7 +8639,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[] = { @@ -8543,7 +8650,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; @@ -10339,9 +10446,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[] = { @@ -10352,7 +10459,7 @@ 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; @@ -10384,7 +10491,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 @@ -10394,7 +10501,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(); @@ -10470,8 +10577,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 ; @@ -10492,7 +10599,7 @@ static PyObject *_wrap_Wave_Play(PyObject *self, PyObject *args, PyObject *kwarg } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxWave const *)arg1)->Play(arg2,arg3); + result = (bool)(arg1)->Play(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -10518,10 +10625,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 ; @@ -10534,22 +10641,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(); @@ -10698,7 +10805,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[] = { @@ -10710,7 +10817,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(); @@ -10738,7 +10845,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[] = { @@ -10750,7 +10857,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(); @@ -10795,7 +10902,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; @@ -10823,7 +10936,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; @@ -10851,7 +10970,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; @@ -10879,7 +11004,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; @@ -10907,7 +11038,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; @@ -10990,7 +11127,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; @@ -11238,8 +11381,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 ; @@ -11252,13 +11395,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; } } { @@ -11298,8 +11441,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 ; @@ -11312,13 +11455,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; } } { @@ -11358,8 +11501,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 ; @@ -11372,13 +11515,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; } } { @@ -11416,10 +11559,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 ; @@ -11433,12 +11576,12 @@ 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; @@ -11481,7 +11624,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[] = { @@ -11494,7 +11637,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; } } { @@ -11551,9 +11694,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 ; @@ -11565,18 +11708,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; } } { @@ -11649,8 +11792,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[] = { @@ -11661,12 +11804,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(); @@ -11726,7 +11869,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[] = { @@ -11739,7 +11882,7 @@ static PyObject *_wrap_MimeTypesManager_Initialize(PyObject *self, PyObject *arg { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } { @@ -11793,7 +11936,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[] = { @@ -11805,7 +11948,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(); @@ -11834,7 +11977,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[] = { @@ -11846,7 +11989,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(); @@ -11874,9 +12017,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 ; @@ -11889,7 +12032,7 @@ 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; @@ -11922,7 +12065,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[] = { @@ -11934,7 +12077,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(); @@ -12885,30 +13028,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 ; @@ -13018,8 +13137,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 ; @@ -13032,13 +13151,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) { @@ -13089,8 +13208,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 ; @@ -13103,13 +13222,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) { @@ -13152,6 +13271,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; @@ -13210,7 +13353,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[] = { @@ -13283,7 +13426,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[] = { @@ -13295,7 +13438,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(); @@ -13340,7 +13483,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; @@ -13452,7 +13601,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 ; @@ -13483,7 +13632,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 ; @@ -13516,7 +13665,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[] = { @@ -13528,7 +13677,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(); @@ -13557,7 +13706,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[] = { @@ -13569,7 +13718,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(); @@ -13598,7 +13747,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[] = { @@ -13610,7 +13759,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(); @@ -13639,7 +13788,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[] = { @@ -13651,7 +13800,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(); @@ -13682,8 +13831,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 ; @@ -13696,13 +13845,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; } } { @@ -13747,7 +13896,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[] = { @@ -13759,7 +13908,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(); @@ -13789,7 +13938,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[] = { @@ -13801,7 +13950,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(); @@ -13829,9 +13978,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 ; @@ -13844,7 +13993,7 @@ 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; @@ -13878,8 +14027,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 ; @@ -13892,12 +14041,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(); @@ -13935,7 +14084,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[] = { @@ -13947,7 +14096,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(); @@ -13977,7 +14126,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[] = { @@ -13989,7 +14138,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(); @@ -14019,7 +14168,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 ; @@ -14032,7 +14181,7 @@ 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 = PyInt_AsLong(obj2) ? true : false; if (PyErr_Occurred()) SWIG_fail; @@ -14061,7 +14210,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 ; @@ -14095,8 +14244,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 ; @@ -14109,12 +14258,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(); @@ -14152,8 +14301,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 ; @@ -14166,12 +14315,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(); @@ -14207,9 +14356,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 ; @@ -14222,7 +14371,7 @@ 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; @@ -14255,7 +14404,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[] = { @@ -14267,7 +14416,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(); @@ -14344,7 +14493,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[] = { @@ -14374,7 +14523,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[] = { @@ -14431,7 +14580,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[] = { @@ -14443,7 +14592,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(); @@ -14539,7 +14688,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[] = { @@ -14551,7 +14700,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(); @@ -14579,7 +14728,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[] = { @@ -14591,7 +14740,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(); @@ -14677,7 +14826,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[] = { @@ -14689,7 +14838,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(); @@ -14758,7 +14907,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; @@ -14784,10 +14939,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 ; @@ -14801,28 +14956,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; } } { @@ -14914,10 +15069,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 ; @@ -14931,28 +15086,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; } } { @@ -15036,7 +15191,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 @@ -15046,7 +15201,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(); @@ -15076,6 +15231,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 ; @@ -15263,7 +15458,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 }; @@ -15271,7 +15466,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; @@ -15288,7 +15483,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 }; @@ -15296,7 +15491,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; @@ -15372,6 +15567,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[] = { @@ -15379,8 +15576,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); @@ -15389,8 +15594,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; } @@ -15626,34 +15847,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); @@ -15670,42 +15873,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); @@ -15836,36 +16016,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(); { @@ -15886,44 +16048,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(); { @@ -16030,18 +16169,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(); { @@ -16062,18 +16198,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(); { @@ -16094,18 +16227,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(); { @@ -16126,18 +16256,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(); { @@ -16158,18 +16285,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(); { @@ -16458,20 +16582,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); @@ -16489,20 +16610,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); @@ -16585,18 +16703,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(); { @@ -16617,18 +16732,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); @@ -16776,8 +16888,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 ; @@ -16789,6 +16902,7 @@ 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; @@ -16807,12 +16921,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; } @@ -16822,8 +16936,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 ; @@ -16835,6 +16950,7 @@ 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; @@ -16852,12 +16968,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; } @@ -16866,7 +16982,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 ; @@ -16901,7 +17017,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 ; @@ -17014,6 +17130,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[] = { @@ -17025,6 +17142,7 @@ static PyObject *_wrap_DateTime_GetYear(PyObject *self, PyObject *args, PyObject if (obj1) { { arg2 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj1)); + temp2 = True; } } { @@ -17036,12 +17154,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; } @@ -17053,6 +17171,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[] = { @@ -17064,6 +17183,7 @@ static PyObject *_wrap_DateTime_GetMonth(PyObject *self, PyObject *args, PyObjec if (obj1) { { arg2 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj1)); + temp2 = True; } } { @@ -17075,12 +17195,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; } @@ -17091,7 +17211,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[] = { @@ -17103,23 +17224,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; } @@ -17131,6 +17253,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[] = { @@ -17142,6 +17265,7 @@ static PyObject *_wrap_DateTime_GetWeekDay(PyObject *self, PyObject *args, PyObj if (obj1) { { arg2 = new wxDateTime::TimeZone((wxDateTime::TZ)PyInt_AsLong(obj1)); + temp2 = True; } } { @@ -17153,12 +17277,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; } @@ -17169,7 +17293,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[] = { @@ -17181,23 +17306,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; } @@ -17208,7 +17334,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[] = { @@ -17220,23 +17347,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; } @@ -17247,7 +17375,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[] = { @@ -17259,23 +17388,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; } @@ -17286,7 +17416,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[] = { @@ -17298,23 +17429,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; } @@ -17325,7 +17457,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[] = { @@ -17337,23 +17470,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; } @@ -17365,7 +17499,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[] = { @@ -17377,23 +17512,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; } @@ -17405,7 +17541,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[] = { @@ -17417,23 +17554,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; } @@ -18653,7 +18791,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[] = { @@ -18665,7 +18803,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(); @@ -18698,8 +18836,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 ; @@ -18713,13 +18851,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) { @@ -18763,7 +18901,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[] = { @@ -18775,7 +18913,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(); @@ -18804,7 +18942,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[] = { @@ -18816,7 +18954,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(); @@ -18845,7 +18983,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[] = { @@ -18857,7 +18995,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(); @@ -18889,7 +19027,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 ; @@ -18903,12 +19042,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; } } { @@ -18930,7 +19070,7 @@ static PyObject *_wrap_DateTime_Format(PyObject *self, PyObject *args, PyObject delete arg2; } { - if (arg3) delete arg3; + if (temp3) delete arg3; } return resultobj; fail: @@ -18939,7 +19079,7 @@ static PyObject *_wrap_DateTime_Format(PyObject *self, PyObject *args, PyObject delete arg2; } { - if (arg3) delete arg3; + if (temp3) delete arg3; } return NULL; } @@ -20332,7 +20472,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[] = { @@ -20345,7 +20485,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; } } { @@ -21461,7 +21601,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 @@ -21471,7 +21611,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(); @@ -21828,7 +21968,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[] = { @@ -21840,7 +21980,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(); @@ -22325,7 +22465,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[] = { @@ -22361,7 +22501,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 @@ -22372,7 +22512,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; } } { @@ -22457,7 +22597,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[] = { @@ -22469,7 +22609,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(); @@ -22505,7 +22645,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 @@ -22516,7 +22656,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; } } { @@ -22799,7 +22939,7 @@ static PyObject *_wrap_FileDataObject_AddFile(PyObject *self, PyObject *args, Py PyObject *resultobj; wxFileDataObject *arg1 = (wxFileDataObject *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -22811,7 +22951,7 @@ static PyObject *_wrap_FileDataObject_AddFile(PyObject *self, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -23042,7 +23182,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[] = { @@ -23054,7 +23194,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(); @@ -23107,65 +23247,6 @@ static PyObject *_wrap_new_MetafileDataObject(PyObject *self, PyObject *args, Py } -static PyObject *_wrap_MetafileDataObject_SetMetafile(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxMetafileDataObject *arg1 = (wxMetafileDataObject *) 0 ; - wxMetafile *arg2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "metafile", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MetafileDataObject_SetMetafile",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMetafileDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMetafile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetMetafile((wxMetafile const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_MetafileDataObject_GetMetafile(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxMetafileDataObject *arg1 = (wxMetafileDataObject *) 0 ; - wxMetafile result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MetafileDataObject_GetMetafile",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMetafileDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxMetafileDataObject const *)arg1)->GetMetafile(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - wxMetafile * resultptr; - resultptr = new wxMetafile((wxMetafile &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxMetafile, 1); - } - return resultobj; - fail: - return NULL; -} - - static PyObject * MetafileDataObject_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -23198,7 +23279,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 ; @@ -23214,10 +23295,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) { @@ -23450,7 +23529,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; @@ -23459,7 +23538,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; } @@ -23586,8 +23665,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 ; @@ -23614,8 +23693,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 ; @@ -23666,8 +23745,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[] = { @@ -23777,8 +23856,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 ; @@ -23805,8 +23884,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 ; @@ -23857,8 +23936,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[] = { @@ -23884,8 +23963,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 ; @@ -23971,8 +24050,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 ; @@ -23999,8 +24078,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 ; @@ -24051,8 +24130,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[] = { @@ -24078,8 +24157,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 ; @@ -24400,7 +24479,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[] = { @@ -24599,6 +24678,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 }, @@ -24617,10 +24697,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 }, @@ -24679,13 +24759,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 }, @@ -24752,8 +24833,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 }, @@ -24914,13 +24994,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 }, @@ -25229,8 +25309,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"URLDataObject_SetURL", (PyCFunction) _wrap_URLDataObject_SetURL, METH_VARARGS | METH_KEYWORDS }, { (char *)"URLDataObject_swigregister", URLDataObject_swigregister, METH_VARARGS }, { (char *)"new_MetafileDataObject", (PyCFunction) _wrap_new_MetafileDataObject, METH_VARARGS | METH_KEYWORDS }, - { (char *)"MetafileDataObject_SetMetafile", (PyCFunction) _wrap_MetafileDataObject_SetMetafile, METH_VARARGS | METH_KEYWORDS }, - { (char *)"MetafileDataObject_GetMetafile", (PyCFunction) _wrap_MetafileDataObject_GetMetafile, METH_VARARGS | METH_KEYWORDS }, { (char *)"MetafileDataObject_swigregister", MetafileDataObject_swigregister, METH_VARARGS }, { (char *)"IsDragResultOk", (PyCFunction) _wrap_IsDragResultOk, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_DropSource", (PyCFunction) _wrap_new_DropSource, METH_VARARGS | METH_KEYWORDS }, @@ -25242,7 +25320,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 }, @@ -25670,6 +25748,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)); } @@ -25792,7 +25873,6 @@ static void *_p_wxPyFileDropTargetTo_p_wxPyDropTarget(void *x) { } static swig_type_info _swigt__p_wxLogChain[] = {{"_p_wxLogChain", 0, "wxLogChain *", 0},{"_p_wxLogChain"},{0}}; static swig_type_info _swigt__p_wxMutexGuiLocker[] = {{"_p_wxMutexGuiLocker", 0, "wxMutexGuiLocker *", 0},{"_p_wxMutexGuiLocker"},{0}}; -static swig_type_info _swigt__p_wxMetafile[] = {{"_p_wxMetafile", 0, "wxMetafile *", 0},{"_p_wxMetafile"},{0}}; static swig_type_info _swigt__p_wxFileHistory[] = {{"_p_wxFileHistory", 0, "wxFileHistory *", 0},{"_p_wxFileHistory"},{0}}; static swig_type_info _swigt__p_wxLog[] = {{"_p_wxLog", 0, "wxLog *", 0},{"_p_wxLogStderr", _p_wxLogStderrTo_p_wxLog},{"_p_wxLogTextCtrl", _p_wxLogTextCtrlTo_p_wxLog},{"_p_wxLogWindow", _p_wxLogWindowTo_p_wxLog},{"_p_wxLogChain", _p_wxLogChainTo_p_wxLog},{"_p_wxLogGui", _p_wxLogGuiTo_p_wxLog},{"_p_wxPyLog", _p_wxPyLogTo_p_wxLog},{"_p_wxLog"},{0}}; static swig_type_info _swigt__p_wxDateTime__TimeZone[] = {{"_p_wxDateTime__TimeZone", 0, "wxDateTime::TimeZone *", 0},{"_p_wxDateTime__TimeZone"},{0}}; @@ -25852,7 +25932,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}}; @@ -25877,7 +25957,6 @@ static swig_type_info _swigt__p_wxDateSpan[] = {{"_p_wxDateSpan", 0, "wxDateSpan static swig_type_info *swig_types_initial[] = { _swigt__p_wxLogChain, _swigt__p_wxMutexGuiLocker, -_swigt__p_wxMetafile, _swigt__p_wxFileHistory, _swigt__p_wxLog, _swigt__p_wxDateTime__TimeZone, @@ -26349,6 +26428,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)); @@ -26358,7 +26441,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); @@ -26401,6 +26483,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");