X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f98d1209a3f941c7a001cc2e7c78c237a4629e6..d32b901bac42e4f8833720fd6eee60de7d870e0d:/wxPython/src/gtk/_core_wrap.cpp diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index a21764239c..e57f83b554 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -1605,7 +1605,8 @@ static wxPySizerItemInfo wxPySizerItemTypeHelper(PyObject* item, bool checkSize, } void wxSizer__setOORInfo(wxSizer *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } void wxSizer_Add(wxSizer *self,PyObject *item,int proportion,int flag,int border,PyObject *userData){ @@ -11783,9 +11784,7 @@ static PyObject *_wrap_new_EvtHandler(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxEvtHandler, 1); return resultobj; fail: return NULL; @@ -19492,9 +19491,7 @@ static PyObject *_wrap_new_PyApp(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyApp, 1); return resultobj; fail: return NULL; @@ -21520,9 +21517,7 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindow, 1); { if (temp6) delete arg6; @@ -21553,9 +21548,7 @@ static PyObject *_wrap_new_PreWindow(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindow, 1); return resultobj; fail: return NULL; @@ -28499,9 +28492,7 @@ static PyObject *_wrap_new_Validator(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxValidator, 1); return resultobj; fail: return NULL; @@ -28852,9 +28843,7 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMenu, 1); { if (temp1) delete arg1; @@ -31039,9 +31028,7 @@ static PyObject *_wrap_new_MenuBar(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMenuBar, 1); return resultobj; fail: return NULL; @@ -33016,9 +33003,7 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxControl, 1); { if (temp7) delete arg7; @@ -33049,9 +33034,7 @@ static PyObject *_wrap_new_PreControl(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxControl, 1); return resultobj; fail: return NULL; @@ -42820,6 +42803,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"MOUSE_BTN_RIGHT", SWIG_FromInt((int)wxMOUSE_BTN_RIGHT)); PyDict_SetItemString(d,"UPDATE_UI_PROCESS_ALL", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_ALL)); PyDict_SetItemString(d,"UPDATE_UI_PROCESS_SPECIFIED", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_SPECIFIED)); + PyDict_SetItemString(d,"NavigationKeyEvent_IsBackward", SWIG_FromInt((int)wxNavigationKeyEvent::IsBackward)); PyDict_SetItemString(d,"NavigationKeyEvent_IsForward", SWIG_FromInt((int)wxNavigationKeyEvent::IsForward)); PyDict_SetItemString(d,"NavigationKeyEvent_WinChange", SWIG_FromInt((int)wxNavigationKeyEvent::WinChange)); PyDict_SetItemString(d,"IDLE_PROCESS_ALL", SWIG_FromInt((int)wxIDLE_PROCESS_ALL));