X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8edf1c75f0667d3568e224910fa858cf05234942..fcafa8a99e85911258e8f783a5099894a2322261:/wxPython/src/msw/misc_wrap.cpp diff --git a/wxPython/src/msw/misc_wrap.cpp b/wxPython/src/msw/misc_wrap.cpp index 7366d48059..9b88fec904 100644 --- a/wxPython/src/msw/misc_wrap.cpp +++ b/wxPython/src/msw/misc_wrap.cpp @@ -239,33 +239,33 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #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_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_wxFileDataObject 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_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_wxPyTextDataObject swig_types[26] +#define SWIGTYPE_p_wxBitmapDataObject swig_types[27] +#define SWIGTYPE_p_wxTextDataObject swig_types[28] +#define SWIGTYPE_p_wxDataObject swig_types[29] +#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[30] +#define SWIGTYPE_p_wxFileDataObject 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_wxSound swig_types[35] #define SWIGTYPE_p_wxTimerRunner swig_types[36] #define SWIGTYPE_p_wxLogWindow swig_types[37] #define SWIGTYPE_p_wxTimeSpan swig_types[38] @@ -311,10 +311,11 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #define SWIGTYPE_p_wxPyLog swig_types[78] #define SWIGTYPE_p_wxLogNull swig_types[79] #define SWIGTYPE_p_wxColour swig_types[80] -#define SWIGTYPE_p_wxConfigPathChanger swig_types[81] -#define SWIGTYPE_p_wxPyTimer swig_types[82] -#define SWIGTYPE_p_wxDateSpan swig_types[83] -static swig_type_info *swig_types[85]; +#define SWIGTYPE_p_wxByte swig_types[81] +#define SWIGTYPE_p_wxConfigPathChanger swig_types[82] +#define SWIGTYPE_p_wxPyTimer swig_types[83] +#define SWIGTYPE_p_wxDateSpan swig_types[84] +static swig_type_info *swig_types[86]; /* -------- TYPES TABLE (END) -------- */ @@ -380,15 +381,6 @@ SWIG_PyObj_AsInt(PyObject *obj) SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); } - -SWIGSTATIC(PyObject*) -SWIG_PyObj_FromBool(bool value) -{ - PyObject *obj = value ? Py_True : Py_False; - Py_INCREF(obj); - return obj; -} - static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr); static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); @@ -681,38 +673,45 @@ public: #endif -#include +#include -#if !wxUSE_WAVE +#if !wxUSE_SOUND // A C++ stub class for wxWave for platforms that don't have it. -class wxWave : public wxObject +class wxSound : public wxObject { public: - wxWave(const wxString& fileName, bool isResource = False) { + wxSound() { wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, - "wxWave is not available on this platform."); + "wxSound is not available on this platform."); wxPyEndBlockThreads(); } - wxWave(int size, const wxByte* data) { + wxSound(const wxString&, bool) { wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, - "wxWave is not available on this platform."); + "wxSound is not available on this platform."); wxPyEndBlockThreads(); } + wxSound(int, const wxByte*) { + wxPyBeginBlockThreads(); + PyErr_SetString(PyExc_NotImplementedError, + "wxSound is not available on this platform."); + wxPyEndBlockThreads(); + } + + ~wxSound() {}; - ~wxWave() {} - - bool IsOk() const { return False; } - bool Play(bool async = True, bool looped = False) const { return False; } + bool Create(const wxString&, bool) { return false; } + bool Create(int, const wxByte*) { return false; }; + bool IsOk() { return false; }; + bool Play(unsigned) const { return false; } + static bool Play(const wxString&, unsigned) { return false; } + static void Stop() {} }; #endif -wxWave *new_wxWave(wxString const &data){ - return new wxWave(data.Len(), (wxByte*)data.c_str()); - } #include @@ -1358,7 +1357,7 @@ static PyObject *_wrap_SystemSettings_HasFeature(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1644,7 +1643,7 @@ static PyObject *_wrap_SystemOptions_HasOption(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp1) delete arg1; @@ -1919,7 +1918,7 @@ static PyObject *_wrap_IsBusy(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1980,7 +1979,7 @@ static PyObject *_wrap_Shell(PyObject *self, PyObject *args, PyObject *kwargs) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp1) delete arg1; @@ -2123,7 +2122,7 @@ static PyObject *_wrap_Shutdown(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -3560,7 +3559,7 @@ static PyObject *_wrap_ColourDisplay(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -3995,7 +3994,7 @@ static PyObject *_wrap_GetKeyState(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4133,7 +4132,7 @@ static PyObject *_wrap_Thread_IsMain(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4413,7 +4412,7 @@ static PyObject *_wrap_Caret_IsOk(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4438,7 +4437,7 @@ static PyObject *_wrap_Caret_IsVisible(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5694,7 +5693,7 @@ static PyObject *_wrap_SingleInstanceChecker_Create(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -5735,7 +5734,7 @@ static PyObject *_wrap_SingleInstanceChecker_IsAnotherRunning(PyObject *self, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6013,7 +6012,7 @@ static PyObject *_wrap_ShowTip(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6222,7 +6221,7 @@ static PyObject *_wrap_Timer_Start(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6271,7 +6270,7 @@ static PyObject *_wrap_Timer_IsRunning(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6321,7 +6320,7 @@ static PyObject *_wrap_Timer_IsOneShot(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6670,7 +6669,7 @@ static PyObject *_wrap_Log_IsEnabled(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6700,7 +6699,7 @@ static PyObject *_wrap_Log_EnableLogging(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7142,7 +7141,7 @@ static PyObject *_wrap_Log_GetVerbose(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7189,7 +7188,7 @@ static PyObject *_wrap_Log_IsAllowedTraceMask(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7548,7 +7547,7 @@ static PyObject *_wrap_LogWindow_IsPassingMessages(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7692,7 +7691,7 @@ static PyObject *_wrap_LogChain_IsPassingMessages(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8264,23 +8263,11 @@ static PyObject *_wrap_LogTrace(PyObject *self, PyObject *args) { 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; - } + _v = PyString_Check(argv[0]) || PyUnicode_Check(argv[0]); } if (_v) { { - void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxString, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } + _v = PyString_Check(argv[1]) || PyUnicode_Check(argv[1]); } if (_v) { return _wrap_LogTrace__SWIG_1(self,args); @@ -8300,13 +8287,7 @@ static PyObject *_wrap_LogTrace(PyObject *self, PyObject *args) { } if (_v) { { - void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxString, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } + _v = PyString_Check(argv[1]) || PyUnicode_Check(argv[1]); } if (_v) { return _wrap_LogTrace__SWIG_0(self,args); @@ -8584,7 +8565,7 @@ static PyObject *_wrap_Process_Exists(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8780,7 +8761,7 @@ static PyObject *_wrap_Process_IsRedirected(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8942,7 +8923,7 @@ static PyObject *_wrap_Process_IsInputOpened(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8967,7 +8948,7 @@ static PyObject *_wrap_Process_IsInputAvailable(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8992,7 +8973,7 @@ static PyObject *_wrap_Process_IsErrorAvailable(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9581,7 +9562,7 @@ static PyObject *_wrap_Joystick_IsOk(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10162,7 +10143,7 @@ static PyObject *_wrap_Joystick_HasRudder(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10187,7 +10168,7 @@ static PyObject *_wrap_Joystick_HasZ(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10212,7 +10193,7 @@ static PyObject *_wrap_Joystick_HasU(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10237,7 +10218,7 @@ static PyObject *_wrap_Joystick_HasV(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10262,7 +10243,7 @@ static PyObject *_wrap_Joystick_HasPOV(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10287,7 +10268,7 @@ static PyObject *_wrap_Joystick_HasPOV4Dir(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10312,7 +10293,7 @@ static PyObject *_wrap_Joystick_HasPOVCTS(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10348,7 +10329,7 @@ static PyObject *_wrap_Joystick_SetCapture(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10373,7 +10354,7 @@ static PyObject *_wrap_Joystick_ReleaseCapture(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10961,7 +10942,7 @@ static PyObject *_wrap_JoystickEvent_IsButton(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10986,7 +10967,7 @@ static PyObject *_wrap_JoystickEvent_IsMove(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11011,7 +10992,7 @@ static PyObject *_wrap_JoystickEvent_IsZMove(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11044,7 +11025,7 @@ static PyObject *_wrap_JoystickEvent_ButtonDown(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11077,7 +11058,7 @@ static PyObject *_wrap_JoystickEvent_ButtonUp(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11110,7 +11091,7 @@ static PyObject *_wrap_JoystickEvent_ButtonIsDown(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11124,19 +11105,35 @@ static PyObject * JoystickEvent_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_Wave(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_Sound__SWIG_0(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxSound *result; + + if(!PyArg_ParseTuple(args,(char *)":new_Sound")) goto fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSound *)new wxSound(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSound, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_new_Sound__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; wxString *arg1 = 0 ; - bool arg2 = (bool) False ; - wxWave *result; + bool arg2 = (bool) false ; + wxSound *result; bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "fileName",(char *) "isResource", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_Wave",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"O|O:new_Sound",&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -11150,12 +11147,12 @@ static PyObject *_wrap_new_Wave(PyObject *self, PyObject *args, PyObject *kwargs } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxWave *)new wxWave((wxString const &)*arg1,arg2); + result = (wxSound *)new wxSound((wxString const &)*arg1,arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxWave, 1); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSound, 1); { if (temp1) delete arg1; @@ -11170,54 +11167,111 @@ static PyObject *_wrap_new_Wave(PyObject *self, PyObject *args, PyObject *kwargs } -static PyObject *_wrap_new_WaveData(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_Sound__SWIG_2(PyObject *self, PyObject *args) { PyObject *resultobj; - wxString *arg1 = 0 ; - wxWave *result; - bool temp1 = False ; + int arg1 ; + wxByte *arg2 = (wxByte *) 0 ; + wxSound *result; PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "data", NULL - }; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_WaveData",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:new_Sound",&obj0,&obj1)) goto fail; { - arg1 = wxString_in_helper(obj0); - if (arg1 == NULL) SWIG_fail; - temp1 = True; + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; } + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxByte,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxWave *)new_wxWave((wxString const &)*arg1); + result = (wxSound *)new wxSound(arg1,(wxByte const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxWave, 1); - { - if (temp1) - delete arg1; - } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSound, 1); return resultobj; fail: - { - if (temp1) - delete arg1; + return NULL; +} + + +static PyObject *_wrap_new_Sound(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 == 0) { + return _wrap_new_Sound__SWIG_0(self,args); } + if ((argc >= 1) && (argc <= 2)) { + int _v; + { + _v = PyString_Check(argv[0]) || PyUnicode_Check(argv[0]); + } + if (_v) { + if (argc <= 1) { + return _wrap_new_Sound__SWIG_1(self,args); + } + { + SWIG_PyObj_AsBool(argv[1]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_new_Sound__SWIG_1(self,args); + } + } + } + if (argc == 2) { + int _v; + { + SWIG_PyObj_AsInt(argv[0]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + void *ptr; + if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxByte, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_new_Sound__SWIG_2(self,args); + } + } + } + + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_Sound'"); return NULL; } -static PyObject *_wrap_delete_Wave(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_delete_Sound(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxWave *arg1 = (wxWave *) 0 ; + wxSound *arg1 = (wxSound *) 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Wave",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWave,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Sound",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSound,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -11232,76 +11286,292 @@ static PyObject *_wrap_delete_Wave(PyObject *self, PyObject *args, PyObject *kwa } -static PyObject *_wrap_Wave_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Sound_Create__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; - wxWave *arg1 = (wxWave *) 0 ; + wxSound *arg1 = (wxSound *) 0 ; + wxString *arg2 = 0 ; + bool arg3 = (bool) false ; bool result; + bool temp2 = False ; PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Wave_IsOk",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWave,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:Sound_Create",&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSound,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + if (obj2) { + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxWave const *)arg1)->IsOk(); + result = (bool)(arg1)->Create((wxString const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + if (temp2) + delete arg2; + } return resultobj; fail: + { + if (temp2) + delete arg2; + } return NULL; } -static PyObject *_wrap_Wave_Play(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Sound_Create__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; - wxWave *arg1 = (wxWave *) 0 ; - bool arg2 = (bool) True ; - bool arg3 = (bool) False ; + wxSound *arg1 = (wxSound *) 0 ; + int arg2 ; + wxByte *arg3 = (wxByte *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OOO:Sound_Create",&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSound,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxByte,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->Create(arg2,(wxByte const *)arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Sound_Create(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[4]; + int ii; + + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 3); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if ((argc >= 2) && (argc <= 3)) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxSound, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + _v = PyString_Check(argv[1]) || PyUnicode_Check(argv[1]); + } + if (_v) { + if (argc <= 2) { + return _wrap_Sound_Create__SWIG_0(self,args); + } + { + SWIG_PyObj_AsBool(argv[2]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_Sound_Create__SWIG_0(self,args); + } + } + } + } + if (argc == 3) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxSound, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + SWIG_PyObj_AsInt(argv[1]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + void *ptr; + if (SWIG_ConvertPtr(argv[2], (void **) &ptr, SWIGTYPE_p_wxByte, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_Sound_Create__SWIG_1(self,args); + } + } + } + } + + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'Sound_Create'"); + return NULL; +} + + +static PyObject *_wrap_Sound_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxSound *arg1 = (wxSound *) 0 ; + bool result; + PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "async",(char *) "looped", NULL + (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Wave_Play",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWave,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sound_IsOk",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSound,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->IsOk(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Sound_Play(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxSound *arg1 = (wxSound *) 0 ; + unsigned int arg2 = (unsigned int) wxSOUND_ASYNC ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"O|O:Sound_Play",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSound,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } } - if (obj2) { + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxSound const *)arg1)->Play(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Sound_PlaySound(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxString *arg1 = 0 ; + unsigned int arg2 = (unsigned int) wxSOUND_ASYNC ; + bool result; + bool temp1 = False ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"O|O:Sound_PlaySound",&obj0,&obj1)) goto fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = True; + } + if (obj1) { { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Play(arg2,arg3); + result = (bool)wxSound::Play((wxString const &)*arg1,arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + if (temp1) + delete arg1; + } + return resultobj; + fail: + { + if (temp1) + delete arg1; + } + return NULL; +} + + +static PyObject *_wrap_Sound_Stop(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + char *kwnames[] = { + NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":Sound_Stop",kwnames)) goto fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxSound::Stop(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject * Wave_swigregister(PyObject *self, PyObject *args) { +static PyObject * Sound_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxWave, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxSound, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } @@ -11395,6 +11665,7 @@ static PyObject *_wrap_new_FileTypeInfoSequence(PyObject *self, PyObject *args, PyObject *resultobj; wxArrayString *arg1 = 0 ; wxFileTypeInfo *result; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "sArray", NULL @@ -11407,6 +11678,7 @@ static PyObject *_wrap_new_FileTypeInfoSequence(PyObject *self, PyObject *args, SWIG_fail; } arg1 = new wxArrayString; + temp1 = True; int i, len=PySequence_Length(obj0); for (i=0; ioperator ==(arg2); + result = (bool)((wxDataFormat const *)arg1)->operator ==((wxDataFormatId )arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23211,17 +23497,17 @@ static PyObject *_wrap_DataFormat___ne____SWIG_0(PyObject *self, PyObject *args) if(!PyArg_ParseTuple(args,(char *)"OO:DataFormat___ne__",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = (int) SWIG_PyObj_AsInt(obj1); + arg2 = (wxDataFormatId) SWIG_PyObj_AsInt(obj1); if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxDataFormat const *)arg1)->operator !=(arg2); + result = (bool)((wxDataFormat const *)arg1)->operator !=((wxDataFormatId )arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23249,7 +23535,7 @@ static PyObject *_wrap_DataFormat___eq____SWIG_1(PyObject *self, PyObject *args) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23344,7 +23630,7 @@ static PyObject *_wrap_DataFormat___ne____SWIG_1(PyObject *self, PyObject *args) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23691,7 +23977,7 @@ static PyObject *_wrap_DataObject_IsSupported(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23791,7 +24077,7 @@ static PyObject *_wrap_DataObject_GetDataHere(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23831,7 +24117,7 @@ static PyObject *_wrap_DataObject_SetData(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24638,7 +24924,7 @@ static PyObject *_wrap_CustomDataObject_SetData(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24911,7 +25197,7 @@ static PyObject *_wrap_IsDragResultOk(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25178,7 +25464,7 @@ static PyObject *_wrap_DropSource_base_GiveFeedback(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25465,7 +25751,7 @@ static PyObject *_wrap_DropTarget_base_OnDrop(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25490,7 +25776,7 @@ static PyObject *_wrap_DropTarget_GetData(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25696,7 +25982,7 @@ static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25945,7 +26231,7 @@ static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26066,7 +26352,7 @@ static PyObject *_wrap_Clipboard_Open(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26115,7 +26401,7 @@ static PyObject *_wrap_Clipboard_IsOpened(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26143,7 +26429,7 @@ static PyObject *_wrap_Clipboard_AddData(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26171,7 +26457,7 @@ static PyObject *_wrap_Clipboard_SetData(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26202,7 +26488,7 @@ static PyObject *_wrap_Clipboard_IsSupported(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26233,7 +26519,7 @@ static PyObject *_wrap_Clipboard_GetData(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26282,7 +26568,7 @@ static PyObject *_wrap_Clipboard_Flush(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26411,7 +26697,7 @@ static PyObject *_wrap_ClipboardLocker___nonzero__(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26756,12 +27042,14 @@ static PyMethodDef SwigMethods[] = { { (char *)"JoystickEvent_ButtonUp", (PyCFunction) _wrap_JoystickEvent_ButtonUp, METH_VARARGS | METH_KEYWORDS }, { (char *)"JoystickEvent_ButtonIsDown", (PyCFunction) _wrap_JoystickEvent_ButtonIsDown, METH_VARARGS | METH_KEYWORDS }, { (char *)"JoystickEvent_swigregister", JoystickEvent_swigregister, METH_VARARGS }, - { (char *)"new_Wave", (PyCFunction) _wrap_new_Wave, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_WaveData", (PyCFunction) _wrap_new_WaveData, METH_VARARGS | METH_KEYWORDS }, - { (char *)"delete_Wave", (PyCFunction) _wrap_delete_Wave, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Wave_IsOk", (PyCFunction) _wrap_Wave_IsOk, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Wave_Play", (PyCFunction) _wrap_Wave_Play, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Wave_swigregister", Wave_swigregister, METH_VARARGS }, + { (char *)"new_Sound", _wrap_new_Sound, METH_VARARGS }, + { (char *)"delete_Sound", (PyCFunction) _wrap_delete_Sound, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Sound_Create", _wrap_Sound_Create, METH_VARARGS }, + { (char *)"Sound_IsOk", (PyCFunction) _wrap_Sound_IsOk, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Sound_Play", _wrap_Sound_Play, METH_VARARGS }, + { (char *)"Sound_PlaySound", _wrap_Sound_PlaySound, METH_VARARGS }, + { (char *)"Sound_Stop", (PyCFunction) _wrap_Sound_Stop, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Sound_swigregister", Sound_swigregister, METH_VARARGS }, { (char *)"new_FileTypeInfo", (PyCFunction) _wrap_new_FileTypeInfo, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_FileTypeInfoSequence", (PyCFunction) _wrap_new_FileTypeInfoSequence, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_NullFileTypeInfo", (PyCFunction) _wrap_new_NullFileTypeInfo, METH_VARARGS | METH_KEYWORDS }, @@ -27697,7 +27985,6 @@ static swig_type_info _swigt__p_wxDateTime__TimeZone[] = {{"_p_wxDateTime__TimeZ static swig_type_info _swigt__p_wxMenu[] = {{"_p_wxMenu", 0, "wxMenu *", 0},{"_p_wxMenu"},{0}}; static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent},{"_p_wxTimerEvent", _p_wxTimerEventTo_p_wxEvent},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent},{"_p_wxJoystickEvent", _p_wxJoystickEventTo_p_wxEvent},{"_p_wxEvent"},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent},{"_p_wxProcessEvent", _p_wxProcessEventTo_p_wxEvent},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent},{0}}; static swig_type_info _swigt__p_wxConfigBase[] = {{"_p_wxConfigBase", 0, "wxConfigBase *", 0},{"_p_wxFileConfig", _p_wxFileConfigTo_p_wxConfigBase},{"_p_wxConfigBase"},{"_p_wxConfig", _p_wxConfigTo_p_wxConfigBase},{0}}; -static swig_type_info _swigt__p_wxWave[] = {{"_p_wxWave", 0, "wxWave *", 0},{"_p_wxWave"},{0}}; static swig_type_info _swigt__p_wxFileType[] = {{"_p_wxFileType", 0, "wxFileType *", 0},{"_p_wxFileType"},{0}}; static swig_type_info _swigt__p_wxLogGui[] = {{"_p_wxLogGui", 0, "wxLogGui *", 0},{"_p_wxLogGui"},{0}}; static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}}; @@ -27715,15 +28002,16 @@ static swig_type_info _swigt__p_wxLogStderr[] = {{"_p_wxLogStderr", 0, "wxLogStd static swig_type_info _swigt__p_wxLogTextCtrl[] = {{"_p_wxLogTextCtrl", 0, "wxLogTextCtrl *", 0},{"_p_wxLogTextCtrl"},{0}}; static swig_type_info _swigt__p_wxTextCtrl[] = {{"_p_wxTextCtrl", 0, "wxTextCtrl *", 0},{"_p_wxTextCtrl"},{0}}; static swig_type_info _swigt__p_wxBusyCursor[] = {{"_p_wxBusyCursor", 0, "wxBusyCursor *", 0},{"_p_wxBusyCursor"},{0}}; -static swig_type_info _swigt__p_wxPyBitmapDataObject[] = {{"_p_wxPyBitmapDataObject", 0, "wxPyBitmapDataObject *", 0},{"_p_wxPyBitmapDataObject"},{0}}; static swig_type_info _swigt__p_wxPyTextDataObject[] = {{"_p_wxPyTextDataObject", 0, "wxPyTextDataObject *", 0},{"_p_wxPyTextDataObject"},{0}}; static swig_type_info _swigt__p_wxBitmapDataObject[] = {{"_p_wxBitmapDataObject", 0, "wxBitmapDataObject *", 0},{"_p_wxBitmapDataObject"},{"_p_wxPyBitmapDataObject", _p_wxPyBitmapDataObjectTo_p_wxBitmapDataObject},{0}}; static swig_type_info _swigt__p_wxTextDataObject[] = {{"_p_wxTextDataObject", 0, "wxTextDataObject *", 0},{"_p_wxTextDataObject"},{"_p_wxPyTextDataObject", _p_wxPyTextDataObjectTo_p_wxTextDataObject},{0}}; static swig_type_info _swigt__p_wxDataObject[] = {{"_p_wxDataObject", 0, "wxDataObject *", 0},{"_p_wxDataObjectSimple", _p_wxDataObjectSimpleTo_p_wxDataObject},{"_p_wxPyDataObjectSimple", _p_wxPyDataObjectSimpleTo_p_wxDataObject},{"_p_wxDataObjectComposite", _p_wxDataObjectCompositeTo_p_wxDataObject},{"_p_wxDataObject"},{"_p_wxTextDataObject", _p_wxTextDataObjectTo_p_wxDataObject},{"_p_wxPyTextDataObject", _p_wxPyTextDataObjectTo_p_wxDataObject},{"_p_wxBitmapDataObject", _p_wxBitmapDataObjectTo_p_wxDataObject},{"_p_wxPyBitmapDataObject", _p_wxPyBitmapDataObjectTo_p_wxDataObject},{"_p_wxFileDataObject", _p_wxFileDataObjectTo_p_wxDataObject},{"_p_wxCustomDataObject", _p_wxCustomDataObjectTo_p_wxDataObject},{"_p_wxMetafileDataObject", _p_wxMetafileDataObjectTo_p_wxDataObject},{"_p_wxURLDataObject", _p_wxURLDataObjectTo_p_wxDataObject},{0}}; +static swig_type_info _swigt__p_wxPyBitmapDataObject[] = {{"_p_wxPyBitmapDataObject", 0, "wxPyBitmapDataObject *", 0},{"_p_wxPyBitmapDataObject"},{0}}; static swig_type_info _swigt__p_wxFileDataObject[] = {{"_p_wxFileDataObject", 0, "wxFileDataObject *", 0},{"_p_wxFileDataObject"},{0}}; static swig_type_info _swigt__p_wxCustomDataObject[] = {{"_p_wxCustomDataObject", 0, "wxCustomDataObject *", 0},{"_p_wxCustomDataObject"},{0}}; static swig_type_info _swigt__p_wxURLDataObject[] = {{"_p_wxURLDataObject", 0, "wxURLDataObject *", 0},{"_p_wxURLDataObject"},{0}}; static swig_type_info _swigt__p_wxMetafileDataObject[] = {{"_p_wxMetafileDataObject", 0, "wxMetafileDataObject *", 0},{"_p_wxMetafileDataObject"},{0}}; +static swig_type_info _swigt__p_wxSound[] = {{"_p_wxSound", 0, "wxSound *", 0},{"_p_wxSound"},{0}}; static swig_type_info _swigt__p_wxTimerRunner[] = {{"_p_wxTimerRunner", 0, "wxTimerRunner *", 0},{"_p_wxTimerRunner"},{0}}; static swig_type_info _swigt__p_wxLogWindow[] = {{"_p_wxLogWindow", 0, "wxLogWindow *", 0},{"_p_wxLogWindow"},{0}}; static swig_type_info _swigt__p_wxTimeSpan[] = {{"_p_wxTimeSpan", 0, "wxTimeSpan *", 0},{"_p_wxTimeSpan"},{0}}; @@ -27769,6 +28057,7 @@ static swig_type_info _swigt__p_wxProcessEvent[] = {{"_p_wxProcessEvent", 0, "wx static swig_type_info _swigt__p_wxPyLog[] = {{"_p_wxPyLog", 0, "wxPyLog *", 0},{"_p_wxPyLog"},{0}}; static swig_type_info _swigt__p_wxLogNull[] = {{"_p_wxLogNull", 0, "wxLogNull *", 0},{"_p_wxLogNull"},{0}}; static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0},{"_p_wxColour"},{0}}; +static swig_type_info _swigt__p_wxByte[] = {{"_p_wxByte", 0, "wxByte *", 0},{"_p_wxByte"},{0}}; static swig_type_info _swigt__p_wxConfigPathChanger[] = {{"_p_wxConfigPathChanger", 0, "wxConfigPathChanger *", 0},{"_p_wxConfigPathChanger"},{0}}; static swig_type_info _swigt__p_wxPyTimer[] = {{"_p_wxPyTimer", 0, "wxPyTimer *", 0},{"_p_wxPyTimer"},{0}}; static swig_type_info _swigt__p_wxDateSpan[] = {{"_p_wxDateSpan", 0, "wxDateSpan *", 0},{"_p_wxDateSpan"},{0}}; @@ -27783,7 +28072,6 @@ _swigt__p_wxDateTime__TimeZone, _swigt__p_wxMenu, _swigt__p_wxEvent, _swigt__p_wxConfigBase, -_swigt__p_wxWave, _swigt__p_wxFileType, _swigt__p_wxLogGui, _swigt__p_wxFont, @@ -27801,15 +28089,16 @@ _swigt__p_wxLogStderr, _swigt__p_wxLogTextCtrl, _swigt__p_wxTextCtrl, _swigt__p_wxBusyCursor, -_swigt__p_wxPyBitmapDataObject, _swigt__p_wxPyTextDataObject, _swigt__p_wxBitmapDataObject, _swigt__p_wxTextDataObject, _swigt__p_wxDataObject, +_swigt__p_wxPyBitmapDataObject, _swigt__p_wxFileDataObject, _swigt__p_wxCustomDataObject, _swigt__p_wxURLDataObject, _swigt__p_wxMetafileDataObject, +_swigt__p_wxSound, _swigt__p_wxTimerRunner, _swigt__p_wxLogWindow, _swigt__p_wxTimeSpan, @@ -27855,6 +28144,7 @@ _swigt__p_wxProcessEvent, _swigt__p_wxPyLog, _swigt__p_wxLogNull, _swigt__p_wxColour, +_swigt__p_wxByte, _swigt__p_wxConfigPathChanger, _swigt__p_wxPyTimer, _swigt__p_wxDateSpan, @@ -28055,6 +28345,9 @@ 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,"SOUND_SYNC", SWIG_PyObj_FromInt((int)wxSOUND_SYNC)); + PyDict_SetItemString(d,"SOUND_ASYNC", SWIG_PyObj_FromInt((int)wxSOUND_ASYNC)); + PyDict_SetItemString(d,"SOUND_LOOP", SWIG_PyObj_FromInt((int)wxSOUND_LOOP)); PyDict_SetItemString(d,"MAILCAP_STANDARD", SWIG_PyObj_FromInt((int)wxMAILCAP_STANDARD)); PyDict_SetItemString(d,"MAILCAP_NETSCAPE", SWIG_PyObj_FromInt((int)wxMAILCAP_NETSCAPE)); PyDict_SetItemString(d,"MAILCAP_KDE", SWIG_PyObj_FromInt((int)wxMAILCAP_KDE)); @@ -28268,6 +28561,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"DateTime_Default_First", SWIG_PyObj_FromInt((int)wxDateTime::Default_First)); PyDict_SetItemString(d,"DateTime_Monday_First", SWIG_PyObj_FromInt((int)wxDateTime::Monday_First)); PyDict_SetItemString(d,"DateTime_Sunday_First", SWIG_PyObj_FromInt((int)wxDateTime::Sunday_First)); + SWIG_addvarlink(SWIG_globals,(char*)"DefaultDateTime",_wrap_DefaultDateTime_get, _wrap_DefaultDateTime_set); PyDict_SetItemString(d,"DF_INVALID", SWIG_PyObj_FromInt((int)wxDF_INVALID)); PyDict_SetItemString(d,"DF_TEXT", SWIG_PyObj_FromInt((int)wxDF_TEXT)); PyDict_SetItemString(d,"DF_BITMAP", SWIG_PyObj_FromInt((int)wxDF_BITMAP));