X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dff1fa9bf58b60e356eeeccd700cae8a386d996c..746ee6b82cc8e821557cdb848ebcaef71f88ae5e:/wxPython/src/gtk/misc_wrap.cpp diff --git a/wxPython/src/gtk/misc_wrap.cpp b/wxPython/src/gtk/misc_wrap.cpp index a619b7677c..de57ca04ec 100644 --- a/wxPython/src/gtk/misc_wrap.cpp +++ b/wxPython/src/gtk/misc_wrap.cpp @@ -238,33 +238,33 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #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_wxPyBitmapDataObject swig_types[26] -#define SWIGTYPE_p_wxPyTextDataObject swig_types[27] -#define SWIGTYPE_p_wxBitmapDataObject swig_types[28] -#define SWIGTYPE_p_wxTextDataObject swig_types[29] -#define SWIGTYPE_p_wxDataObject 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_wxFileType swig_types[8] +#define SWIGTYPE_p_wxLogGui swig_types[9] +#define SWIGTYPE_p_wxFont swig_types[10] +#define SWIGTYPE_p_wxDataFormat swig_types[11] +#define SWIGTYPE_p_wxTimerEvent swig_types[12] +#define SWIGTYPE_p_wxCaret swig_types[13] +#define SWIGTYPE_p_int swig_types[14] +#define SWIGTYPE_p_wxSize swig_types[15] +#define SWIGTYPE_p_wxClipboard swig_types[16] +#define SWIGTYPE_p_wxStopWatch swig_types[17] +#define SWIGTYPE_p_wxDC swig_types[18] +#define SWIGTYPE_p_wxClipboardLocker swig_types[19] +#define SWIGTYPE_p_wxIcon swig_types[20] +#define SWIGTYPE_p_wxLogStderr swig_types[21] +#define SWIGTYPE_p_wxLogTextCtrl swig_types[22] +#define SWIGTYPE_p_wxTextCtrl swig_types[23] +#define SWIGTYPE_p_wxBusyCursor swig_types[24] +#define SWIGTYPE_p_wxPyTextDataObject swig_types[25] +#define SWIGTYPE_p_wxBitmapDataObject swig_types[26] +#define SWIGTYPE_p_wxTextDataObject swig_types[27] +#define SWIGTYPE_p_wxDataObject swig_types[28] +#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[29] +#define SWIGTYPE_p_wxFileDataObject swig_types[30] +#define SWIGTYPE_p_wxCustomDataObject swig_types[31] +#define SWIGTYPE_p_wxURLDataObject swig_types[32] +#define SWIGTYPE_p_wxMetafileDataObject swig_types[33] +#define SWIGTYPE_p_wxSound swig_types[34] #define SWIGTYPE_p_wxTimerRunner swig_types[35] #define SWIGTYPE_p_wxLogWindow swig_types[36] #define SWIGTYPE_p_wxTimeSpan swig_types[37] @@ -310,10 +310,11 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #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_wxByte 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]; /* -------- TYPES TABLE (END) -------- */ @@ -379,15 +380,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); @@ -691,38 +683,45 @@ public: #endif -#include +#include #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 @@ -1372,7 +1371,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; @@ -1658,7 +1657,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; @@ -1933,7 +1932,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; @@ -1994,7 +1993,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; @@ -2137,7 +2136,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; @@ -3574,7 +3573,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; @@ -4009,7 +4008,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; @@ -4147,7 +4146,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; @@ -4427,7 +4426,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; @@ -4452,7 +4451,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; @@ -5708,7 +5707,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; @@ -5749,7 +5748,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; @@ -6027,7 +6026,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; @@ -6236,7 +6235,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; @@ -6285,7 +6284,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; @@ -6335,7 +6334,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; @@ -6684,7 +6683,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; @@ -6714,7 +6713,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; @@ -7156,7 +7155,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; @@ -7203,7 +7202,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; @@ -7562,7 +7561,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; @@ -7706,7 +7705,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; @@ -8278,23 +8277,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); @@ -8314,13 +8301,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); @@ -8598,7 +8579,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; @@ -8794,7 +8775,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; @@ -8956,7 +8937,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; @@ -8981,7 +8962,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; @@ -9006,7 +8987,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; @@ -9595,7 +9576,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; @@ -10176,7 +10157,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; @@ -10201,7 +10182,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; @@ -10226,7 +10207,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; @@ -10251,7 +10232,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; @@ -10276,7 +10257,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; @@ -10301,7 +10282,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; @@ -10326,7 +10307,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; @@ -10362,7 +10343,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; @@ -10387,7 +10368,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; @@ -10975,7 +10956,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; @@ -11000,7 +10981,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; @@ -11025,7 +11006,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; @@ -11058,7 +11039,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; @@ -11091,7 +11072,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; @@ -11124,7 +11105,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; @@ -11138,19 +11119,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; @@ -11164,12 +11161,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; @@ -11184,54 +11181,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; @@ -11246,76 +11300,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 = 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; } - resultobj = SWIG_PyObj_FromBool((bool)result); + 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 *)""); } @@ -11409,6 +11679,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 @@ -11421,6 +11692,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; i