X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6932ae68881f5ad02cf9eeccecff0ea67792add9..3a9becbd5439254a77e7dbc0278d80117a397264:/wxPython/src/msw/_misc_wrap.cpp diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp index 70cbaf3f16..067c8b6963 100644 --- a/wxPython/src/msw/_misc_wrap.cpp +++ b/wxPython/src/msw/_misc_wrap.cpp @@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj) PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received", type, otype); } - Py_DECREF(str); + if (str) + Py_DECREF(str); return; } } @@ -1356,86 +1357,87 @@ SWIG_Python_GetTypeList() { #define SWIGTYPE_p_wxCaret swig_types[15] #define SWIGTYPE_ptrdiff_t swig_types[16] #define SWIGTYPE_std__ptrdiff_t swig_types[17] -#define SWIGTYPE_p_int swig_types[18] -#define SWIGTYPE_p_wxSize swig_types[19] -#define SWIGTYPE_p_wxClipboard swig_types[20] -#define SWIGTYPE_p_wxStopWatch swig_types[21] -#define SWIGTYPE_p_wxDC swig_types[22] -#define SWIGTYPE_p_wxClipboardLocker swig_types[23] -#define SWIGTYPE_p_wxIcon swig_types[24] -#define SWIGTYPE_p_wxLogStderr swig_types[25] -#define SWIGTYPE_p_wxLogTextCtrl swig_types[26] -#define SWIGTYPE_p_wxTextCtrl swig_types[27] -#define SWIGTYPE_p_wxBusyCursor 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_wxPyTextDataObject swig_types[32] -#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[33] -#define SWIGTYPE_p_wxFileDataObject swig_types[34] -#define SWIGTYPE_p_wxCustomDataObject swig_types[35] -#define SWIGTYPE_p_wxURLDataObject swig_types[36] -#define SWIGTYPE_p_wxMetafileDataObject swig_types[37] -#define SWIGTYPE_p_wxSound swig_types[38] -#define SWIGTYPE_p_wxTimerRunner swig_types[39] -#define SWIGTYPE_p_wxLogWindow swig_types[40] -#define SWIGTYPE_p_wxTimeSpan swig_types[41] -#define SWIGTYPE_p_wxArrayString swig_types[42] -#define SWIGTYPE_p_wxWindowDisabler swig_types[43] -#define SWIGTYPE_p_form_ops_t swig_types[44] -#define SWIGTYPE_p_wxToolTip swig_types[45] -#define SWIGTYPE_p_wxDataObjectComposite swig_types[46] -#define SWIGTYPE_p_wxSystemSettings swig_types[47] -#define SWIGTYPE_p_wxFileConfig swig_types[48] -#define SWIGTYPE_p_wxVideoMode swig_types[49] -#define SWIGTYPE_p_wxDataObjectSimple swig_types[50] -#define SWIGTYPE_p_wxPyDataObjectSimple swig_types[51] -#define SWIGTYPE_p_wxDuplexMode swig_types[52] -#define SWIGTYPE_p_wxEvtHandler swig_types[53] -#define SWIGTYPE_p_wxRect swig_types[54] -#define SWIGTYPE_p_char swig_types[55] -#define SWIGTYPE_p_wxSingleInstanceChecker swig_types[56] -#define SWIGTYPE_p_wxStandardPaths swig_types[57] -#define SWIGTYPE_p_wxFileTypeInfo swig_types[58] -#define SWIGTYPE_p_wxFrame swig_types[59] -#define SWIGTYPE_p_wxTimer swig_types[60] -#define SWIGTYPE_p_wxPaperSize swig_types[61] -#define SWIGTYPE_p_wxMimeTypesManager swig_types[62] -#define SWIGTYPE_p_wxPyArtProvider swig_types[63] -#define SWIGTYPE_p_wxPyTipProvider swig_types[64] -#define SWIGTYPE_p_wxTipProvider swig_types[65] -#define SWIGTYPE_p_wxJoystick swig_types[66] -#define SWIGTYPE_p_wxSystemOptions swig_types[67] -#define SWIGTYPE_p_wxPoint swig_types[68] -#define SWIGTYPE_p_wxJoystickEvent swig_types[69] -#define SWIGTYPE_p_wxCursor swig_types[70] -#define SWIGTYPE_p_wxObject swig_types[71] -#define SWIGTYPE_p_wxOutputStream swig_types[72] -#define SWIGTYPE_p_wxDateTime swig_types[73] -#define SWIGTYPE_p_wxPyDropSource swig_types[74] -#define SWIGTYPE_p_unsigned_long swig_types[75] -#define SWIGTYPE_p_wxKillError swig_types[76] -#define SWIGTYPE_p_wxWindow swig_types[77] -#define SWIGTYPE_p_wxString swig_types[78] -#define SWIGTYPE_p_wxPyProcess swig_types[79] -#define SWIGTYPE_p_wxBitmap swig_types[80] -#define SWIGTYPE_p_wxConfig swig_types[81] +#define SWIGTYPE_p_void swig_types[18] +#define SWIGTYPE_p_int swig_types[19] +#define SWIGTYPE_p_wxSize swig_types[20] +#define SWIGTYPE_p_wxClipboard swig_types[21] +#define SWIGTYPE_p_wxStopWatch swig_types[22] +#define SWIGTYPE_p_wxDC swig_types[23] +#define SWIGTYPE_p_wxClipboardLocker swig_types[24] +#define SWIGTYPE_p_wxIcon swig_types[25] +#define SWIGTYPE_p_wxLogStderr swig_types[26] +#define SWIGTYPE_p_wxLogTextCtrl swig_types[27] +#define SWIGTYPE_p_wxTextCtrl swig_types[28] +#define SWIGTYPE_p_wxBusyCursor swig_types[29] +#define SWIGTYPE_p_wxBitmapDataObject swig_types[30] +#define SWIGTYPE_p_wxTextDataObject swig_types[31] +#define SWIGTYPE_p_wxDataObject swig_types[32] +#define SWIGTYPE_p_wxPyTextDataObject swig_types[33] +#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[34] +#define SWIGTYPE_p_wxFileDataObject swig_types[35] +#define SWIGTYPE_p_wxCustomDataObject swig_types[36] +#define SWIGTYPE_p_wxURLDataObject swig_types[37] +#define SWIGTYPE_p_wxMetafileDataObject swig_types[38] +#define SWIGTYPE_p_wxSound swig_types[39] +#define SWIGTYPE_p_wxTimerRunner swig_types[40] +#define SWIGTYPE_p_wxLogWindow swig_types[41] +#define SWIGTYPE_p_wxTimeSpan swig_types[42] +#define SWIGTYPE_p_wxArrayString swig_types[43] +#define SWIGTYPE_p_wxWindowDisabler swig_types[44] +#define SWIGTYPE_p_form_ops_t swig_types[45] +#define SWIGTYPE_p_wxToolTip swig_types[46] +#define SWIGTYPE_p_wxDataObjectComposite swig_types[47] +#define SWIGTYPE_p_wxSystemSettings swig_types[48] +#define SWIGTYPE_p_wxFileConfig swig_types[49] +#define SWIGTYPE_p_wxVideoMode swig_types[50] +#define SWIGTYPE_p_wxDataObjectSimple swig_types[51] +#define SWIGTYPE_p_wxPyDataObjectSimple swig_types[52] +#define SWIGTYPE_p_wxDuplexMode swig_types[53] +#define SWIGTYPE_p_wxEvtHandler swig_types[54] +#define SWIGTYPE_p_wxRect swig_types[55] +#define SWIGTYPE_p_char swig_types[56] +#define SWIGTYPE_p_wxSingleInstanceChecker swig_types[57] +#define SWIGTYPE_p_wxStandardPaths swig_types[58] +#define SWIGTYPE_p_wxFileTypeInfo swig_types[59] +#define SWIGTYPE_p_wxFrame swig_types[60] +#define SWIGTYPE_p_wxTimer swig_types[61] +#define SWIGTYPE_p_wxPaperSize swig_types[62] +#define SWIGTYPE_p_wxMimeTypesManager swig_types[63] +#define SWIGTYPE_p_wxPyArtProvider swig_types[64] +#define SWIGTYPE_p_wxPyTipProvider swig_types[65] +#define SWIGTYPE_p_wxTipProvider swig_types[66] +#define SWIGTYPE_p_wxJoystick swig_types[67] +#define SWIGTYPE_p_wxSystemOptions swig_types[68] +#define SWIGTYPE_p_wxPoint swig_types[69] +#define SWIGTYPE_p_wxJoystickEvent swig_types[70] +#define SWIGTYPE_p_wxCursor swig_types[71] +#define SWIGTYPE_p_wxObject swig_types[72] +#define SWIGTYPE_p_wxOutputStream swig_types[73] +#define SWIGTYPE_p_wxDateTime swig_types[74] +#define SWIGTYPE_p_wxPyDropSource swig_types[75] +#define SWIGTYPE_p_unsigned_long swig_types[76] +#define SWIGTYPE_p_wxKillError swig_types[77] +#define SWIGTYPE_p_wxWindow swig_types[78] +#define SWIGTYPE_p_wxString swig_types[79] +#define SWIGTYPE_p_wxPyProcess swig_types[80] +#define SWIGTYPE_p_wxBitmap swig_types[81] #define SWIGTYPE_unsigned_int swig_types[82] #define SWIGTYPE_p_unsigned_int swig_types[83] -#define SWIGTYPE_p_unsigned_char swig_types[84] -#define SWIGTYPE_p_wxChar swig_types[85] -#define SWIGTYPE_p_wxBusyInfo swig_types[86] -#define SWIGTYPE_p_wxPyDropTarget swig_types[87] -#define SWIGTYPE_p_wxPyTextDropTarget swig_types[88] -#define SWIGTYPE_p_wxPyFileDropTarget swig_types[89] -#define SWIGTYPE_p_wxProcessEvent swig_types[90] -#define SWIGTYPE_p_wxPyLog swig_types[91] -#define SWIGTYPE_p_wxLogNull swig_types[92] -#define SWIGTYPE_p_wxColour swig_types[93] -#define SWIGTYPE_p_wxPyTimer swig_types[94] -#define SWIGTYPE_p_wxConfigPathChanger swig_types[95] -#define SWIGTYPE_p_wxDateSpan swig_types[96] -static swig_type_info *swig_types[98]; +#define SWIGTYPE_p_wxConfig swig_types[84] +#define SWIGTYPE_p_unsigned_char swig_types[85] +#define SWIGTYPE_p_wxChar swig_types[86] +#define SWIGTYPE_p_wxBusyInfo swig_types[87] +#define SWIGTYPE_p_wxPyDropTarget swig_types[88] +#define SWIGTYPE_p_wxPyTextDropTarget swig_types[89] +#define SWIGTYPE_p_wxPyFileDropTarget swig_types[90] +#define SWIGTYPE_p_wxProcessEvent swig_types[91] +#define SWIGTYPE_p_wxPyLog swig_types[92] +#define SWIGTYPE_p_wxLogNull swig_types[93] +#define SWIGTYPE_p_wxColour swig_types[94] +#define SWIGTYPE_p_wxPyTimer swig_types[95] +#define SWIGTYPE_p_wxConfigPathChanger swig_types[96] +#define SWIGTYPE_p_wxDateSpan swig_types[97] +static swig_type_info *swig_types[99]; /* -------- TYPES TABLE (END) -------- */ @@ -1701,6 +1703,16 @@ SWIGINTERNSHORT PyObject* } + void* wxGetXDisplay() + { +#ifdef __WXGTK__ + return wxGetDisplay(); +#else + return NULL; +#endif + } + + bool wxThread_IsMain() { #ifdef WXP_WITH_THREAD return wxThread::IsMain(); @@ -1841,7 +1853,7 @@ wxPyTimer::wxPyTimer(wxEvtHandler *owner, int id) void wxPyTimer::Notify() { bool found; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "Notify"))) wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); wxPyEndBlockThreads(blocked); @@ -2047,7 +2059,7 @@ public: virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t) { bool found; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DoLog"))) { PyObject* s = wx2PyString(szString); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iOi)", level, s, t)); @@ -2060,7 +2072,7 @@ public: virtual void DoLogString(const wxChar *szString, time_t t) { bool found; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DoLogString"))) { PyObject* s = wx2PyString(szString); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", s, t)); @@ -2088,7 +2100,7 @@ IMP_PYCALLBACK_VOID_INTINT( wxPyProcess, wxProcess, OnTerminate); class wxJoystick : public wxObject { public: wxJoystick(int joystick = wxJOYSTICK1) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, "wxJoystick is not available on this platform."); wxPyEndBlockThreads(blocked); @@ -2151,19 +2163,19 @@ class wxSound : public wxObject { public: wxSound() { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, "wxSound is not available on this platform."); wxPyEndBlockThreads(blocked); } wxSound(const wxString&/*, bool*/) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, "wxSound is not available on this platform."); wxPyEndBlockThreads(blocked); } wxSound(int, const wxByte*) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, "wxSound is not available on this platform."); wxPyEndBlockThreads(blocked); @@ -2191,7 +2203,7 @@ static wxSound *new_wxSound(PyObject *data){ unsigned char* buffer; int size; wxSound *sound = NULL; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (!PyArg_Parse(data, "t#", &buffer, &size)) goto done; sound = new wxSound(size, buffer); @@ -2205,7 +2217,7 @@ static bool wxSound_CreateFromData(wxSound *self,PyObject *data){ int size; bool rv = false; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (!PyArg_Parse(data, "t#", &buffer, &size)) goto done; rv = self->Create(size, buffer); @@ -2213,7 +2225,7 @@ static bool wxSound_CreateFromData(wxSound *self,PyObject *data){ wxPyEndBlockThreads(blocked); return rv; #else - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, "Create from data is not available on this platform."); wxPyEndBlockThreads(blocked); @@ -2260,7 +2272,7 @@ static PyObject *wxFileType_GetIconInfo(wxFileType *self){ iconIndex = loc.GetIndex(); // Make a tuple and put the values in it - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* tuple = PyTuple_New(3); PyTuple_SetItem(tuple, 0, wxPyConstructObject(new wxIcon(loc), wxT("wxIcon"), true)); @@ -2298,7 +2310,7 @@ static PyObject *wxFileType_GetAllCommands(wxFileType *self,wxString const &file wxArrayString commands; if (self->GetAllCommands(&verbs, &commands, wxFileType::MessageParameters(filename, mimetype))) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* tuple = PyTuple_New(2); PyTuple_SetItem(tuple, 0, wxArrayString2PyList_helper(verbs)); PyTuple_SetItem(tuple, 1, wxArrayString2PyList_helper(commands)); @@ -2370,6 +2382,7 @@ static PyObject *wxMimeTypesManager_EnumAllFileTypes(wxMimeTypesManager *self){ static const wxString wxPyART_CUT(wxART_CUT); static const wxString wxPyART_PASTE(wxART_PASTE); static const wxString wxPyART_DELETE(wxART_DELETE); + static const wxString wxPyART_NEW(wxART_NEW); static const wxString wxPyART_UNDO(wxART_UNDO); static const wxString wxPyART_REDO(wxART_REDO); static const wxString wxPyART_QUIT(wxART_QUIT); @@ -2383,7 +2396,7 @@ public: const wxArtClient& client, const wxSize& size) { wxBitmap rval = wxNullBitmap; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((wxPyCBH_findCallback(m_myInst, "CreateBitmap"))) { PyObject* so = wxPyConstructObject((void*)&size, wxT("wxSize"), 0); PyObject* ro; @@ -2519,7 +2532,7 @@ static PyObject *DateTime_GetAmPmStrings(){ wxString am; wxString pm; wxDateTime::GetAmPmStrings(&am, &pm); - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, wx2PyString(am)); PyTuple_SET_ITEM(tup, 1, wx2PyString(pm)); @@ -2625,7 +2638,7 @@ static PyObject *wxDataObject_GetAllFormats(wxDataObject *self,wxDataObject::Dir wxDataFormat* formats = new wxDataFormat[count]; self->GetAllFormats(formats, dir); - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* list = PyList_New(count); for (size_t i=0; iGetDataSize(format); - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (size) { char* buf = new char[size]; if (self->GetDataHere(format, buf)) @@ -2656,7 +2669,7 @@ static PyObject *wxDataObject_GetDataHere(wxDataObject *self,wxDataFormat const } static bool wxDataObject_SetData(wxDataObject *self,wxDataFormat const &format,PyObject *data){ bool rval; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (PyString_Check(data)) { rval = self->SetData(format, PyString_Size(data), PyString_AsString(data)); } @@ -2671,7 +2684,7 @@ static bool wxDataObject_SetData(wxDataObject *self,wxDataFormat const &format,P static PyObject *wxDataObjectSimple_GetDataHere(wxDataObjectSimple *self){ PyObject* rval = NULL; size_t size = self->GetDataSize(); - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (size) { char* buf = new char[size]; if (self->GetDataHere(buf)) @@ -2687,7 +2700,7 @@ static PyObject *wxDataObjectSimple_GetDataHere(wxDataObjectSimple *self){ } static bool wxDataObjectSimple_SetData(wxDataObjectSimple *self,PyObject *data){ bool rval; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (PyString_Check(data)) { rval = self->SetData(PyString_Size(data), PyString_AsString(data)); } @@ -2720,7 +2733,7 @@ bool wxPyDataObjectSimple::GetDataHere(void *buf) const { // C++ version. bool rval = false; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "GetDataHere")) { PyObject* ro; ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); @@ -2739,7 +2752,7 @@ bool wxPyDataObjectSimple::SetData(size_t len, const void *buf) const{ // For this one we simply need to make a string from buf and len // and send it to the Python method. bool rval = false; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "SetData")) { PyObject* data = PyString_FromStringAndSize((char*)buf, len); rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", data)); @@ -2779,7 +2792,7 @@ public: wxBitmap wxPyBitmapDataObject::GetBitmap() const { wxBitmap* rval = &wxNullBitmap; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "GetBitmap")) { PyObject* ro; wxBitmap* ptr; @@ -2795,7 +2808,7 @@ wxBitmap wxPyBitmapDataObject::GetBitmap() const { } void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "SetBitmap")) { PyObject* bo = wxPyConstructObject((void*)&bitmap, wxT("wxBitmap"), false); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", bo)); @@ -2809,7 +2822,7 @@ static wxCustomDataObject *new_wxCustomDataObject__SWIG_1(wxString const &format } static bool wxCustomDataObject_SetData(wxCustomDataObject *self,PyObject *data){ bool rval; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (PyString_Check(data)) { rval = self->SetData(PyString_Size(data), PyString_AsString(data)); } @@ -2823,7 +2836,7 @@ static bool wxCustomDataObject_SetData(wxCustomDataObject *self,PyObject *data){ } static PyObject *wxCustomDataObject_GetData(wxCustomDataObject *self){ PyObject* obj; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); obj = PyString_FromStringAndSize((char*)self->GetData(), self->GetSize()); wxPyEndBlockThreads(blocked); return obj; @@ -2884,7 +2897,7 @@ public: bool wxPyFileDropTarget::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames) { bool rval = false; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "OnDropFiles")) { PyObject* list = wxArrayString2PyList_helper(filenames); rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",x,y,list)); @@ -2957,7 +2970,7 @@ public: static PyObject *wxDisplay_GetModes(wxDisplay *self,wxVideoMode const &mode=wxDefaultVideoMode){ PyObject* pyList = NULL; wxArrayVideoModes arr = self->GetModes(mode); - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); pyList = PyList_New(0); for (int i=0; i < arr.GetCount(); i++) { wxVideoMode* m = new wxVideoMode(arr.Item(i)); @@ -3433,6 +3446,46 @@ static PyObject *_wrap_SystemOptions_HasOption(PyObject *, PyObject *args, PyObj } +static PyObject *_wrap_SystemOptions_IsFalse(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxString *arg1 = 0 ; + bool result; + bool temp1 = false ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "name", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemOptions_IsFalse",kwnames,&obj0)) goto fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)wxSystemOptions::IsFalse((wxString const &)*arg1); + + 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 * SystemOptions_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -5820,6 +5873,29 @@ static PyObject *_wrap_SetCursor(PyObject *, PyObject *args, PyObject *kwargs) { } +static PyObject *_wrap_GetXDisplay(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + void *result; + char *kwnames[] = { + NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":GetXDisplay",kwnames)) goto fail; + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (void *)wxGetXDisplay(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_void, 0); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_BeginBusyCursor(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCursor *arg1 = (wxCursor *) wxHOURGLASS_CURSOR ; @@ -5966,6 +6042,46 @@ static PyObject *_wrap_GetTopLevelParent(PyObject *, PyObject *args, PyObject *k } +static PyObject *_wrap_LaunchDefaultBrowser(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxString *arg1 = 0 ; + bool result; + bool temp1 = false ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "url", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LaunchDefaultBrowser",kwnames,&obj0)) goto fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)wxLaunchDefaultBrowser((wxString const &)*arg1); + + 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_GetKeyState(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxKeyCode arg1 ; @@ -13750,15 +13866,11 @@ static PyObject *_wrap_new_FileTypeInfoSequence(PyObject *, PyObject *args, PyOb int i, len=PySequence_Length(obj0); for (i=0; iAdd(Py2wxString(str)); + arg1->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } { @@ -16368,6 +16480,26 @@ static PyObject *_wrap_ART_DELETE_get(void) { } +static int _wrap_ART_NEW_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable ART_NEW is read-only."); + return 1; +} + + +static PyObject *_wrap_ART_NEW_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyART_NEW)->c_str(), (&wxPyART_NEW)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyART_NEW)->c_str(), (&wxPyART_NEW)->Len()); +#endif + } + return pyobj; +} + + static int _wrap_ART_UNDO_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_UNDO is read-only."); return 1; @@ -16743,7 +16875,7 @@ static PyObject *_wrap_ArtProvider_GetIcon(PyObject *, PyObject *args, PyObject } -static PyObject *_wrap_ArtProvider_GetSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_ArtProvider_GetSizeHint(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; bool arg2 = (bool) false ; @@ -16755,7 +16887,7 @@ static PyObject *_wrap_ArtProvider_GetSize(PyObject *, PyObject *args, PyObject (char *) "client",(char *) "platform_dependent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ArtProvider_GetSize",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ArtProvider_GetSizeHint",kwnames,&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -16769,7 +16901,7 @@ static PyObject *_wrap_ArtProvider_GetSize(PyObject *, PyObject *args, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = wxPyArtProvider::GetSize((wxString const &)*arg1,arg2); + result = wxPyArtProvider::GetSizeHint((wxString const &)*arg1,arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -16860,7 +16992,7 @@ static PyObject *_wrap_ConfigBase_Set(PyObject *, PyObject *args, PyObject *kwar }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ConfigBase_Set",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxConfigBase, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxConfigBase, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29157,6 +29289,63 @@ static PyObject *_wrap_DropTarget_GetData(PyObject *, PyObject *args, PyObject * } +static PyObject *_wrap_DropTarget_SetDefaultAction(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ; + wxDragResult arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "action", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DropTarget_SetDefaultAction",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDropTarget, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (wxDragResult)(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetDefaultAction((wxDragResult )arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_DropTarget_GetDefaultAction(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ; + wxDragResult result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DropTarget_GetDefaultAction",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDropTarget, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxDragResult)(arg1)->GetDefaultAction(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int((result)); + return resultobj; + fail: + return NULL; +} + + static PyObject * DropTarget_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -31397,6 +31586,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"SystemOptions_GetOption", (PyCFunction) _wrap_SystemOptions_GetOption, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SystemOptions_GetOptionInt", (PyCFunction) _wrap_SystemOptions_GetOptionInt, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SystemOptions_HasOption", (PyCFunction) _wrap_SystemOptions_HasOption, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SystemOptions_IsFalse", (PyCFunction) _wrap_SystemOptions_IsFalse, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SystemOptions_swigregister", SystemOptions_swigregister, METH_VARARGS, NULL}, { (char *)"NewId", (PyCFunction) _wrap_NewId, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"RegisterId", (PyCFunction) _wrap_RegisterId, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -31450,11 +31640,13 @@ static PyMethodDef SwigMethods[] = { { (char *)"ClientDisplayRect", (PyCFunction) _wrap_ClientDisplayRect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GetClientDisplayRect", (PyCFunction) _wrap_GetClientDisplayRect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SetCursor", (PyCFunction) _wrap_SetCursor, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"GetXDisplay", (PyCFunction) _wrap_GetXDisplay, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BeginBusyCursor", (PyCFunction) _wrap_BeginBusyCursor, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GetActiveWindow", (PyCFunction) _wrap_GetActiveWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GenericFindWindowAtPoint", (PyCFunction) _wrap_GenericFindWindowAtPoint, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"FindWindowAtPoint", (PyCFunction) _wrap_FindWindowAtPoint, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GetTopLevelParent", (PyCFunction) _wrap_GetTopLevelParent, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"LaunchDefaultBrowser", (PyCFunction) _wrap_LaunchDefaultBrowser, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GetKeyState", (PyCFunction) _wrap_GetKeyState, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"WakeUpMainThread", (PyCFunction) _wrap_WakeUpMainThread, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MutexGuiEnter", (PyCFunction) _wrap_MutexGuiEnter, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -31773,7 +31965,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ArtProvider_RemoveProvider", (PyCFunction) _wrap_ArtProvider_RemoveProvider, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ArtProvider_GetBitmap", (PyCFunction) _wrap_ArtProvider_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ArtProvider_GetIcon", (PyCFunction) _wrap_ArtProvider_GetIcon, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"ArtProvider_GetSize", (PyCFunction) _wrap_ArtProvider_GetSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ArtProvider_GetSizeHint", (PyCFunction) _wrap_ArtProvider_GetSizeHint, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ArtProvider_Destroy", (PyCFunction) _wrap_ArtProvider_Destroy, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ArtProvider_swigregister", ArtProvider_swigregister, METH_VARARGS, NULL}, { (char *)"delete_ConfigBase", (PyCFunction) _wrap_delete_ConfigBase, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -32109,6 +32301,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"DropTarget_base_OnLeave", (PyCFunction) _wrap_DropTarget_base_OnLeave, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DropTarget_base_OnDrop", (PyCFunction) _wrap_DropTarget_base_OnDrop, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DropTarget_GetData", (PyCFunction) _wrap_DropTarget_GetData, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DropTarget_SetDefaultAction", (PyCFunction) _wrap_DropTarget_SetDefaultAction, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DropTarget_GetDefaultAction", (PyCFunction) _wrap_DropTarget_GetDefaultAction, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DropTarget_swigregister", DropTarget_swigregister, METH_VARARGS, NULL}, { (char *)"new_TextDropTarget", (PyCFunction) _wrap_new_TextDropTarget, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TextDropTarget__setCallbackInfo", (PyCFunction) _wrap_TextDropTarget__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -32721,6 +32915,7 @@ static swig_type_info _swigt__p_wxTimerEvent[] = {{"_p_wxTimerEvent", 0, "wxTime static swig_type_info _swigt__p_wxCaret[] = {{"_p_wxCaret", 0, "wxCaret *", 0, 0, 0, 0},{"_p_wxCaret", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__ptrdiff_t[] = {{"_ptrdiff_t", 0, "ptrdiff_t", 0, 0, 0, 0},{"_ptrdiff_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__std__ptrdiff_t[] = {{"_std__ptrdiff_t", 0, "std::ptrdiff_t", 0, 0, 0, 0},{"_std__ptrdiff_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_void[] = {{"_p_void", 0, "void *", 0, 0, 0, 0},{"_p_void", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0, 0, 0, 0},{"_p_wxSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxClipboard[] = {{"_p_wxClipboard", 0, "wxClipboard *", 0, 0, 0, 0},{"_p_wxClipboard", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -32784,9 +32979,9 @@ static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0 static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0, 0, 0, 0},{"_p_wxString", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyProcess[] = {{"_p_wxPyProcess", 0, "wxPyProcess *", 0, 0, 0, 0},{"_p_wxPyProcess", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0, 0, 0, 0},{"_p_wxBitmap", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxConfig[] = {{"_p_wxConfig", 0, "wxConfig *", 0, 0, 0, 0},{"_p_wxConfig", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__unsigned_int[] = {{"_unsigned_int", 0, "unsigned int|std::size_t", 0, 0, 0, 0},{"_unsigned_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_unsigned_int[] = {{"_p_unsigned_int", 0, "unsigned int *|time_t *", 0, 0, 0, 0},{"_p_unsigned_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxConfig[] = {{"_p_wxConfig", 0, "wxConfig *", 0, 0, 0, 0},{"_p_wxConfig", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *|byte *", 0, 0, 0, 0},{"_p_unsigned_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxChar[] = {{"_p_wxChar", 0, "wxChar *", 0, 0, 0, 0},{"_p_wxChar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxBusyInfo[] = {{"_p_wxBusyInfo", 0, "wxBusyInfo *", 0, 0, 0, 0},{"_p_wxBusyInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -32820,6 +33015,7 @@ _swigt__p_wxTimerEvent, _swigt__p_wxCaret, _swigt__ptrdiff_t, _swigt__std__ptrdiff_t, +_swigt__p_void, _swigt__p_int, _swigt__p_wxSize, _swigt__p_wxClipboard, @@ -32883,9 +33079,9 @@ _swigt__p_wxWindow, _swigt__p_wxString, _swigt__p_wxPyProcess, _swigt__p_wxBitmap, -_swigt__p_wxConfig, _swigt__unsigned_int, _swigt__p_unsigned_int, +_swigt__p_wxConfig, _swigt__p_unsigned_char, _swigt__p_wxChar, _swigt__p_wxBusyInfo, @@ -33798,6 +33994,7 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"ART_CUT",_wrap_ART_CUT_get, _wrap_ART_CUT_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_PASTE",_wrap_ART_PASTE_get, _wrap_ART_PASTE_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_DELETE",_wrap_ART_DELETE_get, _wrap_ART_DELETE_set); + SWIG_addvarlink(SWIG_globals,(char*)"ART_NEW",_wrap_ART_NEW_get, _wrap_ART_NEW_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_UNDO",_wrap_ART_UNDO_get, _wrap_ART_UNDO_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_REDO",_wrap_ART_REDO_get, _wrap_ART_REDO_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_QUIT",_wrap_ART_QUIT_get, _wrap_ART_QUIT_set);