X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0220cbc1695d01a55964f31987f2fe78cf212ca1..761df41e86ceeed56d32c038a6c9f88554d4f47a:/wxPython/src/gtk/mdi.cpp diff --git a/wxPython/src/gtk/mdi.cpp b/wxPython/src/gtk/mdi.cpp index d6d8f56ebb..7f9c07fe8c 100644 --- a/wxPython/src/gtk/mdi.cpp +++ b/wxPython/src/gtk/mdi.cpp @@ -27,19 +27,21 @@ # define SWIGEXPORT(a) __declspec(dllexport) a # else # if defined(__BORLANDC__) -# define SWIGEXPORT(a) a _export +# define SWIGEXPORT(a) a _export # else -# define SWIGEXPORT(a) a +# define SWIGEXPORT(a) a # endif # endif #else -# define SWIGEXPORT(a) a +# define SWIGEXPORT(a) a #endif +#include "Python.h" + #ifdef __cplusplus extern "C" { #endif -#include "Python.h" + extern void SWIG_MakePtr(char *, void *, char *); extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *)); extern char *SWIG_GetPtr(char *, void **, char *); @@ -55,47 +57,28 @@ extern PyObject *SWIG_newvarlink(void); #include "helpers.h" -static PyObject* l_output_helper(PyObject* target, PyObject* o) { - PyObject* o2; - if (!target) { - target = o; - } else if (target == Py_None) { - Py_DECREF(Py_None); - target = o; - } else { - if (!PyList_Check(target)) { - o2 = target; - target = PyList_New(0); - PyList_Append(target, o2); - Py_XDECREF(o2); - } - PyList_Append(target,o); - Py_XDECREF(o); - } - return target; -} static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyTuple_Check(target)) { o2 = target; target = PyTuple_New(1); PyTuple_SetItem(target, 0, o2); } - o3 = PyTuple_New(1); - PyTuple_SetItem(o3, 0, o); + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, o); o2 = target; - target = PySequence_Concat(o2, o3); - Py_DECREF(o2); + target = PySequence_Concat(o2, o3); + Py_DECREF(o2); Py_DECREF(o3); } return target; @@ -210,10 +193,10 @@ static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args, PyOb return NULL; } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxMDIParentFrame *)new_wxMDIParentFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIParentFrame_p"); @@ -240,10 +223,10 @@ static PyObject *_wrap_new_wxPreMDIParentFrame(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPreMDIParentFrame",_kwnames)) return NULL; { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxMDIParentFrame *)new_wxPreMDIParentFrame(); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIParentFrame_p"); @@ -324,10 +307,10 @@ static PyObject *_wrap_wxMDIParentFrame_Create(PyObject *self, PyObject *args, P return NULL; } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (bool )wxMDIParentFrame_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,_arg7); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); { @@ -355,10 +338,10 @@ static PyObject *_wrap_wxMDIParentFrame_ActivateNext(PyObject *self, PyObject *a } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxMDIParentFrame_ActivateNext(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; @@ -383,10 +366,10 @@ static PyObject *_wrap_wxMDIParentFrame_ActivatePrevious(PyObject *self, PyObjec } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxMDIParentFrame_ActivatePrevious(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; @@ -411,10 +394,10 @@ static PyObject *_wrap_wxMDIParentFrame_ArrangeIcons(PyObject *self, PyObject *a } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxMDIParentFrame_ArrangeIcons(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; @@ -439,10 +422,10 @@ static PyObject *_wrap_wxMDIParentFrame_Cascade(PyObject *self, PyObject *args, } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxMDIParentFrame_Cascade(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; @@ -468,10 +451,10 @@ static PyObject *_wrap_wxMDIParentFrame_GetActiveChild(PyObject *self, PyObject } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxMDIChildFrame *)wxMDIParentFrame_GetActiveChild(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; }{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; @@ -496,10 +479,10 @@ static PyObject *_wrap_wxMDIParentFrame_GetClientWindow(PyObject *self, PyObject } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxMDIClientWindow *)wxMDIParentFrame_GetClientWindow(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; }{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; @@ -524,10 +507,10 @@ static PyObject *_wrap_wxMDIParentFrame_GetToolBar(PyObject *self, PyObject *arg } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxWindow *)wxMDIParentFrame_GetToolBar(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; }{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; @@ -551,10 +534,10 @@ static PyObject *_wrap_wxMDIParentFrame_Tile(PyObject *self, PyObject *args, PyO } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxMDIParentFrame_Tile(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; @@ -662,10 +645,10 @@ static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args, PyObj return NULL; } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxMDIChildFrame *)new_wxMDIChildFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIChildFrame_p"); @@ -692,10 +675,10 @@ static PyObject *_wrap_new_wxPreMDIChildFrame(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPreMDIChildFrame",_kwnames)) return NULL; { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxMDIChildFrame *)new_wxPreMDIChildFrame(); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIChildFrame_p"); @@ -776,10 +759,10 @@ static PyObject *_wrap_wxMDIChildFrame_Create(PyObject *self, PyObject *args, Py return NULL; } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (bool )wxMDIChildFrame_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,_arg7); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); { @@ -807,10 +790,10 @@ static PyObject *_wrap_wxMDIChildFrame_Activate(PyObject *self, PyObject *args, } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxMDIChildFrame_Activate(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; @@ -838,10 +821,10 @@ static PyObject *_wrap_wxMDIChildFrame_Maximize(PyObject *self, PyObject *args, } _arg1 = (bool ) tempbool1; { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxMDIChildFrame_Maximize(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; @@ -866,10 +849,10 @@ static PyObject *_wrap_wxMDIChildFrame_Restore(PyObject *self, PyObject *args, P } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxMDIChildFrame_Restore(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; @@ -921,10 +904,10 @@ static PyObject *_wrap_new_wxMDIClientWindow(PyObject *self, PyObject *args, PyO } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxMDIClientWindow *)new_wxMDIClientWindow(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIClientWindow_p"); @@ -947,10 +930,10 @@ static PyObject *_wrap_new_wxPreMDIClientWindow(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPreMDIClientWindow",_kwnames)) return NULL; { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxMDIClientWindow *)new_wxPreMDIClientWindow(); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIClientWindow_p"); @@ -991,10 +974,10 @@ static PyObject *_wrap_wxMDIClientWindow_Create(PyObject *self, PyObject *args, } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (bool )wxMDIClientWindow_Create(_arg0,_arg1,_arg2); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; @@ -1040,21 +1023,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_EBool",0}, { "_wxPrintQuality","_size_t",0}, { "_wxPrintQuality","_time_t",0}, - { "_class_wxEvtHandler","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler}, - { "_class_wxEvtHandler","_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler}, - { "_class_wxEvtHandler","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxEvtHandler}, - { "_class_wxEvtHandler","_wxMDIChildFrame",SwigwxMDIChildFrameTowxEvtHandler}, - { "_class_wxEvtHandler","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxEvtHandler}, - { "_class_wxEvtHandler","_wxMDIParentFrame",SwigwxMDIParentFrameTowxEvtHandler}, { "_byte","_unsigned_char",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, - { "_class_wxObject","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxObject}, - { "_class_wxObject","_wxMDIClientWindow",SwigwxMDIClientWindowTowxObject}, - { "_class_wxObject","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxObject}, - { "_class_wxObject","_wxMDIChildFrame",SwigwxMDIChildFrameTowxObject}, - { "_class_wxObject","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxObject}, - { "_class_wxObject","_wxMDIParentFrame",SwigwxMDIParentFrameTowxObject}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -1062,9 +1033,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, - { "_wxTopLevelWindow","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxTopLevelWindow}, { "_wxTopLevelWindow","_wxMDIChildFrame",SwigwxMDIChildFrameTowxTopLevelWindow}, - { "_wxTopLevelWindow","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxTopLevelWindow}, { "_wxTopLevelWindow","_wxMDIParentFrame",SwigwxMDIParentFrameTowxTopLevelWindow}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, @@ -1088,26 +1057,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_signed_int","_EBool",0}, { "_signed_int","_wxWindowID",0}, { "_signed_int","_int",0}, - { "_class_wxTopLevelWindow","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxTopLevelWindow}, - { "_class_wxTopLevelWindow","_wxMDIChildFrame",SwigwxMDIChildFrameTowxTopLevelWindow}, - { "_class_wxTopLevelWindow","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxTopLevelWindow}, - { "_class_wxTopLevelWindow","_wxMDIParentFrame",SwigwxMDIParentFrameTowxTopLevelWindow}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, { "_WXTYPE","_unsigned_short",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, - { "_class_wxWindow","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow}, - { "_class_wxWindow","_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow}, - { "_class_wxWindow","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxWindow}, - { "_class_wxWindow","_wxMDIChildFrame",SwigwxMDIChildFrameTowxWindow}, - { "_class_wxWindow","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxWindow}, - { "_class_wxWindow","_wxMDIParentFrame",SwigwxMDIParentFrameTowxWindow}, - { "_wxObject","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxObject}, { "_wxObject","_wxMDIClientWindow",SwigwxMDIClientWindowTowxObject}, - { "_wxObject","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxObject}, { "_wxObject","_wxMDIChildFrame",SwigwxMDIChildFrameTowxObject}, - { "_wxObject","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxObject}, { "_wxObject","_wxMDIParentFrame",SwigwxMDIParentFrameTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, @@ -1122,9 +1078,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_short","_WXTYPE",0}, { "_short","_unsigned_short",0}, { "_short","_signed_short",0}, - { "_wxFrame","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame}, { "_wxFrame","_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame}, - { "_wxFrame","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxFrame}, { "_wxFrame","_wxMDIParentFrame",SwigwxMDIParentFrameTowxFrame}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, @@ -1160,22 +1114,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, - { "_wxEvtHandler","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler}, { "_wxEvtHandler","_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler}, - { "_wxEvtHandler","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxEvtHandler}, { "_wxEvtHandler","_wxMDIChildFrame",SwigwxMDIChildFrameTowxEvtHandler}, - { "_wxEvtHandler","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxEvtHandler}, { "_wxEvtHandler","_wxMDIParentFrame",SwigwxMDIParentFrameTowxEvtHandler}, - { "_wxWindow","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow}, { "_wxWindow","_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow}, - { "_wxWindow","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxWindow}, { "_wxWindow","_wxMDIChildFrame",SwigwxMDIChildFrameTowxWindow}, - { "_wxWindow","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxWindow}, { "_wxWindow","_wxMDIParentFrame",SwigwxMDIParentFrameTowxWindow}, - { "_class_wxFrame","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame}, - { "_class_wxFrame","_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame}, - { "_class_wxFrame","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxFrame}, - { "_class_wxFrame","_wxMDIParentFrame",SwigwxMDIParentFrameTowxFrame}, {0,0,0}}; static PyObject *SWIG_globals;