X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6923d0a94792d9fae2f4292d842ab723464b599b..2af70455c52fd2addc6f1c612f8ae5ec7e1f138d:/wxPython/src/gtk/_misc_wrap.cpp diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp index a2d4b18bc2..a61cfd0b5a 100644 --- a/wxPython/src/gtk/_misc_wrap.cpp +++ b/wxPython/src/gtk/_misc_wrap.cpp @@ -421,6 +421,9 @@ SWIG_CheckInt(PyObject* obj) } } + +#include + static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr); static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); @@ -1021,6 +1024,7 @@ PyObject *wxMimeTypesManager_EnumAllFileTypes(wxMimeTypesManager *self){ static const wxString wxPyART_CMN_DIALOG(wxART_CMN_DIALOG); static const wxString wxPyART_HELP_BROWSER(wxART_HELP_BROWSER); static const wxString wxPyART_MESSAGE_BOX(wxART_MESSAGE_BOX); + static const wxString wxPyART_BUTTON(wxART_BUTTON); static const wxString wxPyART_OTHER(wxART_OTHER); static const wxString wxPyART_ADD_BOOKMARK(wxART_ADD_BOOKMARK); static const wxString wxPyART_DEL_BOOKMARK(wxART_DEL_BOOKMARK); @@ -1643,7 +1647,7 @@ static PyObject *_wrap_SystemSettings_GetColour(PyObject *self, PyObject *args, result = wxSystemSettings::GetColour((wxSystemColour )arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { wxColour * resultptr; @@ -1674,7 +1678,7 @@ static PyObject *_wrap_SystemSettings_GetFont(PyObject *self, PyObject *args, Py result = wxSystemSettings::GetFont((wxSystemFont )arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { wxFont * resultptr; @@ -1705,7 +1709,7 @@ static PyObject *_wrap_SystemSettings_GetMetric(PyObject *self, PyObject *args, result = (int)wxSystemSettings::GetMetric((wxSystemMetric )arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_FromInt((int)result); return resultobj; @@ -1732,7 +1736,7 @@ static PyObject *_wrap_SystemSettings_HasFeature(PyObject *self, PyObject *args, result = (bool)wxSystemSettings::HasFeature((wxSystemFeature )arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); @@ -1757,7 +1761,7 @@ static PyObject *_wrap_SystemSettings_GetScreenType(PyObject *self, PyObject *ar result = (int)wxSystemSettings::GetScreenType(); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_FromInt((int)result); return resultobj; @@ -1783,7 +1787,7 @@ static PyObject *_wrap_SystemSettings_SetScreenType(PyObject *self, PyObject *ar wxSystemSettings::SetScreenType((wxSystemScreenType )arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -2186,7 +2190,7 @@ static PyObject *_wrap_Bell(PyObject *self, PyObject *args, PyObject *kwargs) { wxBell(); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -2208,7 +2212,7 @@ static PyObject *_wrap_EndBusyCursor(PyObject *self, PyObject *args, PyObject *k wxEndBusyCursor(); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -2264,7 +2268,7 @@ static PyObject *_wrap_GetMousePosition(PyObject *self, PyObject *args, PyObject wxGetMousePosition(arg1,arg2); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; { @@ -2501,7 +2505,7 @@ static PyObject *_wrap_Shutdown(PyObject *self, PyObject *args, PyObject *kwargs result = (bool)wxShutdown((wxShutdownFlags )arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); @@ -2537,7 +2541,7 @@ static PyObject *_wrap_Sleep(PyObject *self, PyObject *args, PyObject *kwargs) { } -static PyObject *_wrap_Usleep(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_MilliSleep(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; unsigned long arg1 ; PyObject * obj0 = 0 ; @@ -2545,12 +2549,37 @@ static PyObject *_wrap_Usleep(PyObject *self, PyObject *args, PyObject *kwargs) (char *) "milliseconds", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Usleep",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MilliSleep",kwnames,&obj0)) goto fail; + arg1 = (unsigned long) SWIG_AsUnsignedLong(obj0); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxMilliSleep(arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_MicroSleep(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + unsigned long arg1 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "microseconds", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MicroSleep",kwnames,&obj0)) goto fail; arg1 = (unsigned long) SWIG_AsUnsignedLong(obj0); if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxUsleep(arg1); + wxMicroSleep(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2982,7 +3011,7 @@ static PyObject *_wrap_FileSelector(PyObject *self, PyObject *args, PyObject *kw result = wxFileSelector((wxString const &)*arg1,(wxString const &)*arg2,(wxString const &)*arg3,(wxString const &)*arg4,(wxString const &)*arg5,arg6,arg7,arg8,arg9); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { #if wxUSE_UNICODE @@ -3084,7 +3113,7 @@ static PyObject *_wrap_LoadFileSelector(PyObject *self, PyObject *args, PyObject result = wxLoadFileSelector((wxString const &)*arg1,(wxString const &)*arg2,(wxString const &)*arg3,arg4); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { #if wxUSE_UNICODE @@ -3170,7 +3199,7 @@ static PyObject *_wrap_SaveFileSelector(PyObject *self, PyObject *args, PyObject result = wxSaveFileSelector((wxString const &)*arg1,(wxString const &)*arg2,(wxString const &)*arg3,arg4); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { #if wxUSE_UNICODE @@ -3267,7 +3296,7 @@ static PyObject *_wrap_DirSelector(PyObject *self, PyObject *args, PyObject *kwa result = wxDirSelector((wxString const &)*arg1,(wxString const &)*arg2,arg3,(wxPoint const &)*arg4,arg5); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { #if wxUSE_UNICODE @@ -3366,7 +3395,7 @@ static PyObject *_wrap_GetTextFromUser(PyObject *self, PyObject *args, PyObject result = wxGetTextFromUser((wxString const &)*arg1,(wxString const &)*arg2,(wxString const &)*arg3,arg4,arg5,arg6,arg7); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { #if wxUSE_UNICODE @@ -3455,7 +3484,7 @@ static PyObject *_wrap_GetPasswordFromUser(PyObject *self, PyObject *args, PyObj result = wxGetPasswordFromUser((wxString const &)*arg1,(wxString const &)*arg2,(wxString const &)*arg3,arg4); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { #if wxUSE_UNICODE @@ -3568,7 +3597,7 @@ static PyObject *_wrap_GetSingleChoice(PyObject *self, PyObject *args, PyObject result = wxGetSingleChoice((wxString const &)*arg1,(wxString const &)*arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { #if wxUSE_UNICODE @@ -3679,7 +3708,7 @@ static PyObject *_wrap_GetSingleChoiceIndex(PyObject *self, PyObject *args, PyOb result = (int)wxGetSingleChoiceIndex((wxString const &)*arg1,(wxString const &)*arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_FromInt((int)result); { @@ -3767,7 +3796,7 @@ static PyObject *_wrap_MessageBox(PyObject *self, PyObject *args, PyObject *kwar result = (int)wxMessageBox((wxString const &)*arg1,(wxString const &)*arg2,arg3,arg4,arg5,arg6); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_FromInt((int)result); { @@ -3862,7 +3891,7 @@ static PyObject *_wrap_GetNumberFromUser(PyObject *self, PyObject *args, PyObjec result = (long)wxGetNumberFromUser((wxString const &)*arg1,(wxString const &)*arg2,(wxString const &)*arg3,arg4,arg5,arg6,arg7,(wxPoint const &)*arg8); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_FromLong((long)result); { @@ -3909,7 +3938,7 @@ static PyObject *_wrap_ColourDisplay(PyObject *self, PyObject *args, PyObject *k result = (bool)wxColourDisplay(); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); @@ -3934,7 +3963,7 @@ static PyObject *_wrap_DisplayDepth(PyObject *self, PyObject *args, PyObject *kw result = (int)wxDisplayDepth(); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_FromInt((int)result); return resultobj; @@ -3957,7 +3986,7 @@ static PyObject *_wrap_GetDisplayDepth(PyObject *self, PyObject *args, PyObject result = (int)wxGetDisplayDepth(); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_FromInt((int)result); return resultobj; @@ -3985,7 +4014,7 @@ static PyObject *_wrap_DisplaySize(PyObject *self, PyObject *args, PyObject *kwa wxDisplaySize(arg1,arg2); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; { @@ -4016,7 +4045,7 @@ static PyObject *_wrap_GetDisplaySize(PyObject *self, PyObject *args, PyObject * result = wxGetDisplaySize(); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { wxSize * resultptr; @@ -4048,7 +4077,7 @@ static PyObject *_wrap_DisplaySizeMM(PyObject *self, PyObject *args, PyObject *k wxDisplaySizeMM(arg1,arg2); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; { @@ -4079,7 +4108,7 @@ static PyObject *_wrap_GetDisplaySizeMM(PyObject *self, PyObject *args, PyObject result = wxGetDisplaySizeMM(); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { wxSize * resultptr; @@ -4117,7 +4146,7 @@ static PyObject *_wrap_ClientDisplayRect(PyObject *self, PyObject *args, PyObjec wxClientDisplayRect(arg1,arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; { @@ -4156,7 +4185,7 @@ static PyObject *_wrap_GetClientDisplayRect(PyObject *self, PyObject *args, PyOb result = wxGetClientDisplayRect(); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { wxRect * resultptr; @@ -4191,7 +4220,7 @@ static PyObject *_wrap_SetCursor(PyObject *self, PyObject *args, PyObject *kwarg wxSetCursor(*arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -4219,7 +4248,7 @@ static PyObject *_wrap_BeginBusyCursor(PyObject *self, PyObject *args, PyObject wxBeginBusyCursor(arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -4242,10 +4271,10 @@ static PyObject *_wrap_GetActiveWindow(PyObject *self, PyObject *args, PyObject result = (wxWindow *)wxGetActiveWindow(); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -4274,10 +4303,10 @@ static PyObject *_wrap_GenericFindWindowAtPoint(PyObject *self, PyObject *args, result = (wxWindow *)wxGenericFindWindowAtPoint((wxPoint const &)*arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -4306,10 +4335,10 @@ static PyObject *_wrap_FindWindowAtPoint(PyObject *self, PyObject *args, PyObjec result = (wxWindow *)wxFindWindowAtPoint((wxPoint const &)*arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -4335,10 +4364,10 @@ static PyObject *_wrap_GetTopLevelParent(PyObject *self, PyObject *args, PyObjec result = (wxWindow *)wxGetTopLevelParent(arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -4364,7 +4393,7 @@ static PyObject *_wrap_GetKeyState(PyObject *self, PyObject *args, PyObject *kwa result = (bool)wxGetKeyState((wxKeyCode )arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); @@ -4388,7 +4417,7 @@ static PyObject *_wrap_WakeUpMainThread(PyObject *self, PyObject *args, PyObject wxWakeUpMainThread(); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -4410,7 +4439,7 @@ static PyObject *_wrap_MutexGuiEnter(PyObject *self, PyObject *args, PyObject *k wxMutexGuiEnter(); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -4432,7 +4461,7 @@ static PyObject *_wrap_MutexGuiLeave(PyObject *self, PyObject *args, PyObject *k wxMutexGuiLeave(); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -4455,7 +4484,7 @@ static PyObject *_wrap_new_MutexGuiLocker(PyObject *self, PyObject *args, PyObje result = (wxMutexGuiLocker *)new wxMutexGuiLocker(); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMutexGuiLocker, 1); return resultobj; @@ -4542,10 +4571,10 @@ static PyObject *_wrap_new_ToolTip(PyObject *self, PyObject *args, PyObject *kwa result = (wxToolTip *)new wxToolTip((wxString const &)*arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 1); } { if (temp1) @@ -4654,7 +4683,7 @@ static PyObject *_wrap_ToolTip_GetWindow(PyObject *self, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -4744,7 +4773,7 @@ static PyObject *_wrap_new_Caret(PyObject *self, PyObject *args, PyObject *kwarg result = (wxCaret *)new wxCaret(arg1,(wxSize const &)*arg2); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxCaret, 1); return resultobj; @@ -4992,7 +5021,7 @@ static PyObject *_wrap_Caret_GetWindow(PyObject *self, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -5260,7 +5289,7 @@ static PyObject *_wrap_new_BusyCursor(PyObject *self, PyObject *args, PyObject * result = (wxBusyCursor *)new wxBusyCursor(arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBusyCursor, 1); return resultobj; @@ -5321,7 +5350,7 @@ static PyObject *_wrap_new_WindowDisabler(PyObject *self, PyObject *args, PyObje result = (wxWindowDisabler *)new wxWindowDisabler(arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindowDisabler, 1); return resultobj; @@ -5384,7 +5413,7 @@ static PyObject *_wrap_new_BusyInfo(PyObject *self, PyObject *args, PyObject *kw result = (wxBusyInfo *)new wxBusyInfo((wxString const &)*arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBusyInfo, 1); { @@ -5572,20 +5601,26 @@ static PyObject * StopWatch_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_FileHistory(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 = (int) 9 ; + int arg2 = (int) wxID_FILE1 ; wxFileHistory *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "maxFiles", NULL + (char *) "maxFiles",(char *) "idBase", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_FileHistory",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_FileHistory",kwnames,&obj0,&obj1)) goto fail; if (obj0) { arg1 = (int) SWIG_AsInt(obj0); if (PyErr_Occurred()) SWIG_fail; } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxFileHistory *)new wxFileHistory(arg1); + result = (wxFileHistory *)new wxFileHistory(arg1,arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -6437,7 +6472,7 @@ static PyObject *_wrap_ShowTip(PyObject *self, PyObject *args, PyObject *kwargs) result = (bool)wxShowTip(arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); @@ -6474,7 +6509,7 @@ static PyObject *_wrap_CreateFileTipProvider(PyObject *self, PyObject *args, PyO result = (wxTipProvider *)wxCreateFileTipProvider((wxString const &)*arg1,arg2); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTipProvider, 1); { @@ -6517,7 +6552,7 @@ static PyObject *_wrap_new_Timer(PyObject *self, PyObject *args, PyObject *kwarg result = (wxPyTimer *)new wxPyTimer(arg1,arg2); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTimer, 1); return resultobj; @@ -6643,7 +6678,7 @@ static PyObject *_wrap_Timer_GetOwner(PyObject *self, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -6918,7 +6953,7 @@ static PyObject *_wrap_new_TimerRunner__SWIG_0(PyObject *self, PyObject *args) { result = (wxTimerRunner *)new wxTimerRunner(*arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTimerRunner, 1); return resultobj; @@ -6957,7 +6992,7 @@ static PyObject *_wrap_new_TimerRunner__SWIG_1(PyObject *self, PyObject *args) { result = (wxTimerRunner *)new wxTimerRunner(*arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTimerRunner, 1); return resultobj; @@ -7951,7 +7986,7 @@ static PyObject *_wrap_LogWindow_GetFrame(PyObject *self, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -9672,7 +9707,7 @@ static PyObject *_wrap_Execute(PyObject *self, PyObject *args, PyObject *kwargs) result = (long)wxExecute((wxString const &)*arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_FromLong((long)result); { @@ -9709,7 +9744,7 @@ static PyObject *_wrap_new_Joystick(PyObject *self, PyObject *args, PyObject *kw result = (wxJoystick *)new wxJoystick(arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxJoystick, 1); return resultobj; @@ -11656,7 +11691,7 @@ static PyObject *_wrap_new_Sound(PyObject *self, PyObject *args, PyObject *kwarg result = (wxSound *)new_wxSound((wxString const &)*arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSound, 1); { @@ -11690,7 +11725,7 @@ static PyObject *_wrap_new_SoundFromData(PyObject *self, PyObject *args, PyObjec result = (wxSound *)new_wxSound(arg1); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxSound, 1); return resultobj; @@ -11851,7 +11886,7 @@ static PyObject *_wrap_Sound_Play(PyObject *self, PyObject *args, PyObject *kwar result = (bool)((wxSound const *)arg1)->Play(arg2); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); @@ -11890,7 +11925,7 @@ static PyObject *_wrap_Sound_PlaySound(PyObject *self, PyObject *args, PyObject result = (bool)wxSound::Play((wxString const &)*arg1,arg2); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); @@ -11922,7 +11957,7 @@ static PyObject *_wrap_Sound_Stop(PyObject *self, PyObject *args, PyObject *kwar wxSound::Stop(); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -13766,6 +13801,26 @@ static PyObject *_wrap_ART_MESSAGE_BOX_get() { } +static int _wrap_ART_BUTTON_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable ART_BUTTON is read-only."); + return 1; +} + + +static PyObject *_wrap_ART_BUTTON_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyART_BUTTON)->c_str(), (&wxPyART_BUTTON)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyART_BUTTON)->c_str(), (&wxPyART_BUTTON)->Len()); +#endif + } + return pyobj; +} + + static int _wrap_ART_OTHER_set(PyObject *_val) { PyErr_SetString(PyExc_TypeError,"Variable ART_OTHER is read-only."); return 1; @@ -14420,7 +14475,7 @@ static PyObject *_wrap_new_ArtProvider(PyObject *self, PyObject *args, PyObject result = (wxPyArtProvider *)new wxPyArtProvider(); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyArtProvider, 1); return resultobj; @@ -14580,7 +14635,7 @@ static PyObject *_wrap_ArtProvider_GetBitmap(PyObject *self, PyObject *args, PyO result = wxPyArtProvider::GetBitmap((wxString const &)*arg1,(wxString const &)*arg2,(wxSize const &)*arg3); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { wxBitmap * resultptr; @@ -14652,7 +14707,7 @@ static PyObject *_wrap_ArtProvider_GetIcon(PyObject *self, PyObject *args, PyObj result = wxPyArtProvider::GetIcon((wxString const &)*arg1,(wxString const &)*arg2,(wxSize const &)*arg3); wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + if (PyErr_Occurred()) SWIG_fail; } { wxIcon * resultptr; @@ -27203,6 +27258,28 @@ static PyObject *_wrap_Clipboard_UsePrimarySelection(PyObject *self, PyObject *a } +static PyObject *_wrap_Clipboard_Get(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxClipboard *result; + char *kwnames[] = { + NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":Clipboard_Get",kwnames)) goto fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxClipboard *)wxClipboard::Get(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxClipboard, 0); + return resultobj; + fail: + return NULL; +} + + static PyObject * Clipboard_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -27210,20 +27287,6 @@ static PyObject * Clipboard_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static int _wrap_TheClipboard_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable TheClipboard is read-only."); - return 1; -} - - -static PyObject *_wrap_TheClipboard_get() { - PyObject *pyobj; - - pyobj = SWIG_NewPointerObj((void *)(wxTheClipboard), SWIGTYPE_p_wxClipboard, 0); - return pyobj; -} - - static PyObject *_wrap_new_ClipboardLocker(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxClipboard *arg1 = (wxClipboard *) NULL ; @@ -28210,7 +28273,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"GetFreeMemory", (PyCFunction) _wrap_GetFreeMemory, METH_VARARGS | METH_KEYWORDS }, { (char *)"Shutdown", (PyCFunction) _wrap_Shutdown, METH_VARARGS | METH_KEYWORDS }, { (char *)"Sleep", (PyCFunction) _wrap_Sleep, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Usleep", (PyCFunction) _wrap_Usleep, METH_VARARGS | METH_KEYWORDS }, + { (char *)"MilliSleep", (PyCFunction) _wrap_MilliSleep, METH_VARARGS | METH_KEYWORDS }, + { (char *)"MicroSleep", (PyCFunction) _wrap_MicroSleep, METH_VARARGS | METH_KEYWORDS }, { (char *)"EnableTopLevelWindows", (PyCFunction) _wrap_EnableTopLevelWindows, METH_VARARGS | METH_KEYWORDS }, { (char *)"StripMenuCodes", (PyCFunction) _wrap_StripMenuCodes, METH_VARARGS | METH_KEYWORDS }, { (char *)"GetEmailAddress", (PyCFunction) _wrap_GetEmailAddress, METH_VARARGS | METH_KEYWORDS }, @@ -28935,6 +28999,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Clipboard_Clear", (PyCFunction) _wrap_Clipboard_Clear, METH_VARARGS | METH_KEYWORDS }, { (char *)"Clipboard_Flush", (PyCFunction) _wrap_Clipboard_Flush, METH_VARARGS | METH_KEYWORDS }, { (char *)"Clipboard_UsePrimarySelection", (PyCFunction) _wrap_Clipboard_UsePrimarySelection, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Clipboard_Get", (PyCFunction) _wrap_Clipboard_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"Clipboard_swigregister", Clipboard_swigregister, METH_VARARGS }, { (char *)"new_ClipboardLocker", (PyCFunction) _wrap_new_ClipboardLocker, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_ClipboardLocker", (PyCFunction) _wrap_delete_ClipboardLocker, METH_VARARGS | METH_KEYWORDS }, @@ -29871,6 +29936,7 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"ART_CMN_DIALOG",_wrap_ART_CMN_DIALOG_get, _wrap_ART_CMN_DIALOG_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_HELP_BROWSER",_wrap_ART_HELP_BROWSER_get, _wrap_ART_HELP_BROWSER_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_MESSAGE_BOX",_wrap_ART_MESSAGE_BOX_get, _wrap_ART_MESSAGE_BOX_set); + SWIG_addvarlink(SWIG_globals,(char*)"ART_BUTTON",_wrap_ART_BUTTON_get, _wrap_ART_BUTTON_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_OTHER",_wrap_ART_OTHER_get, _wrap_ART_OTHER_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_ADD_BOOKMARK",_wrap_ART_ADD_BOOKMARK_get, _wrap_ART_ADD_BOOKMARK_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_DEL_BOOKMARK",_wrap_ART_DEL_BOOKMARK_get, _wrap_ART_DEL_BOOKMARK_set); @@ -30112,7 +30178,6 @@ SWIGEXPORT(void) SWIG_init(void) { wxPyPtrTypeMap_Add("wxTextDropTarget", "wxPyTextDropTarget"); wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget"); - SWIG_addvarlink(SWIG_globals,(char*)"TheClipboard",_wrap_TheClipboard_get, _wrap_TheClipboard_set); SWIG_addvarlink(SWIG_globals,(char*)"DefaultVideoMode",_wrap_DefaultVideoMode_get, _wrap_DefaultVideoMode_set); }