From: Robin Dunn Date: Tue, 21 Nov 2006 04:03:37 +0000 (+0000) Subject: reSWIGged X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e7e9d1b87f7fafedb7d7edc9be941b80f0059a01 reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py index b6ec11b207..ef5d6cf6ff 100644 --- a/wxPython/src/gtk/_controls.py +++ b/wxPython/src/gtk/_controls.py @@ -707,14 +707,6 @@ class ComboBox(_core.Control,_core.ItemContainer): """ return _controls_.ComboBox_SetStringSelection(*args, **kwargs) - def SetString(*args, **kwargs): - """ - SetString(self, int n, String string) - - Set the label for the n'th item (zero based) in the list. - """ - return _controls_.ComboBox_SetString(*args, **kwargs) - def SetEditable(*args, **kwargs): """SetEditable(self, bool editable)""" return _controls_.ComboBox_SetEditable(*args, **kwargs) diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp index 288fb7d2c6..778024f878 100644 --- a/wxPython/src/gtk/_controls_wrap.cpp +++ b/wxPython/src/gtk/_controls_wrap.cpp @@ -6308,60 +6308,6 @@ fail: } -SWIGINTERN PyObject *_wrap_ComboBox_SetString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxComboBox *arg1 = (wxComboBox *) 0 ; - int arg2 ; - wxString *arg3 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - int val2 ; - int ecode2 = 0 ; - bool temp3 = false ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "n",(char *) "string", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ComboBox_SetString",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxComboBox, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ComboBox_SetString" "', expected argument " "1"" of type '" "wxComboBox *""'"); - } - arg1 = reinterpret_cast< wxComboBox * >(argp1); - ecode2 = SWIG_AsVal_int(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ComboBox_SetString" "', expected argument " "2"" of type '" "int""'"); - } - arg2 = static_cast< int >(val2); - { - arg3 = wxString_in_helper(obj2); - if (arg3 == NULL) SWIG_fail; - temp3 = true; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetString(arg2,(wxString const &)*arg3); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - { - if (temp3) - delete arg3; - } - return resultobj; -fail: - { - if (temp3) - delete arg3; - } - return NULL; -} - - SWIGINTERN PyObject *_wrap_ComboBox_SetEditable(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxComboBox *arg1 = (wxComboBox *) 0 ; @@ -46068,7 +46014,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"ComboBox_GetMark", (PyCFunction)_wrap_ComboBox_GetMark, METH_O, NULL}, { (char *)"ComboBox_GetCurrentSelection", (PyCFunction)_wrap_ComboBox_GetCurrentSelection, METH_O, NULL}, { (char *)"ComboBox_SetStringSelection", (PyCFunction) _wrap_ComboBox_SetStringSelection, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"ComboBox_SetString", (PyCFunction) _wrap_ComboBox_SetString, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ComboBox_SetEditable", (PyCFunction) _wrap_ComboBox_SetEditable, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ComboBox_SetInsertionPointEnd", (PyCFunction)_wrap_ComboBox_SetInsertionPointEnd, METH_O, NULL}, { (char *)"ComboBox_Remove", (PyCFunction) _wrap_ComboBox_Remove, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py index fb4a3d9259..e20c3e3909 100644 --- a/wxPython/src/gtk/_gdi.py +++ b/wxPython/src/gtk/_gdi.py @@ -4730,7 +4730,11 @@ class BufferedDC(MemoryDC): Constructs a buffered DC. """ _gdi_.BufferedDC_swiginit(self,_gdi_.new_BufferedDC(*args)) - self.__dc = args[0] # save a ref so the other dc will not be deleted before self + # save a ref so the other dc will not be deleted before self + self.__dc = args[0] + # also save a ref to the bitmap + if len(args) > 1: self.__bmp = args[1] + __swig_destroy__ = _gdi_.delete_BufferedDC __del__ = lambda self : None; @@ -4787,6 +4791,8 @@ class BufferedPaintDC(BufferedDC): window is automatically used). """ _gdi_.BufferedPaintDC_swiginit(self,_gdi_.new_BufferedPaintDC(*args, **kwargs)) + if len(args) > 1: self.__bmp = args[1] + _gdi_.BufferedPaintDC_swigregister(BufferedPaintDC) #--------------------------------------------------------------------------- diff --git a/wxPython/src/gtk/aui.py b/wxPython/src/gtk/aui.py index 4de1f4c3e8..7e7b397159 100644 --- a/wxPython/src/gtk/aui.py +++ b/wxPython/src/gtk/aui.py @@ -678,6 +678,10 @@ class AuiManager(_core.EvtHandler): """CreateFloatingFrame(self, Window parent, AuiPaneInfo p) -> AuiFloatingFrame""" return _aui.AuiManager_CreateFloatingFrame(*args, **kwargs) + def StartPaneDrag(*args, **kwargs): + """StartPaneDrag(self, Window pane_window, Point offset)""" + return _aui.AuiManager_StartPaneDrag(*args, **kwargs) + def CalculateHintRect(*args, **kwargs): """CalculateHintRect(self, Window pane_window, Point pt, Point offset) -> Rect""" return _aui.AuiManager_CalculateHintRect(*args, **kwargs) diff --git a/wxPython/src/gtk/aui_wrap.cpp b/wxPython/src/gtk/aui_wrap.cpp index 61bb06c968..33ea907462 100644 --- a/wxPython/src/gtk/aui_wrap.cpp +++ b/wxPython/src/gtk/aui_wrap.cpp @@ -8286,6 +8286,51 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiManager_StartPaneDrag(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAuiManager *arg1 = (wxAuiManager *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxPoint *arg3 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + wxPoint temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "pane_window",(char *) "offset", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:AuiManager_StartPaneDrag",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiManager, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiManager_StartPaneDrag" "', expected argument " "1"" of type '" "wxAuiManager *""'"); + } + arg1 = reinterpret_cast< wxAuiManager * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiManager_StartPaneDrag" "', expected argument " "2"" of type '" "wxWindow *""'"); + } + arg2 = reinterpret_cast< wxWindow * >(argp2); + { + arg3 = &temp3; + if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->StartPaneDrag(arg2,(wxPoint const &)*arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_AuiManager_CalculateHintRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiManager *arg1 = (wxAuiManager *) 0 ; @@ -15963,6 +16008,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiManager_LoadPerspective", (PyCFunction) _wrap_AuiManager_LoadPerspective, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_Update", (PyCFunction)_wrap_AuiManager_Update, METH_O, NULL}, { (char *)"AuiManager_CreateFloatingFrame", (PyCFunction) _wrap_AuiManager_CreateFloatingFrame, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiManager_StartPaneDrag", (PyCFunction) _wrap_AuiManager_StartPaneDrag, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_CalculateHintRect", (PyCFunction) _wrap_AuiManager_CalculateHintRect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_DrawHintRect", (PyCFunction) _wrap_AuiManager_DrawHintRect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_ShowHint", (PyCFunction) _wrap_AuiManager_ShowHint, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py index b6b3a2fcfe..68a5b6d2c4 100644 --- a/wxPython/src/mac/_gdi.py +++ b/wxPython/src/mac/_gdi.py @@ -4729,7 +4729,11 @@ class BufferedDC(MemoryDC): Constructs a buffered DC. """ _gdi_.BufferedDC_swiginit(self,_gdi_.new_BufferedDC(*args)) - self.__dc = args[0] # save a ref so the other dc will not be deleted before self + # save a ref so the other dc will not be deleted before self + self.__dc = args[0] + # also save a ref to the bitmap + if len(args) > 1: self.__bmp = args[1] + __swig_destroy__ = _gdi_.delete_BufferedDC __del__ = lambda self : None; @@ -4786,6 +4790,8 @@ class BufferedPaintDC(BufferedDC): window is automatically used). """ _gdi_.BufferedPaintDC_swiginit(self,_gdi_.new_BufferedPaintDC(*args, **kwargs)) + if len(args) > 1: self.__bmp = args[1] + _gdi_.BufferedPaintDC_swigregister(BufferedPaintDC) #--------------------------------------------------------------------------- diff --git a/wxPython/src/mac/aui.py b/wxPython/src/mac/aui.py index 4de1f4c3e8..7e7b397159 100644 --- a/wxPython/src/mac/aui.py +++ b/wxPython/src/mac/aui.py @@ -678,6 +678,10 @@ class AuiManager(_core.EvtHandler): """CreateFloatingFrame(self, Window parent, AuiPaneInfo p) -> AuiFloatingFrame""" return _aui.AuiManager_CreateFloatingFrame(*args, **kwargs) + def StartPaneDrag(*args, **kwargs): + """StartPaneDrag(self, Window pane_window, Point offset)""" + return _aui.AuiManager_StartPaneDrag(*args, **kwargs) + def CalculateHintRect(*args, **kwargs): """CalculateHintRect(self, Window pane_window, Point pt, Point offset) -> Rect""" return _aui.AuiManager_CalculateHintRect(*args, **kwargs) diff --git a/wxPython/src/mac/aui_wrap.cpp b/wxPython/src/mac/aui_wrap.cpp index 8d1a3e3479..3b97719d25 100644 --- a/wxPython/src/mac/aui_wrap.cpp +++ b/wxPython/src/mac/aui_wrap.cpp @@ -8286,6 +8286,51 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiManager_StartPaneDrag(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAuiManager *arg1 = (wxAuiManager *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxPoint *arg3 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + wxPoint temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "pane_window",(char *) "offset", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:AuiManager_StartPaneDrag",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiManager, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiManager_StartPaneDrag" "', expected argument " "1"" of type '" "wxAuiManager *""'"); + } + arg1 = reinterpret_cast< wxAuiManager * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiManager_StartPaneDrag" "', expected argument " "2"" of type '" "wxWindow *""'"); + } + arg2 = reinterpret_cast< wxWindow * >(argp2); + { + arg3 = &temp3; + if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->StartPaneDrag(arg2,(wxPoint const &)*arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_AuiManager_CalculateHintRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiManager *arg1 = (wxAuiManager *) 0 ; @@ -15963,6 +16008,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiManager_LoadPerspective", (PyCFunction) _wrap_AuiManager_LoadPerspective, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_Update", (PyCFunction)_wrap_AuiManager_Update, METH_O, NULL}, { (char *)"AuiManager_CreateFloatingFrame", (PyCFunction) _wrap_AuiManager_CreateFloatingFrame, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiManager_StartPaneDrag", (PyCFunction) _wrap_AuiManager_StartPaneDrag, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_CalculateHintRect", (PyCFunction) _wrap_AuiManager_CalculateHintRect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_DrawHintRect", (PyCFunction) _wrap_AuiManager_DrawHintRect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_ShowHint", (PyCFunction) _wrap_AuiManager_ShowHint, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py index d46b6526a1..c578e7fd6f 100644 --- a/wxPython/src/msw/_gdi.py +++ b/wxPython/src/msw/_gdi.py @@ -4823,7 +4823,11 @@ class BufferedDC(MemoryDC): Constructs a buffered DC. """ _gdi_.BufferedDC_swiginit(self,_gdi_.new_BufferedDC(*args)) - self.__dc = args[0] # save a ref so the other dc will not be deleted before self + # save a ref so the other dc will not be deleted before self + self.__dc = args[0] + # also save a ref to the bitmap + if len(args) > 1: self.__bmp = args[1] + __swig_destroy__ = _gdi_.delete_BufferedDC __del__ = lambda self : None; @@ -4880,6 +4884,8 @@ class BufferedPaintDC(BufferedDC): window is automatically used). """ _gdi_.BufferedPaintDC_swiginit(self,_gdi_.new_BufferedPaintDC(*args, **kwargs)) + if len(args) > 1: self.__bmp = args[1] + _gdi_.BufferedPaintDC_swigregister(BufferedPaintDC) #--------------------------------------------------------------------------- diff --git a/wxPython/src/msw/aui.py b/wxPython/src/msw/aui.py index 4de1f4c3e8..7e7b397159 100644 --- a/wxPython/src/msw/aui.py +++ b/wxPython/src/msw/aui.py @@ -678,6 +678,10 @@ class AuiManager(_core.EvtHandler): """CreateFloatingFrame(self, Window parent, AuiPaneInfo p) -> AuiFloatingFrame""" return _aui.AuiManager_CreateFloatingFrame(*args, **kwargs) + def StartPaneDrag(*args, **kwargs): + """StartPaneDrag(self, Window pane_window, Point offset)""" + return _aui.AuiManager_StartPaneDrag(*args, **kwargs) + def CalculateHintRect(*args, **kwargs): """CalculateHintRect(self, Window pane_window, Point pt, Point offset) -> Rect""" return _aui.AuiManager_CalculateHintRect(*args, **kwargs) diff --git a/wxPython/src/msw/aui_wrap.cpp b/wxPython/src/msw/aui_wrap.cpp index 61bb06c968..33ea907462 100644 --- a/wxPython/src/msw/aui_wrap.cpp +++ b/wxPython/src/msw/aui_wrap.cpp @@ -8286,6 +8286,51 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiManager_StartPaneDrag(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAuiManager *arg1 = (wxAuiManager *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxPoint *arg3 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + wxPoint temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "pane_window",(char *) "offset", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:AuiManager_StartPaneDrag",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiManager, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiManager_StartPaneDrag" "', expected argument " "1"" of type '" "wxAuiManager *""'"); + } + arg1 = reinterpret_cast< wxAuiManager * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiManager_StartPaneDrag" "', expected argument " "2"" of type '" "wxWindow *""'"); + } + arg2 = reinterpret_cast< wxWindow * >(argp2); + { + arg3 = &temp3; + if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->StartPaneDrag(arg2,(wxPoint const &)*arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_AuiManager_CalculateHintRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiManager *arg1 = (wxAuiManager *) 0 ; @@ -15963,6 +16008,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiManager_LoadPerspective", (PyCFunction) _wrap_AuiManager_LoadPerspective, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_Update", (PyCFunction)_wrap_AuiManager_Update, METH_O, NULL}, { (char *)"AuiManager_CreateFloatingFrame", (PyCFunction) _wrap_AuiManager_CreateFloatingFrame, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiManager_StartPaneDrag", (PyCFunction) _wrap_AuiManager_StartPaneDrag, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_CalculateHintRect", (PyCFunction) _wrap_AuiManager_CalculateHintRect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_DrawHintRect", (PyCFunction) _wrap_AuiManager_DrawHintRect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_ShowHint", (PyCFunction) _wrap_AuiManager_ShowHint, METH_VARARGS | METH_KEYWORDS, NULL},