From 070a1e7e3b4232304fa8315f8f71b99cf01d8caf Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 8 Jan 2007 22:58:22 +0000 Subject: [PATCH] ignore things that are just defined for the sake of the preprocessor git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/aui.i | 10 +++++----- wxPython/src/gtk/aui.py | 6 ++++-- wxPython/src/gtk/aui_wrap.cpp | 34 ++++++++++++++++++++++++++++++++-- wxPython/src/mac/aui.py | 6 ++++-- wxPython/src/mac/aui_wrap.cpp | 34 ++++++++++++++++++++++++++++++++-- wxPython/src/msw/aui.py | 6 ++++-- wxPython/src/msw/aui_wrap.cpp | 34 ++++++++++++++++++++++++++++++++-- 7 files changed, 113 insertions(+), 17 deletions(-) diff --git a/wxPython/src/aui.i b/wxPython/src/aui.i index c52977fd1f..a5b3ff5f00 100755 --- a/wxPython/src/aui.i +++ b/wxPython/src/aui.i @@ -134,8 +134,13 @@ The following example shows a simple implementation that utilizes // Preprocessor stuff so SWIG doesn't get confused when %include-ing // the aui .h files. +%ignore wxUSE_AUI; +%ignore wxUSE_MENUS; +%ignore wxABI_VERSION; #define wxUSE_AUI 1 #define wxUSE_MENUS 1 +#define wxABI_VERSION 99999 + #define WXDLLIMPEXP_AUI #define unsigned #define wxDEPRECATED(decl) @@ -737,9 +742,4 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt //--------------------------------------------------------------------------- -#undef wxUSE_AUI -#undef wxUSE_MENUS -#undef WXDLLIMPEXP_AUI - -//--------------------------------------------------------------------------- diff --git a/wxPython/src/gtk/aui.py b/wxPython/src/gtk/aui.py index 2976048dd5..6e572081bf 100644 --- a/wxPython/src/gtk/aui.py +++ b/wxPython/src/gtk/aui.py @@ -154,8 +154,6 @@ import _core import _windows wx = _core __docfilter__ = wx.__DocFilter(globals()) -USE_AUI = _aui.USE_AUI -USE_MENUS = _aui.USE_MENUS AUI_DOCK_NONE = _aui.AUI_DOCK_NONE AUI_DOCK_TOP = _aui.AUI_DOCK_TOP AUI_DOCK_RIGHT = _aui.AUI_DOCK_RIGHT @@ -1437,6 +1435,10 @@ class AuiNotebook(_core.Control): """Split(self, size_t page, int direction)""" return _aui.AuiNotebook_Split(*args, **kwargs) + def GetAuiManager(*args, **kwargs): + """GetAuiManager(self) -> AuiManager""" + return _aui.AuiNotebook_GetAuiManager(*args, **kwargs) + PageCount = property(GetPageCount,doc="See `GetPageCount`") Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") _aui.AuiNotebook_swigregister(AuiNotebook) diff --git a/wxPython/src/gtk/aui_wrap.cpp b/wxPython/src/gtk/aui_wrap.cpp index 31f1faa62c..7e14284be8 100644 --- a/wxPython/src/gtk/aui_wrap.cpp +++ b/wxPython/src/gtk/aui_wrap.cpp @@ -16013,6 +16013,37 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiNotebook_GetAuiManager(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAuiNotebook *arg1 = (wxAuiNotebook *) 0 ; + wxAuiManager *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebook, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebook_GetAuiManager" "', expected argument " "1"" of type '" "wxAuiNotebook const *""'"); + } + arg1 = reinterpret_cast< wxAuiNotebook * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxAuiManager const &_result_ref = ((wxAuiNotebook const *)arg1)->GetAuiManager(); + result = (wxAuiManager *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiManager, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *AuiNotebook_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -18499,6 +18530,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiNotebook_SetSelection", (PyCFunction) _wrap_AuiNotebook_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiNotebook_GetSelection", (PyCFunction)_wrap_AuiNotebook_GetSelection, METH_O, NULL}, { (char *)"AuiNotebook_Split", (PyCFunction) _wrap_AuiNotebook_Split, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiNotebook_GetAuiManager", (PyCFunction)_wrap_AuiNotebook_GetAuiManager, METH_O, NULL}, { (char *)"AuiNotebook_swigregister", AuiNotebook_swigregister, METH_VARARGS, NULL}, { (char *)"AuiNotebook_swiginit", AuiNotebook_swiginit, METH_VARARGS, NULL}, { (char *)"new_PreAuiMDIParentFrame", (PyCFunction)_wrap_new_PreAuiMDIParentFrame, METH_NOARGS, NULL}, @@ -21342,8 +21374,6 @@ SWIGEXPORT void SWIG_init(void) { SWIG_InstallConstants(d,swig_const_table); - SWIG_Python_SetConstant(d, "USE_AUI",SWIG_From_int(static_cast< int >(1))); - SWIG_Python_SetConstant(d, "USE_MENUS",SWIG_From_int(static_cast< int >(1))); SWIG_Python_SetConstant(d, "AUI_DOCK_NONE",SWIG_From_int(static_cast< int >(wxAUI_DOCK_NONE))); SWIG_Python_SetConstant(d, "AUI_DOCK_TOP",SWIG_From_int(static_cast< int >(wxAUI_DOCK_TOP))); SWIG_Python_SetConstant(d, "AUI_DOCK_RIGHT",SWIG_From_int(static_cast< int >(wxAUI_DOCK_RIGHT))); diff --git a/wxPython/src/mac/aui.py b/wxPython/src/mac/aui.py index 2976048dd5..6e572081bf 100644 --- a/wxPython/src/mac/aui.py +++ b/wxPython/src/mac/aui.py @@ -154,8 +154,6 @@ import _core import _windows wx = _core __docfilter__ = wx.__DocFilter(globals()) -USE_AUI = _aui.USE_AUI -USE_MENUS = _aui.USE_MENUS AUI_DOCK_NONE = _aui.AUI_DOCK_NONE AUI_DOCK_TOP = _aui.AUI_DOCK_TOP AUI_DOCK_RIGHT = _aui.AUI_DOCK_RIGHT @@ -1437,6 +1435,10 @@ class AuiNotebook(_core.Control): """Split(self, size_t page, int direction)""" return _aui.AuiNotebook_Split(*args, **kwargs) + def GetAuiManager(*args, **kwargs): + """GetAuiManager(self) -> AuiManager""" + return _aui.AuiNotebook_GetAuiManager(*args, **kwargs) + PageCount = property(GetPageCount,doc="See `GetPageCount`") Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") _aui.AuiNotebook_swigregister(AuiNotebook) diff --git a/wxPython/src/mac/aui_wrap.cpp b/wxPython/src/mac/aui_wrap.cpp index 5d43683926..bd580c6670 100644 --- a/wxPython/src/mac/aui_wrap.cpp +++ b/wxPython/src/mac/aui_wrap.cpp @@ -16013,6 +16013,37 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiNotebook_GetAuiManager(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAuiNotebook *arg1 = (wxAuiNotebook *) 0 ; + wxAuiManager *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebook, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebook_GetAuiManager" "', expected argument " "1"" of type '" "wxAuiNotebook const *""'"); + } + arg1 = reinterpret_cast< wxAuiNotebook * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxAuiManager const &_result_ref = ((wxAuiNotebook const *)arg1)->GetAuiManager(); + result = (wxAuiManager *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiManager, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *AuiNotebook_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -18499,6 +18530,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiNotebook_SetSelection", (PyCFunction) _wrap_AuiNotebook_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiNotebook_GetSelection", (PyCFunction)_wrap_AuiNotebook_GetSelection, METH_O, NULL}, { (char *)"AuiNotebook_Split", (PyCFunction) _wrap_AuiNotebook_Split, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiNotebook_GetAuiManager", (PyCFunction)_wrap_AuiNotebook_GetAuiManager, METH_O, NULL}, { (char *)"AuiNotebook_swigregister", AuiNotebook_swigregister, METH_VARARGS, NULL}, { (char *)"AuiNotebook_swiginit", AuiNotebook_swiginit, METH_VARARGS, NULL}, { (char *)"new_PreAuiMDIParentFrame", (PyCFunction)_wrap_new_PreAuiMDIParentFrame, METH_NOARGS, NULL}, @@ -21348,8 +21380,6 @@ SWIGEXPORT void SWIG_init(void) { SWIG_InstallConstants(d,swig_const_table); - SWIG_Python_SetConstant(d, "USE_AUI",SWIG_From_int(static_cast< int >(1))); - SWIG_Python_SetConstant(d, "USE_MENUS",SWIG_From_int(static_cast< int >(1))); SWIG_Python_SetConstant(d, "AUI_DOCK_NONE",SWIG_From_int(static_cast< int >(wxAUI_DOCK_NONE))); SWIG_Python_SetConstant(d, "AUI_DOCK_TOP",SWIG_From_int(static_cast< int >(wxAUI_DOCK_TOP))); SWIG_Python_SetConstant(d, "AUI_DOCK_RIGHT",SWIG_From_int(static_cast< int >(wxAUI_DOCK_RIGHT))); diff --git a/wxPython/src/msw/aui.py b/wxPython/src/msw/aui.py index 2976048dd5..6e572081bf 100644 --- a/wxPython/src/msw/aui.py +++ b/wxPython/src/msw/aui.py @@ -154,8 +154,6 @@ import _core import _windows wx = _core __docfilter__ = wx.__DocFilter(globals()) -USE_AUI = _aui.USE_AUI -USE_MENUS = _aui.USE_MENUS AUI_DOCK_NONE = _aui.AUI_DOCK_NONE AUI_DOCK_TOP = _aui.AUI_DOCK_TOP AUI_DOCK_RIGHT = _aui.AUI_DOCK_RIGHT @@ -1437,6 +1435,10 @@ class AuiNotebook(_core.Control): """Split(self, size_t page, int direction)""" return _aui.AuiNotebook_Split(*args, **kwargs) + def GetAuiManager(*args, **kwargs): + """GetAuiManager(self) -> AuiManager""" + return _aui.AuiNotebook_GetAuiManager(*args, **kwargs) + PageCount = property(GetPageCount,doc="See `GetPageCount`") Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") _aui.AuiNotebook_swigregister(AuiNotebook) diff --git a/wxPython/src/msw/aui_wrap.cpp b/wxPython/src/msw/aui_wrap.cpp index 31f1faa62c..7e14284be8 100644 --- a/wxPython/src/msw/aui_wrap.cpp +++ b/wxPython/src/msw/aui_wrap.cpp @@ -16013,6 +16013,37 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiNotebook_GetAuiManager(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAuiNotebook *arg1 = (wxAuiNotebook *) 0 ; + wxAuiManager *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebook, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebook_GetAuiManager" "', expected argument " "1"" of type '" "wxAuiNotebook const *""'"); + } + arg1 = reinterpret_cast< wxAuiNotebook * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxAuiManager const &_result_ref = ((wxAuiNotebook const *)arg1)->GetAuiManager(); + result = (wxAuiManager *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiManager, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *AuiNotebook_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -18499,6 +18530,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiNotebook_SetSelection", (PyCFunction) _wrap_AuiNotebook_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiNotebook_GetSelection", (PyCFunction)_wrap_AuiNotebook_GetSelection, METH_O, NULL}, { (char *)"AuiNotebook_Split", (PyCFunction) _wrap_AuiNotebook_Split, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiNotebook_GetAuiManager", (PyCFunction)_wrap_AuiNotebook_GetAuiManager, METH_O, NULL}, { (char *)"AuiNotebook_swigregister", AuiNotebook_swigregister, METH_VARARGS, NULL}, { (char *)"AuiNotebook_swiginit", AuiNotebook_swiginit, METH_VARARGS, NULL}, { (char *)"new_PreAuiMDIParentFrame", (PyCFunction)_wrap_new_PreAuiMDIParentFrame, METH_NOARGS, NULL}, @@ -21342,8 +21374,6 @@ SWIGEXPORT void SWIG_init(void) { SWIG_InstallConstants(d,swig_const_table); - SWIG_Python_SetConstant(d, "USE_AUI",SWIG_From_int(static_cast< int >(1))); - SWIG_Python_SetConstant(d, "USE_MENUS",SWIG_From_int(static_cast< int >(1))); SWIG_Python_SetConstant(d, "AUI_DOCK_NONE",SWIG_From_int(static_cast< int >(wxAUI_DOCK_NONE))); SWIG_Python_SetConstant(d, "AUI_DOCK_TOP",SWIG_From_int(static_cast< int >(wxAUI_DOCK_TOP))); SWIG_Python_SetConstant(d, "AUI_DOCK_RIGHT",SWIG_From_int(static_cast< int >(wxAUI_DOCK_RIGHT))); -- 2.45.2