From e06b17c045818e9b2ed90a2a50d1196c2e63f38e Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 23 Aug 2003 02:56:37 +0000 Subject: [PATCH 1/1] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/msw/printfw.py | 1 - wxPython/src/msw/stattool.cpp | 242 ----- wxPython/src/msw/stattool.py | 27 - wxPython/src/msw/windows.cpp | 12 +- wxPython/src/msw/windows.py | 4 +- wxPython/src/msw/windows2.cpp | 1683 +++++++++++++++++++++++---------- wxPython/src/msw/windows2.py | 229 +++-- wxPython/src/msw/windows3.cpp | 5 + wxPython/src/msw/wx.py | 8 - 9 files changed, 1344 insertions(+), 867 deletions(-) diff --git a/wxPython/src/msw/printfw.py b/wxPython/src/msw/printfw.py index dff9896cf4..a881371ecf 100644 --- a/wxPython/src/msw/printfw.py +++ b/wxPython/src/msw/printfw.py @@ -477,7 +477,6 @@ class wxPrintDialog(wxPrintDialogPtr): def __init__(self,*_args,**_kwargs): self.this = printfwc.new_wxPrintDialog(*_args,**_kwargs) self.thisown = 1 - #wx._StdDialogCallbacks(self) diff --git a/wxPython/src/msw/stattool.cpp b/wxPython/src/msw/stattool.cpp index 33e29a043f..3092154ff9 100644 --- a/wxPython/src/msw/stattool.cpp +++ b/wxPython/src/msw/stattool.cpp @@ -56,7 +56,6 @@ extern PyObject *SWIG_newvarlink(void); #include "helpers.h" #include -#include static PyObject* t_output_helper(PyObject* target, PyObject* o) { @@ -3274,243 +3273,7 @@ static PyObject *_wrap_wxToolBar_FindToolForPosition(PyObject *self, PyObject *a return _resultobj; } -static void *SwigwxToolBarSimpleTowxToolBarBase(void *ptr) { - wxToolBarSimple *src; - wxToolBarBase *dest; - src = (wxToolBarSimple *) ptr; - dest = (wxToolBarBase *) src; - return (void *) dest; -} - -static void *SwigwxToolBarSimpleTowxControl(void *ptr) { - wxToolBarSimple *src; - wxControl *dest; - src = (wxToolBarSimple *) ptr; - dest = (wxControl *) src; - return (void *) dest; -} - -static void *SwigwxToolBarSimpleTowxWindow(void *ptr) { - wxToolBarSimple *src; - wxWindow *dest; - src = (wxToolBarSimple *) ptr; - dest = (wxWindow *) src; - return (void *) dest; -} - -static void *SwigwxToolBarSimpleTowxEvtHandler(void *ptr) { - wxToolBarSimple *src; - wxEvtHandler *dest; - src = (wxToolBarSimple *) ptr; - dest = (wxEvtHandler *) src; - return (void *) dest; -} - -static void *SwigwxToolBarSimpleTowxObject(void *ptr) { - wxToolBarSimple *src; - wxObject *dest; - src = (wxToolBarSimple *) ptr; - dest = (wxObject *) src; - return (void *) dest; -} - -#define new_wxToolBarSimple(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxToolBarSimple(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) -static PyObject *_wrap_new_wxToolBarSimple(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxToolBarSimple * _result; - wxWindow * _arg0; - wxWindowID _arg1; - wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; - wxSize * _arg3 = (wxSize *) &wxDefaultSize; - long _arg4 = (long ) wxNO_BORDER|(wxTB_HORIZONTAL); - wxString * _arg5 = (wxString *) &wxPyToolBarNameStr; - PyObject * _argo0 = 0; - wxPoint temp; - PyObject * _obj2 = 0; - wxSize temp0; - PyObject * _obj3 = 0; - PyObject * _obj5 = 0; - char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; - char _ptemp[128]; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOlO:new_wxToolBarSimple",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_obj5)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxToolBarSimple. Expected _wxWindow_p."); - return NULL; - } - } - if (_obj2) -{ - _arg2 = &temp; - if (! wxPoint_helper(_obj2, &_arg2)) - return NULL; -} - if (_obj3) -{ - _arg3 = &temp0; - if (! wxSize_helper(_obj3, &_arg3)) - return NULL; -} - if (_obj5) -{ - _arg5 = wxString_in_helper(_obj5); - if (_arg5 == NULL) - return NULL; -} -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxToolBarSimple *)new_wxToolBarSimple(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarSimple_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } -{ - if (_obj5) - delete _arg5; -} - return _resultobj; -} - -#define new_wxPreToolBarSimple() (new wxToolBarSimple()) -static PyObject *_wrap_new_wxPreToolBarSimple(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxToolBarSimple * _result; - char *_kwnames[] = { NULL }; - char _ptemp[128]; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPreToolBarSimple",_kwnames)) - return NULL; -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxToolBarSimple *)new_wxPreToolBarSimple(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarSimple_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } - return _resultobj; -} - -#define wxToolBarSimple_Create(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->Create(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) -static PyObject *_wrap_wxToolBarSimple_Create(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _result; - wxToolBarSimple * _arg0; - wxWindow * _arg1; - wxWindowID _arg2; - wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; - wxSize * _arg4 = (wxSize *) &wxDefaultSize; - long _arg5 = (long ) wxNO_BORDER|(wxTB_HORIZONTAL); - wxString * _arg6 = (wxString *) &wxPyToolBarNameStr; - PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - wxPoint temp; - PyObject * _obj3 = 0; - wxSize temp0; - PyObject * _obj4 = 0; - PyObject * _obj6 = 0; - char *_kwnames[] = { "self","parent","id","pos","size","style","name", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi|OOlO:wxToolBarSimple_Create",_kwnames,&_argo0,&_argo1,&_arg2,&_obj3,&_obj4,&_arg5,&_obj6)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarSimple_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarSimple_Create. Expected _wxToolBarSimple_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarSimple_Create. Expected _wxWindow_p."); - return NULL; - } - } - if (_obj3) -{ - _arg3 = &temp; - if (! wxPoint_helper(_obj3, &_arg3)) - return NULL; -} - if (_obj4) -{ - _arg4 = &temp0; - if (! wxSize_helper(_obj4, &_arg4)) - return NULL; -} - if (_obj6) -{ - _arg6 = wxString_in_helper(_obj6); - if (_arg6 == NULL) - return NULL; -} -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxToolBarSimple_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,*_arg6); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); -{ - if (_obj6) - delete _arg6; -} - return _resultobj; -} - -#define wxToolBarSimple_FindToolForPosition(_swigobj,_swigarg0,_swigarg1) (_swigobj->FindToolForPosition(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxToolBarSimple_FindToolForPosition(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxToolBarToolBase * _result; - wxToolBarSimple * _arg0; - wxCoord _arg1; - wxCoord _arg2; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","x","y", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBarSimple_FindToolForPosition",_kwnames,&_argo0,&_arg1,&_arg2)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarSimple_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarSimple_FindToolForPosition. Expected _wxToolBarSimple_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxToolBarToolBase *)wxToolBarSimple_FindToolForPosition(_arg0,_arg1,_arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -}{ _resultobj = wxPyMake_wxObject(_result); } - return _resultobj; -} - static PyMethodDef stattoolcMethods[] = { - { "wxToolBarSimple_FindToolForPosition", (PyCFunction) _wrap_wxToolBarSimple_FindToolForPosition, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarSimple_Create", (PyCFunction) _wrap_wxToolBarSimple_Create, METH_VARARGS | METH_KEYWORDS }, - { "new_wxPreToolBarSimple", (PyCFunction) _wrap_new_wxPreToolBarSimple, METH_VARARGS | METH_KEYWORDS }, - { "new_wxToolBarSimple", (PyCFunction) _wrap_new_wxToolBarSimple, METH_VARARGS | METH_KEYWORDS }, { "wxToolBar_FindToolForPosition", (PyCFunction) _wrap_wxToolBar_FindToolForPosition, METH_VARARGS | METH_KEYWORDS }, { "wxToolBar_Create", (PyCFunction) _wrap_wxToolBar_Create, METH_VARARGS | METH_KEYWORDS }, { "new_wxPreToolBar", (PyCFunction) _wrap_new_wxPreToolBar, METH_VARARGS | METH_KEYWORDS }, @@ -3656,7 +3419,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_WXTYPE","_unsigned_short",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, - { "_wxObject","_wxToolBarSimple",SwigwxToolBarSimpleTowxObject}, { "_wxObject","_wxToolBar",SwigwxToolBarTowxObject}, { "_wxObject","_wxToolBarBase",SwigwxToolBarBaseTowxObject}, { "_wxObject","_wxToolBarToolBase",SwigwxToolBarToolBaseTowxObject}, @@ -3664,7 +3426,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, { "_unsigned_char","_byte",0}, - { "_wxControl","_wxToolBarSimple",SwigwxToolBarSimpleTowxControl}, { "_wxControl","_wxToolBar",SwigwxToolBarTowxControl}, { "_wxControl","_wxToolBarBase",SwigwxToolBarBaseTowxControl}, { "_unsigned_int","_wxCoord",0}, @@ -3702,7 +3463,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_time_t","_wxWindowID",0}, { "_time_t","_uint",0}, { "_time_t","_size_t",0}, - { "_wxToolBarBase","_wxToolBarSimple",SwigwxToolBarSimpleTowxToolBarBase}, { "_wxToolBarBase","_wxToolBar",SwigwxToolBarTowxToolBarBase}, { "_wxCoord","_int",0}, { "_wxCoord","_signed_int",0}, @@ -3713,11 +3473,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, - { "_wxEvtHandler","_wxToolBarSimple",SwigwxToolBarSimpleTowxEvtHandler}, { "_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler}, { "_wxEvtHandler","_wxToolBarBase",SwigwxToolBarBaseTowxEvtHandler}, { "_wxEvtHandler","_wxStatusBar",SwigwxStatusBarTowxEvtHandler}, - { "_wxWindow","_wxToolBarSimple",SwigwxToolBarSimpleTowxWindow}, { "_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow}, { "_wxWindow","_wxToolBarBase",SwigwxToolBarBaseTowxWindow}, { "_wxWindow","_wxStatusBar",SwigwxStatusBarTowxWindow}, diff --git a/wxPython/src/msw/stattool.py b/wxPython/src/msw/stattool.py index 6468b06517..4703ba24a2 100644 --- a/wxPython/src/msw/stattool.py +++ b/wxPython/src/msw/stattool.py @@ -477,33 +477,6 @@ def wxPreToolBar(*_args,**_kwargs): return val -class wxToolBarSimplePtr(wxToolBarBasePtr): - def __init__(self,this): - self.this = this - self.thisown = 0 - def Create(self, *_args, **_kwargs): - val = stattoolc.wxToolBarSimple_Create(self, *_args, **_kwargs) - return val - def FindToolForPosition(self, *_args, **_kwargs): - val = stattoolc.wxToolBarSimple_FindToolForPosition(self, *_args, **_kwargs) - return val - def __repr__(self): - return "<%s.%s instance; proxy of C++ wxToolBarSimple instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) -class wxToolBarSimple(wxToolBarSimplePtr): - def __init__(self,*_args,**_kwargs): - self.this = stattoolc.new_wxToolBarSimple(*_args,**_kwargs) - self.thisown = 1 - self._setOORInfo(self) - - - -def wxPreToolBarSimple(*_args,**_kwargs): - val = wxToolBarSimplePtr(stattoolc.new_wxPreToolBarSimple(*_args,**_kwargs)) - val.thisown = 1 - val._setOORInfo(val) - return val - - #-------------- FUNCTION WRAPPERS ------------------ diff --git a/wxPython/src/msw/windows.cpp b/wxPython/src/msw/windows.cpp index 902f34917c..db073613dc 100644 --- a/wxPython/src/msw/windows.cpp +++ b/wxPython/src/msw/windows.cpp @@ -1310,26 +1310,26 @@ static PyObject *_wrap_wxWindow_CenterOnScreen(PyObject *self, PyObject *args, P return _resultobj; } -#define wxWindow_Clear(_swigobj) (_swigobj->Clear()) -static PyObject *_wrap_wxWindow_Clear(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxWindow_ClearBackground(_swigobj) (_swigobj->ClearBackground()) +static PyObject *_wrap_wxWindow_ClearBackground(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxWindow * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_Clear",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_ClearBackground",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Clear. Expected _wxWindow_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ClearBackground. Expected _wxWindow_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxWindow_Clear(_arg0); + wxWindow_ClearBackground(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -12420,7 +12420,7 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_Close", (PyCFunction) _wrap_wxWindow_Close, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_ClientToScreen", (PyCFunction) _wrap_wxWindow_ClientToScreen, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_ClientToScreenXY", (PyCFunction) _wrap_wxWindow_ClientToScreenXY, METH_VARARGS | METH_KEYWORDS }, - { "wxWindow_Clear", (PyCFunction) _wrap_wxWindow_Clear, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_ClearBackground", (PyCFunction) _wrap_wxWindow_ClearBackground, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_CenterOnScreen", (PyCFunction) _wrap_wxWindow_CenterOnScreen, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_CentreOnScreen", (PyCFunction) _wrap_wxWindow_CentreOnScreen, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_CenterOnParent", (PyCFunction) _wrap_wxWindow_CenterOnParent, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/windows.py b/wxPython/src/msw/windows.py index ac66decd78..36ec4b822b 100644 --- a/wxPython/src/msw/windows.py +++ b/wxPython/src/msw/windows.py @@ -137,8 +137,8 @@ class wxWindowPtr(wxEvtHandlerPtr): def CenterOnScreen(self, *_args, **_kwargs): val = windowsc.wxWindow_CenterOnScreen(self, *_args, **_kwargs) return val - def Clear(self, *_args, **_kwargs): - val = windowsc.wxWindow_Clear(self, *_args, **_kwargs) + def ClearBackground(self, *_args, **_kwargs): + val = windowsc.wxWindow_ClearBackground(self, *_args, **_kwargs) return val def ClientToScreenXY(self, *_args, **_kwargs): val = windowsc.wxWindow_ClientToScreenXY(self, *_args, **_kwargs) diff --git a/wxPython/src/msw/windows2.cpp b/wxPython/src/msw/windows2.cpp index 66f4ec09b1..4d095a19a0 100644 --- a/wxPython/src/msw/windows2.cpp +++ b/wxPython/src/msw/windows2.cpp @@ -56,6 +56,7 @@ extern PyObject *SWIG_newvarlink(void); #include "helpers.h" #include +#include #include #include #ifdef __WXMSW__ @@ -302,89 +303,116 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyPanel, wxPanel, RemoveChild); #ifdef __cplusplus extern "C" { #endif -static void *SwigwxNotebookEventTowxNotifyEvent(void *ptr) { - wxNotebookEvent *src; - wxNotifyEvent *dest; - src = (wxNotebookEvent *) ptr; - dest = (wxNotifyEvent *) src; +static void *SwigwxBookCtrlTowxControl(void *ptr) { + wxBookCtrl *src; + wxControl *dest; + src = (wxBookCtrl *) ptr; + dest = (wxControl *) src; return (void *) dest; } -static void *SwigwxNotebookEventTowxCommandEvent(void *ptr) { - wxNotebookEvent *src; - wxCommandEvent *dest; - src = (wxNotebookEvent *) ptr; - dest = (wxCommandEvent *) src; +static void *SwigwxBookCtrlTowxWindow(void *ptr) { + wxBookCtrl *src; + wxWindow *dest; + src = (wxBookCtrl *) ptr; + dest = (wxWindow *) src; return (void *) dest; } -static void *SwigwxNotebookEventTowxEvent(void *ptr) { - wxNotebookEvent *src; - wxEvent *dest; - src = (wxNotebookEvent *) ptr; - dest = (wxEvent *) src; +static void *SwigwxBookCtrlTowxEvtHandler(void *ptr) { + wxBookCtrl *src; + wxEvtHandler *dest; + src = (wxBookCtrl *) ptr; + dest = (wxEvtHandler *) src; return (void *) dest; } -static void *SwigwxNotebookEventTowxObject(void *ptr) { - wxNotebookEvent *src; +static void *SwigwxBookCtrlTowxObject(void *ptr) { + wxBookCtrl *src; wxObject *dest; - src = (wxNotebookEvent *) ptr; + src = (wxBookCtrl *) ptr; dest = (wxObject *) src; return (void *) dest; } -#define new_wxNotebookEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxNotebookEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_new_wxNotebookEvent(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBookCtrl_GetPageCount(_swigobj) (_swigobj->GetPageCount()) +static PyObject *_wrap_wxBookCtrl_GetPageCount(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxNotebookEvent * _result; - wxEventType _arg0 = (wxEventType ) wxEVT_NULL; - int _arg1 = (int ) 0; - int _arg2 = (int ) -1; - int _arg3 = (int ) -1; - char *_kwnames[] = { "commandType","id","sel","oldSel", NULL }; - char _ptemp[128]; + size_t _result; + wxBookCtrl * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iiii:new_wxNotebookEvent",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBookCtrl_GetPageCount",_kwnames,&_argo0)) return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_GetPageCount. Expected _wxBookCtrl_p."); + return NULL; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxNotebookEvent *)new_wxNotebookEvent(_arg0,_arg1,_arg2,_arg3); + _result = (size_t )wxBookCtrl_GetPageCount(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxNotebookEvent_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxBookCtrl_GetPage(_swigobj,_swigarg0) (_swigobj->GetPage(_swigarg0)) +static PyObject *_wrap_wxBookCtrl_GetPage(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxWindow * _result; + wxBookCtrl * _arg0; + size_t _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","n", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBookCtrl_GetPage",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_GetPage. Expected _wxBookCtrl_p."); + return NULL; + } } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxWindow *)wxBookCtrl_GetPage(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; } -#define wxNotebookEvent_GetSelection(_swigobj) (_swigobj->GetSelection()) -static PyObject *_wrap_wxNotebookEvent_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBookCtrl_GetSelection(_swigobj) (_swigobj->GetSelection()) +static PyObject *_wrap_wxBookCtrl_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; - wxNotebookEvent * _arg0; + wxBookCtrl * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebookEvent_GetSelection",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBookCtrl_GetSelection",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebookEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebookEvent_GetSelection. Expected _wxNotebookEvent_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_GetSelection. Expected _wxBookCtrl_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxNotebookEvent_GetSelection(_arg0); + _result = (int )wxBookCtrl_GetSelection(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -392,55 +420,113 @@ static PyObject *_wrap_wxNotebookEvent_GetSelection(PyObject *self, PyObject *ar return _resultobj; } -#define wxNotebookEvent_GetOldSelection(_swigobj) (_swigobj->GetOldSelection()) -static PyObject *_wrap_wxNotebookEvent_GetOldSelection(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBookCtrl_SetPageText(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetPageText(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxBookCtrl_SetPageText(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxNotebookEvent * _arg0; + bool _result; + wxBookCtrl * _arg0; + size_t _arg1; + wxString * _arg2; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","n","strText", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebookEvent_GetOldSelection",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxBookCtrl_SetPageText",_kwnames,&_argo0,&_arg1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebookEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebookEvent_GetOldSelection. Expected _wxNotebookEvent_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_SetPageText. Expected _wxBookCtrl_p."); return NULL; } } +{ + _arg2 = wxString_in_helper(_obj2); + if (_arg2 == NULL) + return NULL; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxNotebookEvent_GetOldSelection(_arg0); + _result = (bool )wxBookCtrl_SetPageText(_arg0,_arg1,*_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); +{ + if (_obj2) + delete _arg2; +} return _resultobj; } -#define wxNotebookEvent_SetOldSelection(_swigobj,_swigarg0) (_swigobj->SetOldSelection(_swigarg0)) -static PyObject *_wrap_wxNotebookEvent_SetOldSelection(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBookCtrl_GetPageText(_swigobj,_swigarg0) (_swigobj->GetPageText(_swigarg0)) +static PyObject *_wrap_wxBookCtrl_GetPageText(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxNotebookEvent * _arg0; - int _arg1; + wxString * _result; + wxBookCtrl * _arg0; + size_t _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","page", NULL }; + char *_kwnames[] = { "self","n", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebookEvent_SetOldSelection",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBookCtrl_GetPageText",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebookEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebookEvent_SetOldSelection. Expected _wxNotebookEvent_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_GetPageText. Expected _wxBookCtrl_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxNotebookEvent_SetOldSelection(_arg0,_arg1); + _result = new wxString (wxBookCtrl_GetPageText(_arg0,_arg1)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ +#if wxUSE_UNICODE + _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); +#else + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); +#endif +} +{ + delete _result; +} + return _resultobj; +} + +#define wxBookCtrl_SetImageList(_swigobj,_swigarg0) (_swigobj->SetImageList(_swigarg0)) +static PyObject *_wrap_wxBookCtrl_SetImageList(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxBookCtrl * _arg0; + wxImageList * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","imageList", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBookCtrl_SetImageList",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_SetImageList. Expected _wxBookCtrl_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxImageList_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBookCtrl_SetImageList. Expected _wxImageList_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxBookCtrl_SetImageList(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -449,27 +535,35 @@ static PyObject *_wrap_wxNotebookEvent_SetOldSelection(PyObject *self, PyObject return _resultobj; } -#define wxNotebookEvent_SetSelection(_swigobj,_swigarg0) (_swigobj->SetSelection(_swigarg0)) -static PyObject *_wrap_wxNotebookEvent_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBookCtrl_AssignImageList(_swigobj,_swigarg0) (_swigobj->AssignImageList(_swigarg0)) +static PyObject *_wrap_wxBookCtrl_AssignImageList(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxNotebookEvent * _arg0; - int _arg1; + wxBookCtrl * _arg0; + wxImageList * _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","page", NULL }; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","imageList", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebookEvent_SetSelection",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBookCtrl_AssignImageList",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebookEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebookEvent_SetSelection. Expected _wxNotebookEvent_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_AssignImageList. Expected _wxBookCtrl_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxImageList_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBookCtrl_AssignImageList. Expected _wxImageList_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxNotebookEvent_SetSelection(_arg0,_arg1); + wxBookCtrl_AssignImageList(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -478,221 +572,380 @@ static PyObject *_wrap_wxNotebookEvent_SetSelection(PyObject *self, PyObject *ar return _resultobj; } -static void *SwigwxNotebookTowxControl(void *ptr) { - wxNotebook *src; - wxControl *dest; - src = (wxNotebook *) ptr; - dest = (wxControl *) src; - return (void *) dest; -} +#define wxBookCtrl_GetImageList(_swigobj) (_swigobj->GetImageList()) +static PyObject *_wrap_wxBookCtrl_GetImageList(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxImageList * _result; + wxBookCtrl * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; -static void *SwigwxNotebookTowxWindow(void *ptr) { - wxNotebook *src; - wxWindow *dest; - src = (wxNotebook *) ptr; - dest = (wxWindow *) src; - return (void *) dest; + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBookCtrl_GetImageList",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_GetImageList. Expected _wxBookCtrl_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxImageList *)wxBookCtrl_GetImageList(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxObject(_result); } + return _resultobj; } -static void *SwigwxNotebookTowxEvtHandler(void *ptr) { - wxNotebook *src; - wxEvtHandler *dest; - src = (wxNotebook *) ptr; - dest = (wxEvtHandler *) src; - return (void *) dest; +#define wxBookCtrl_GetPageImage(_swigobj,_swigarg0) (_swigobj->GetPageImage(_swigarg0)) +static PyObject *_wrap_wxBookCtrl_GetPageImage(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxBookCtrl * _arg0; + size_t _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","n", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBookCtrl_GetPageImage",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_GetPageImage. Expected _wxBookCtrl_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxBookCtrl_GetPageImage(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; } -static void *SwigwxNotebookTowxObject(void *ptr) { - wxNotebook *src; - wxObject *dest; - src = (wxNotebook *) ptr; - dest = (wxObject *) src; - return (void *) dest; +#define wxBookCtrl_SetPageImage(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetPageImage(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxBookCtrl_SetPageImage(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxBookCtrl * _arg0; + size_t _arg1; + int _arg2; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","n","imageId", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxBookCtrl_SetPageImage",_kwnames,&_argo0,&_arg1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_SetPageImage. Expected _wxBookCtrl_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxBookCtrl_SetPageImage(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; } -#define new_wxNotebook(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxNotebook(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) -static PyObject *_wrap_new_wxNotebook(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBookCtrl_SetPageSize(_swigobj,_swigarg0) (_swigobj->SetPageSize(_swigarg0)) +static PyObject *_wrap_wxBookCtrl_SetPageSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxNotebook * _result; - wxWindow * _arg0; - wxWindowID _arg1; - wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; - wxSize * _arg3 = (wxSize *) &wxDefaultSize; - long _arg4 = (long ) 0; - wxString * _arg5 = (wxString *) &wxPyNOTEBOOK_NAME; + wxBookCtrl * _arg0; + wxSize * _arg1; PyObject * _argo0 = 0; - wxPoint temp; - PyObject * _obj2 = 0; - wxSize temp0; - PyObject * _obj3 = 0; - PyObject * _obj5 = 0; - char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; - char _ptemp[128]; + wxSize temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","size", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOlO:new_wxNotebook",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_obj5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBookCtrl_SetPageSize",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxNotebook. Expected _wxWindow_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_SetPageSize. Expected _wxBookCtrl_p."); return NULL; } } - if (_obj2) { - _arg2 = &temp; - if (! wxPoint_helper(_obj2, &_arg2)) + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) return NULL; } - if (_obj3) { - _arg3 = &temp0; - if (! wxSize_helper(_obj3, &_arg3)) - return NULL; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxBookCtrl_SetPageSize(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; } - if (_obj5) + +#define wxBookCtrl_CalcSizeFromPage(_swigobj,_swigarg0) (_swigobj->CalcSizeFromPage(_swigarg0)) +static PyObject *_wrap_wxBookCtrl_CalcSizeFromPage(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSize * _result; + wxBookCtrl * _arg0; + wxSize * _arg1; + PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","sizePage", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBookCtrl_CalcSizeFromPage",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_CalcSizeFromPage. Expected _wxBookCtrl_p."); + return NULL; + } + } { - _arg5 = wxString_in_helper(_obj5); - if (_arg5 == NULL) + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) return NULL; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxNotebook *)new_wxNotebook(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5); + _result = new wxSize (wxBookCtrl_CalcSizeFromPage(_arg0,*_arg1)); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxNotebook_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxBookCtrl_DeletePage(_swigobj,_swigarg0) (_swigobj->DeletePage(_swigarg0)) +static PyObject *_wrap_wxBookCtrl_DeletePage(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxBookCtrl * _arg0; + size_t _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","n", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBookCtrl_DeletePage",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_DeletePage. Expected _wxBookCtrl_p."); + return NULL; + } } { - if (_obj5) - delete _arg5; -} + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxBookCtrl_DeletePage(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define new_wxPreNotebook() (new wxNotebook()) -static PyObject *_wrap_new_wxPreNotebook(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBookCtrl_RemovePage(_swigobj,_swigarg0) (_swigobj->RemovePage(_swigarg0)) +static PyObject *_wrap_wxBookCtrl_RemovePage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxNotebook * _result; - char *_kwnames[] = { NULL }; - char _ptemp[128]; + bool _result; + wxBookCtrl * _arg0; + size_t _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","n", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPreNotebook",_kwnames)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBookCtrl_RemovePage",_kwnames,&_argo0,&_arg1)) return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_RemovePage. Expected _wxBookCtrl_p."); + return NULL; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxNotebook *)new_wxPreNotebook(); + _result = (bool )wxBookCtrl_RemovePage(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxNotebook_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxBookCtrl_DeleteAllPages(_swigobj) (_swigobj->DeleteAllPages()) +static PyObject *_wrap_wxBookCtrl_DeleteAllPages(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxBookCtrl * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBookCtrl_DeleteAllPages",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_DeleteAllPages. Expected _wxBookCtrl_p."); + return NULL; + } } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxBookCtrl_DeleteAllPages(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxNotebook_Create(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->Create(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) -static PyObject *_wrap_wxNotebook_Create(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBookCtrl_AddPage(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->AddPage(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxBookCtrl_AddPage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; - wxNotebook * _arg0; + wxBookCtrl * _arg0; wxWindow * _arg1; - wxWindowID _arg2; - wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; - wxSize * _arg4 = (wxSize *) &wxDefaultSize; - long _arg5 = (long ) 0; - wxString * _arg6 = (wxString *) &wxPyNOTEBOOK_NAME; + wxString * _arg2; + bool _arg3 = (bool ) false; + int _arg4 = (int ) -1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; - wxPoint temp; - PyObject * _obj3 = 0; - wxSize temp0; - PyObject * _obj4 = 0; - PyObject * _obj6 = 0; - char *_kwnames[] = { "self","parent","id","pos","size","style","name", NULL }; + PyObject * _obj2 = 0; + int tempbool3 = (int) false; + char *_kwnames[] = { "self","page","text","bSelect","imageId", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi|OOlO:wxNotebook_Create",_kwnames,&_argo0,&_argo1,&_arg2,&_obj3,&_obj4,&_arg5,&_obj6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|ii:wxBookCtrl_AddPage",_kwnames,&_argo0,&_argo1,&_obj2,&tempbool3,&_arg4)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_Create. Expected _wxNotebook_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_AddPage. Expected _wxBookCtrl_p."); return NULL; } } if (_argo1) { if (_argo1 == Py_None) { _arg1 = NULL; } else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxNotebook_Create. Expected _wxWindow_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBookCtrl_AddPage. Expected _wxWindow_p."); return NULL; } } - if (_obj3) { - _arg3 = &temp; - if (! wxPoint_helper(_obj3, &_arg3)) + _arg2 = wxString_in_helper(_obj2); + if (_arg2 == NULL) return NULL; } - if (_obj4) + _arg3 = (bool ) tempbool3; { - _arg4 = &temp0; - if (! wxSize_helper(_obj4, &_arg4)) + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxBookCtrl_AddPage(_arg0,_arg1,*_arg2,_arg3,_arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); +{ + if (_obj2) + delete _arg2; +} + return _resultobj; +} + +#define wxBookCtrl_InsertPage(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->InsertPage(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) +static PyObject *_wrap_wxBookCtrl_InsertPage(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxBookCtrl * _arg0; + size_t _arg1; + wxWindow * _arg2; + wxString * _arg3; + bool _arg4 = (bool ) false; + int _arg5 = (int ) -1; + PyObject * _argo0 = 0; + PyObject * _argo2 = 0; + PyObject * _obj3 = 0; + int tempbool4 = (int) false; + char *_kwnames[] = { "self","n","page","text","bSelect","imageId", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOO|ii:wxBookCtrl_InsertPage",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&tempbool4,&_arg5)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_InsertPage. Expected _wxBookCtrl_p."); return NULL; -} - if (_obj6) + } + } + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxBookCtrl_InsertPage. Expected _wxWindow_p."); + return NULL; + } + } { - _arg6 = wxString_in_helper(_obj6); - if (_arg6 == NULL) + _arg3 = wxString_in_helper(_obj3); + if (_arg3 == NULL) return NULL; } + _arg4 = (bool ) tempbool4; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxNotebook_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,*_arg6); + _result = (bool )wxBookCtrl_InsertPage(_arg0,_arg1,_arg2,*_arg3,_arg4,_arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); { - if (_obj6) - delete _arg6; + if (_obj3) + delete _arg3; } return _resultobj; } -#define wxNotebook_GetPageCount(_swigobj) (_swigobj->GetPageCount()) -static PyObject *_wrap_wxNotebook_GetPageCount(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBookCtrl_SetSelection(_swigobj,_swigarg0) (_swigobj->SetSelection(_swigarg0)) +static PyObject *_wrap_wxBookCtrl_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; - wxNotebook * _arg0; + wxBookCtrl * _arg0; + size_t _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + char *_kwnames[] = { "self","n", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_GetPageCount",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBookCtrl_SetSelection",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetPageCount. Expected _wxNotebook_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_SetSelection. Expected _wxBookCtrl_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxNotebook_GetPageCount(_arg0); + _result = (int )wxBookCtrl_SetSelection(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -700,207 +953,205 @@ static PyObject *_wrap_wxNotebook_GetPageCount(PyObject *self, PyObject *args, P return _resultobj; } -#define wxNotebook_GetPage(_swigobj,_swigarg0) (_swigobj->GetPage(_swigarg0)) -static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBookCtrl_AdvanceSelection(_swigobj,_swigarg0) (_swigobj->AdvanceSelection(_swigarg0)) +static PyObject *_wrap_wxBookCtrl_AdvanceSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxWindow * _result; - wxNotebook * _arg0; - int _arg1; + wxBookCtrl * _arg0; + bool _arg1 = (bool ) true; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","page", NULL }; + int tempbool1 = (int) true; + char *_kwnames[] = { "self","forward", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPage",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxBookCtrl_AdvanceSelection",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetPage. Expected _wxNotebook_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_AdvanceSelection. Expected _wxBookCtrl_p."); return NULL; } } + _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxWindow *)wxNotebook_GetPage(_arg0,_arg1); + wxBookCtrl_AdvanceSelection(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ _resultobj = wxPyMake_wxObject(_result); } +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxNotebook_GetSelection(_swigobj) (_swigobj->GetSelection()) -static PyObject *_wrap_wxNotebook_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { +static void *SwigwxBookCtrlEventTowxNotifyEvent(void *ptr) { + wxBookCtrlEvent *src; + wxNotifyEvent *dest; + src = (wxBookCtrlEvent *) ptr; + dest = (wxNotifyEvent *) src; + return (void *) dest; +} + +static void *SwigwxBookCtrlEventTowxCommandEvent(void *ptr) { + wxBookCtrlEvent *src; + wxCommandEvent *dest; + src = (wxBookCtrlEvent *) ptr; + dest = (wxCommandEvent *) src; + return (void *) dest; +} + +static void *SwigwxBookCtrlEventTowxEvent(void *ptr) { + wxBookCtrlEvent *src; + wxEvent *dest; + src = (wxBookCtrlEvent *) ptr; + dest = (wxEvent *) src; + return (void *) dest; +} + +static void *SwigwxBookCtrlEventTowxObject(void *ptr) { + wxBookCtrlEvent *src; + wxObject *dest; + src = (wxBookCtrlEvent *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +#define new_wxBookCtrlEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxBookCtrlEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_new_wxBookCtrlEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxNotebook * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + wxBookCtrlEvent * _result; + wxEventType _arg0 = (wxEventType ) wxEVT_NULL; + int _arg1 = (int ) 0; + int _arg2 = (int ) -1; + int _arg3 = (int ) -1; + char *_kwnames[] = { "commandType","id","nSel","nOldSel", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_GetSelection",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetSelection. Expected _wxNotebook_p."); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iiii:new_wxBookCtrlEvent",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) return NULL; - } - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxNotebook_GetSelection(_arg0); + _result = (wxBookCtrlEvent *)new_wxBookCtrlEvent(_arg0,_arg1,_arg2,_arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxBookCtrlEvent_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } -#define wxNotebook_SetPageText(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetPageText(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxNotebook_SetPageText(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBookCtrlEvent_GetSelection(_swigobj) (_swigobj->GetSelection()) +static PyObject *_wrap_wxBookCtrlEvent_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxNotebook * _arg0; - int _arg1; - wxString * _arg2; + int _result; + wxBookCtrlEvent * _arg0; PyObject * _argo0 = 0; - PyObject * _obj2 = 0; - char *_kwnames[] = { "self","page","text", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxNotebook_SetPageText",_kwnames,&_argo0,&_arg1,&_obj2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBookCtrlEvent_GetSelection",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetPageText. Expected _wxNotebook_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrlEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrlEvent_GetSelection. Expected _wxBookCtrlEvent_p."); return NULL; } } -{ - _arg2 = wxString_in_helper(_obj2); - if (_arg2 == NULL) - return NULL; -} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxNotebook_SetPageText(_arg0,_arg1,*_arg2); + _result = (int )wxBookCtrlEvent_GetSelection(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); -{ - if (_obj2) - delete _arg2; -} return _resultobj; } -#define wxNotebook_GetPageText(_swigobj,_swigarg0) (_swigobj->GetPageText(_swigarg0)) -static PyObject *_wrap_wxNotebook_GetPageText(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBookCtrlEvent_SetSelection(_swigobj,_swigarg0) (_swigobj->SetSelection(_swigarg0)) +static PyObject *_wrap_wxBookCtrlEvent_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; - wxNotebook * _arg0; + wxBookCtrlEvent * _arg0; int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","page", NULL }; + char *_kwnames[] = { "self","nSel", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPageText",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBookCtrlEvent_SetSelection",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetPageText. Expected _wxNotebook_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrlEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrlEvent_SetSelection. Expected _wxBookCtrlEvent_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxString (wxNotebook_GetPageText(_arg0,_arg1)); + wxBookCtrlEvent_SetSelection(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ -#if wxUSE_UNICODE - _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); -#else - _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); -#endif -} -{ - delete _result; -} +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxNotebook_SetImageList(_swigobj,_swigarg0) (_swigobj->SetImageList(_swigarg0)) -static PyObject *_wrap_wxNotebook_SetImageList(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBookCtrlEvent_GetOldSelection(_swigobj) (_swigobj->GetOldSelection()) +static PyObject *_wrap_wxBookCtrlEvent_GetOldSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxNotebook * _arg0; - wxImageList * _arg1; + int _result; + wxBookCtrlEvent * _arg0; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","imageList", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_SetImageList",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBookCtrlEvent_GetOldSelection",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetImageList. Expected _wxNotebook_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxImageList_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxNotebook_SetImageList. Expected _wxImageList_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrlEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrlEvent_GetOldSelection. Expected _wxBookCtrlEvent_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxNotebook_SetImageList(_arg0,_arg1); + _result = (int )wxBookCtrlEvent_GetOldSelection(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxNotebook_AssignImageList(_swigobj,_swigarg0) (_swigobj->AssignImageList(_swigarg0)) -static PyObject *_wrap_wxNotebook_AssignImageList(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBookCtrlEvent_SetOldSelection(_swigobj,_swigarg0) (_swigobj->SetOldSelection(_swigarg0)) +static PyObject *_wrap_wxBookCtrlEvent_SetOldSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxNotebook * _arg0; - wxImageList * _arg1; + wxBookCtrlEvent * _arg0; + int _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","imageList", NULL }; + char *_kwnames[] = { "self","nOldSel", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_AssignImageList",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBookCtrlEvent_SetOldSelection",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_AssignImageList. Expected _wxNotebook_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxImageList_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxNotebook_AssignImageList. Expected _wxImageList_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBookCtrlEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrlEvent_SetOldSelection. Expected _wxBookCtrlEvent_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxNotebook_AssignImageList(_arg0,_arg1); + wxBookCtrlEvent_SetOldSelection(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -909,90 +1160,205 @@ static PyObject *_wrap_wxNotebook_AssignImageList(PyObject *self, PyObject *args return _resultobj; } -#define wxNotebook_GetImageList(_swigobj) (_swigobj->GetImageList()) -static PyObject *_wrap_wxNotebook_GetImageList(PyObject *self, PyObject *args, PyObject *kwargs) { +static void *SwigwxNotebookTowxBookCtrl(void *ptr) { + wxNotebook *src; + wxBookCtrl *dest; + src = (wxNotebook *) ptr; + dest = (wxBookCtrl *) src; + return (void *) dest; +} + +static void *SwigwxNotebookTowxControl(void *ptr) { + wxNotebook *src; + wxControl *dest; + src = (wxNotebook *) ptr; + dest = (wxControl *) src; + return (void *) dest; +} + +static void *SwigwxNotebookTowxWindow(void *ptr) { + wxNotebook *src; + wxWindow *dest; + src = (wxNotebook *) ptr; + dest = (wxWindow *) src; + return (void *) dest; +} + +static void *SwigwxNotebookTowxEvtHandler(void *ptr) { + wxNotebook *src; + wxEvtHandler *dest; + src = (wxNotebook *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +static void *SwigwxNotebookTowxObject(void *ptr) { + wxNotebook *src; + wxObject *dest; + src = (wxNotebook *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +#define new_wxNotebook(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxNotebook(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_new_wxNotebook(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxImageList * _result; - wxNotebook * _arg0; + wxNotebook * _result; + wxWindow * _arg0; + wxWindowID _arg1; + wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg3 = (wxSize *) &wxDefaultSize; + long _arg4 = (long ) 0; + wxString * _arg5 = (wxString *) &wxPyNOTEBOOK_NAME; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; + PyObject * _obj5 = 0; + char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_GetImageList",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOlO:new_wxNotebook",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_obj5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetImageList. Expected _wxNotebook_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxNotebook. Expected _wxWindow_p."); return NULL; } } + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) + return NULL; +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) + return NULL; +} + if (_obj5) +{ + _arg5 = wxString_in_helper(_obj5); + if (_arg5 == NULL) + return NULL; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxImageList *)wxNotebook_GetImageList(_arg0); + _result = (wxNotebook *)new_wxNotebook(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -}{ _resultobj = wxPyMake_wxObject(_result); } +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxNotebook_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj5) + delete _arg5; +} return _resultobj; } -#define wxNotebook_GetPageImage(_swigobj,_swigarg0) (_swigobj->GetPageImage(_swigarg0)) -static PyObject *_wrap_wxNotebook_GetPageImage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define new_wxPreNotebook() (new wxNotebook()) +static PyObject *_wrap_new_wxPreNotebook(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxNotebook * _arg0; - int _arg1; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","page", NULL }; + wxNotebook * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPageImage",_kwnames,&_argo0,&_arg1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetPageImage. Expected _wxNotebook_p."); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPreNotebook",_kwnames)) return NULL; - } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxNotebook *)new_wxPreNotebook(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxNotebook_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxNotebook_GetPageImage(_arg0,_arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxNotebook_SetPageImage(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetPageImage(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxNotebook_SetPageImage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxNotebook_Create(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->Create(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_wxNotebook_Create(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; wxNotebook * _arg0; - int _arg1; - int _arg2; + wxWindow * _arg1; + wxWindowID _arg2; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; + long _arg5 = (long ) 0; + wxString * _arg6 = (wxString *) &wxPyNOTEBOOK_NAME; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","page","nImage", NULL }; + PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; + PyObject * _obj6 = 0; + char *_kwnames[] = { "self","parent","id","pos","size","style","name", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxNotebook_SetPageImage",_kwnames,&_argo0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi|OOlO:wxNotebook_Create",_kwnames,&_argo0,&_argo1,&_arg2,&_obj3,&_obj4,&_arg5,&_obj6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetPageImage. Expected _wxNotebook_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_Create. Expected _wxNotebook_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxNotebook_Create. Expected _wxWindow_p."); return NULL; } } + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) + return NULL; +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) + return NULL; +} + if (_obj6) +{ + _arg6 = wxString_in_helper(_obj6); + if (_arg6 == NULL) + return NULL; +} { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxNotebook_SetPageImage(_arg0,_arg1,_arg2); + _result = (bool )wxNotebook_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,*_arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); +{ + if (_obj6) + delete _arg6; +} return _resultobj; } @@ -1024,23 +1390,23 @@ static PyObject *_wrap_wxNotebook_GetRowCount(PyObject *self, PyObject *args, Py return _resultobj; } -#define wxNotebook_SetPageSize(_swigobj,_swigarg0) (_swigobj->SetPageSize(_swigarg0)) -static PyObject *_wrap_wxNotebook_SetPageSize(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxNotebook_SetPadding(_swigobj,_swigarg0) (_swigobj->SetPadding(_swigarg0)) +static PyObject *_wrap_wxNotebook_SetPadding(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxNotebook * _arg0; wxSize * _arg1; PyObject * _argo0 = 0; wxSize temp; PyObject * _obj1 = 0; - char *_kwnames[] = { "self","size", NULL }; + char *_kwnames[] = { "self","padding", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_SetPageSize",_kwnames,&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_SetPadding",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetPageSize. Expected _wxNotebook_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetPadding. Expected _wxNotebook_p."); return NULL; } } @@ -1051,7 +1417,7 @@ static PyObject *_wrap_wxNotebook_SetPageSize(PyObject *self, PyObject *args, Py } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxNotebook_SetPageSize(_arg0,*_arg1); + wxNotebook_SetPadding(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1060,23 +1426,23 @@ static PyObject *_wrap_wxNotebook_SetPageSize(PyObject *self, PyObject *args, Py return _resultobj; } -#define wxNotebook_SetPadding(_swigobj,_swigarg0) (_swigobj->SetPadding(_swigarg0)) -static PyObject *_wrap_wxNotebook_SetPadding(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxNotebook_SetTabSize(_swigobj,_swigarg0) (_swigobj->SetTabSize(_swigarg0)) +static PyObject *_wrap_wxNotebook_SetTabSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxNotebook * _arg0; wxSize * _arg1; PyObject * _argo0 = 0; wxSize temp; PyObject * _obj1 = 0; - char *_kwnames[] = { "self","padding", NULL }; + char *_kwnames[] = { "self","sz", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_SetPadding",_kwnames,&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_SetTabSize",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetPadding. Expected _wxNotebook_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetTabSize. Expected _wxNotebook_p."); return NULL; } } @@ -1087,7 +1453,7 @@ static PyObject *_wrap_wxNotebook_SetPadding(PyObject *self, PyObject *args, PyO } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxNotebook_SetPadding(_arg0,*_arg1); + wxNotebook_SetTabSize(_arg0,*_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1096,39 +1462,49 @@ static PyObject *_wrap_wxNotebook_SetPadding(PyObject *self, PyObject *args, PyO return _resultobj; } -#define wxNotebook_SetTabSize(_swigobj,_swigarg0) (_swigobj->SetTabSize(_swigarg0)) -static PyObject *_wrap_wxNotebook_SetTabSize(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxNotebook_HitTest(_swigobj,_swigarg0,_swigarg1) (_swigobj->HitTest(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxNotebook_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + int _result; wxNotebook * _arg0; - wxSize * _arg1; + wxPoint * _arg1; + long * _arg2; + long temp; PyObject * _argo0 = 0; - wxSize temp; + wxPoint temp0; PyObject * _obj1 = 0; - char *_kwnames[] = { "self","sz", NULL }; + char *_kwnames[] = { "self","pt", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_SetTabSize",_kwnames,&_argo0,&_obj1)) +{ + _arg2 = &temp; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_HitTest",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetTabSize. Expected _wxNotebook_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_HitTest. Expected _wxNotebook_p."); return NULL; } } { - _arg1 = &temp; - if (! wxSize_helper(_obj1, &_arg1)) + _arg1 = &temp0; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxNotebook_SetTabSize(_arg0,*_arg1); + _result = (int )wxNotebook_HitTest(_arg0,*_arg1,_arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} return _resultobj; } @@ -1170,28 +1546,134 @@ static PyObject *_wrap_wxNotebook_CalcSizeFromPage(PyObject *self, PyObject *arg return _resultobj; } -#define wxNotebook_DeletePage(_swigobj,_swigarg0) (_swigobj->DeletePage(_swigarg0)) -static PyObject *_wrap_wxNotebook_DeletePage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxNotebook_ApplyThemeBackground(_swigobj,_swigarg0,_swigarg1) (_swigobj->ApplyThemeBackground(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxNotebook_ApplyThemeBackground(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; wxNotebook * _arg0; - int _arg1; + wxWindow * _arg1; + wxColour * _arg2; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","page", NULL }; + PyObject * _argo1 = 0; + wxColour temp; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","window","colour", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_DeletePage",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxNotebook_ApplyThemeBackground",_kwnames,&_argo0,&_argo1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_DeletePage. Expected _wxNotebook_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_ApplyThemeBackground. Expected _wxNotebook_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxNotebook_ApplyThemeBackground. Expected _wxWindow_p."); + return NULL; + } + } +{ + _arg2 = &temp; + if (! wxColour_helper(_obj2, &_arg2)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxNotebook_ApplyThemeBackground(_arg0,_arg1,*_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static void *SwigwxNotebookEventTowxNotifyEvent(void *ptr) { + wxNotebookEvent *src; + wxNotifyEvent *dest; + src = (wxNotebookEvent *) ptr; + dest = (wxNotifyEvent *) src; + return (void *) dest; +} + +static void *SwigwxNotebookEventTowxCommandEvent(void *ptr) { + wxNotebookEvent *src; + wxCommandEvent *dest; + src = (wxNotebookEvent *) ptr; + dest = (wxCommandEvent *) src; + return (void *) dest; +} + +static void *SwigwxNotebookEventTowxEvent(void *ptr) { + wxNotebookEvent *src; + wxEvent *dest; + src = (wxNotebookEvent *) ptr; + dest = (wxEvent *) src; + return (void *) dest; +} + +static void *SwigwxNotebookEventTowxObject(void *ptr) { + wxNotebookEvent *src; + wxObject *dest; + src = (wxNotebookEvent *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +#define new_wxNotebookEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxNotebookEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_new_wxNotebookEvent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxNotebookEvent * _result; + wxEventType _arg0 = (wxEventType ) wxEVT_NULL; + int _arg1 = (int ) 0; + int _arg2 = (int ) -1; + int _arg3 = (int ) -1; + char *_kwnames[] = { "commandType","id","sel","oldSel", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iiii:new_wxNotebookEvent",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxNotebookEvent *)new_wxNotebookEvent(_arg0,_arg1,_arg2,_arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxNotebookEvent_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxNotebookEvent_GetSelection(_swigobj) (_swigobj->GetSelection()) +static PyObject *_wrap_wxNotebookEvent_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxNotebookEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebookEvent_GetSelection",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebookEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebookEvent_GetSelection. Expected _wxNotebookEvent_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxNotebook_DeletePage(_arg0,_arg1); + _result = (int )wxNotebookEvent_GetSelection(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1199,190 +1681,315 @@ static PyObject *_wrap_wxNotebook_DeletePage(PyObject *self, PyObject *args, PyO return _resultobj; } -#define wxNotebook_RemovePage(_swigobj,_swigarg0) (_swigobj->RemovePage(_swigarg0)) -static PyObject *_wrap_wxNotebook_RemovePage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxNotebookEvent_GetOldSelection(_swigobj) (_swigobj->GetOldSelection()) +static PyObject *_wrap_wxNotebookEvent_GetOldSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxNotebook * _arg0; + int _result; + wxNotebookEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebookEvent_GetOldSelection",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebookEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebookEvent_GetOldSelection. Expected _wxNotebookEvent_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (int )wxNotebookEvent_GetOldSelection(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxNotebookEvent_SetOldSelection(_swigobj,_swigarg0) (_swigobj->SetOldSelection(_swigarg0)) +static PyObject *_wrap_wxNotebookEvent_SetOldSelection(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxNotebookEvent * _arg0; int _arg1; PyObject * _argo0 = 0; char *_kwnames[] = { "self","page", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_RemovePage",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebookEvent_SetOldSelection",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_RemovePage. Expected _wxNotebook_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebookEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebookEvent_SetOldSelection. Expected _wxNotebookEvent_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxNotebook_RemovePage(_arg0,_arg1); + wxNotebookEvent_SetOldSelection(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxNotebook_DeleteAllPages(_swigobj) (_swigobj->DeleteAllPages()) -static PyObject *_wrap_wxNotebook_DeleteAllPages(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxNotebookEvent_SetSelection(_swigobj,_swigarg0) (_swigobj->SetSelection(_swigarg0)) +static PyObject *_wrap_wxNotebookEvent_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxNotebook * _arg0; + wxNotebookEvent * _arg0; + int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + char *_kwnames[] = { "self","page", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_DeleteAllPages",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebookEvent_SetSelection",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_DeleteAllPages. Expected _wxNotebook_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebookEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebookEvent_SetSelection. Expected _wxNotebookEvent_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxNotebook_DeleteAllPages(_arg0); + wxNotebookEvent_SetSelection(_arg0,_arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxNotebook_AddPage(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->AddPage(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_wxNotebook_AddPage(PyObject *self, PyObject *args, PyObject *kwargs) { +static void *SwigwxListbookTowxBookCtrl(void *ptr) { + wxListbook *src; + wxBookCtrl *dest; + src = (wxListbook *) ptr; + dest = (wxBookCtrl *) src; + return (void *) dest; +} + +static void *SwigwxListbookTowxControl(void *ptr) { + wxListbook *src; + wxControl *dest; + src = (wxListbook *) ptr; + dest = (wxControl *) src; + return (void *) dest; +} + +static void *SwigwxListbookTowxWindow(void *ptr) { + wxListbook *src; + wxWindow *dest; + src = (wxListbook *) ptr; + dest = (wxWindow *) src; + return (void *) dest; +} + +static void *SwigwxListbookTowxEvtHandler(void *ptr) { + wxListbook *src; + wxEvtHandler *dest; + src = (wxListbook *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +static void *SwigwxListbookTowxObject(void *ptr) { + wxListbook *src; + wxObject *dest; + src = (wxListbook *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +#define new_wxListbook(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxListbook(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_new_wxListbook(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxNotebook * _arg0; - wxWindow * _arg1; - wxString * _arg2; - bool _arg3 = (bool ) FALSE; - int _arg4 = (int ) -1; + wxListbook * _result; + wxWindow * _arg0; + wxWindowID _arg1; + wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg3 = (wxSize *) &wxDefaultSize; + long _arg4 = (long ) 0; + wxString * _arg5 = (wxString *) &wxPyEmptyString; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; PyObject * _obj2 = 0; - int tempbool3 = (int) FALSE; - char *_kwnames[] = { "self","page","text","telect","imageId", NULL }; + wxSize temp0; + PyObject * _obj3 = 0; + PyObject * _obj5 = 0; + char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|ii:wxNotebook_AddPage",_kwnames,&_argo0,&_argo1,&_obj2,&tempbool3,&_arg4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOlO:new_wxListbook",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_obj5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_AddPage. Expected _wxNotebook_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxListbook. Expected _wxWindow_p."); return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxNotebook_AddPage. Expected _wxWindow_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } +} + if (_obj3) { - _arg2 = wxString_in_helper(_obj2); - if (_arg2 == NULL) + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) + return NULL; +} + if (_obj5) +{ + _arg5 = wxString_in_helper(_obj5); + if (_arg5 == NULL) return NULL; } - _arg3 = (bool ) tempbool3; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxNotebook_AddPage(_arg0,_arg1,*_arg2,_arg3,_arg4); + _result = (wxListbook *)new_wxListbook(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxListbook_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } { - if (_obj2) - delete _arg2; + if (_obj5) + delete _arg5; +} + return _resultobj; } + +#define new_wxPreListbook() (new wxListbook()) +static PyObject *_wrap_new_wxPreListbook(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxListbook * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPreListbook",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxListbook *)new_wxPreListbook(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxListbook_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } -#define wxNotebook_InsertPage(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->InsertPage(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) -static PyObject *_wrap_wxNotebook_InsertPage(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxListbook_Create(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->Create(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_wxListbook_Create(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; - wxNotebook * _arg0; - int _arg1; - wxWindow * _arg2; - wxString * _arg3; - bool _arg4 = (bool ) FALSE; - int _arg5 = (int ) -1; + wxListbook * _arg0; + wxWindow * _arg1; + wxWindowID _arg2; + wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; + wxSize * _arg4 = (wxSize *) &wxDefaultSize; + long _arg5 = (long ) 0; + wxString * _arg6 = (wxString *) &wxPyEmptyString; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; + PyObject * _argo1 = 0; + wxPoint temp; PyObject * _obj3 = 0; - int tempbool4 = (int) FALSE; - char *_kwnames[] = { "self","index","page","text","select","imageId", NULL }; + wxSize temp0; + PyObject * _obj4 = 0; + PyObject * _obj6 = 0; + char *_kwnames[] = { "self","parent","id","pos","size","style","name", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOO|ii:wxNotebook_InsertPage",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&tempbool4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi|OOlO:wxListbook_Create",_kwnames,&_argo0,&_argo1,&_arg2,&_obj3,&_obj4,&_arg5,&_obj6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_InsertPage. Expected _wxNotebook_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListbook_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListbook_Create. Expected _wxListbook_p."); return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxNotebook_InsertPage. Expected _wxWindow_p."); + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListbook_Create. Expected _wxWindow_p."); return NULL; } } + if (_obj3) { - _arg3 = wxString_in_helper(_obj3); - if (_arg3 == NULL) + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) + return NULL; +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) + return NULL; +} + if (_obj6) +{ + _arg6 = wxString_in_helper(_obj6); + if (_arg6 == NULL) return NULL; } - _arg4 = (bool ) tempbool4; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (bool )wxNotebook_InsertPage(_arg0,_arg1,_arg2,*_arg3,_arg4,_arg5); + _result = (bool )wxListbook_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,*_arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); { - if (_obj3) - delete _arg3; + if (_obj6) + delete _arg6; } return _resultobj; } -#define wxNotebook_SetSelection(_swigobj,_swigarg0) (_swigobj->SetSelection(_swigarg0)) -static PyObject *_wrap_wxNotebook_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxListbook_IsVertical(_swigobj) (_swigobj->IsVertical()) +static PyObject *_wrap_wxListbook_IsVertical(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxNotebook * _arg0; - int _arg1; + bool _result; + wxListbook * _arg0; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","page", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_SetSelection",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListbook_IsVertical",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetSelection. Expected _wxNotebook_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListbook_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListbook_IsVertical. Expected _wxListbook_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxNotebook_SetSelection(_arg0,_arg1); + _result = (bool )wxListbook_IsVertical(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -1390,80 +1997,73 @@ static PyObject *_wrap_wxNotebook_SetSelection(PyObject *self, PyObject *args, P return _resultobj; } -#define wxNotebook_HitTest(_swigobj,_swigarg0,_swigarg1) (_swigobj->HitTest(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxNotebook_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - int _result; - wxNotebook * _arg0; - wxPoint * _arg1; - long * _arg2; - long temp; - PyObject * _argo0 = 0; - wxPoint temp0; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","pt", NULL }; +static void *SwigwxListbookEventTowxBookCtrlEvent(void *ptr) { + wxListbookEvent *src; + wxBookCtrlEvent *dest; + src = (wxListbookEvent *) ptr; + dest = (wxBookCtrlEvent *) src; + return (void *) dest; +} - self = self; -{ - _arg2 = &temp; +static void *SwigwxListbookEventTowxNotifyEvent(void *ptr) { + wxListbookEvent *src; + wxNotifyEvent *dest; + src = (wxListbookEvent *) ptr; + dest = (wxNotifyEvent *) src; + return (void *) dest; } - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_HitTest",_kwnames,&_argo0,&_obj1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_HitTest. Expected _wxNotebook_p."); - return NULL; - } - } -{ - _arg1 = &temp0; - if (! wxPoint_helper(_obj1, &_arg1)) - return NULL; + +static void *SwigwxListbookEventTowxCommandEvent(void *ptr) { + wxListbookEvent *src; + wxCommandEvent *dest; + src = (wxListbookEvent *) ptr; + dest = (wxCommandEvent *) src; + return (void *) dest; } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxNotebook_HitTest(_arg0,*_arg1,_arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); -{ - PyObject *o; - o = PyInt_FromLong((long) (*_arg2)); - _resultobj = t_output_helper(_resultobj, o); +static void *SwigwxListbookEventTowxEvent(void *ptr) { + wxListbookEvent *src; + wxEvent *dest; + src = (wxListbookEvent *) ptr; + dest = (wxEvent *) src; + return (void *) dest; } - return _resultobj; + +static void *SwigwxListbookEventTowxObject(void *ptr) { + wxListbookEvent *src; + wxObject *dest; + src = (wxListbookEvent *) ptr; + dest = (wxObject *) src; + return (void *) dest; } -#define wxNotebook_AdvanceSelection(_swigobj,_swigarg0) (_swigobj->AdvanceSelection(_swigarg0)) -static PyObject *_wrap_wxNotebook_AdvanceSelection(PyObject *self, PyObject *args, PyObject *kwargs) { +#define new_wxListbookEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxListbookEvent(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_new_wxListbookEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxNotebook * _arg0; - bool _arg1 = (bool ) TRUE; - PyObject * _argo0 = 0; - int tempbool1 = (int) TRUE; - char *_kwnames[] = { "self","forward", NULL }; + wxListbookEvent * _result; + wxEventType _arg0 = (wxEventType ) wxEVT_NULL; + int _arg1 = (int ) 0; + int _arg2 = (int ) -1; + int _arg3 = (int ) -1; + char *_kwnames[] = { "commandType","id","nSel","nOldSel", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxNotebook_AdvanceSelection",_kwnames,&_argo0,&tempbool1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_AdvanceSelection. Expected _wxNotebook_p."); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iiii:new_wxListbookEvent",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) return NULL; - } - } - _arg1 = (bool ) tempbool1; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxNotebook_AdvanceSelection(_arg0,_arg1); + _result = (wxListbookEvent *)new_wxListbookEvent(_arg0,_arg1,_arg2,_arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxListbookEvent_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } @@ -5139,37 +5739,49 @@ static PyMethodDef windows2cMethods[] = { { "wxSplitterEvent_GetX", (PyCFunction) _wrap_wxSplitterEvent_GetX, METH_VARARGS | METH_KEYWORDS }, { "wxSplitterEvent_GetSashPosition", (PyCFunction) _wrap_wxSplitterEvent_GetSashPosition, METH_VARARGS | METH_KEYWORDS }, { "new_wxSplitterEvent", (PyCFunction) _wrap_new_wxSplitterEvent, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_AdvanceSelection", (PyCFunction) _wrap_wxNotebook_AdvanceSelection, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_HitTest", (PyCFunction) _wrap_wxNotebook_HitTest, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_SetSelection", (PyCFunction) _wrap_wxNotebook_SetSelection, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_InsertPage", (PyCFunction) _wrap_wxNotebook_InsertPage, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_AddPage", (PyCFunction) _wrap_wxNotebook_AddPage, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_DeleteAllPages", (PyCFunction) _wrap_wxNotebook_DeleteAllPages, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_RemovePage", (PyCFunction) _wrap_wxNotebook_RemovePage, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_DeletePage", (PyCFunction) _wrap_wxNotebook_DeletePage, METH_VARARGS | METH_KEYWORDS }, + { "new_wxListbookEvent", (PyCFunction) _wrap_new_wxListbookEvent, METH_VARARGS | METH_KEYWORDS }, + { "wxListbook_IsVertical", (PyCFunction) _wrap_wxListbook_IsVertical, METH_VARARGS | METH_KEYWORDS }, + { "wxListbook_Create", (PyCFunction) _wrap_wxListbook_Create, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPreListbook", (PyCFunction) _wrap_new_wxPreListbook, METH_VARARGS | METH_KEYWORDS }, + { "new_wxListbook", (PyCFunction) _wrap_new_wxListbook, METH_VARARGS | METH_KEYWORDS }, + { "wxNotebookEvent_SetSelection", (PyCFunction) _wrap_wxNotebookEvent_SetSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxNotebookEvent_SetOldSelection", (PyCFunction) _wrap_wxNotebookEvent_SetOldSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxNotebookEvent_GetOldSelection", (PyCFunction) _wrap_wxNotebookEvent_GetOldSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxNotebookEvent_GetSelection", (PyCFunction) _wrap_wxNotebookEvent_GetSelection, METH_VARARGS | METH_KEYWORDS }, + { "new_wxNotebookEvent", (PyCFunction) _wrap_new_wxNotebookEvent, METH_VARARGS | METH_KEYWORDS }, + { "wxNotebook_ApplyThemeBackground", (PyCFunction) _wrap_wxNotebook_ApplyThemeBackground, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_CalcSizeFromPage", (PyCFunction) _wrap_wxNotebook_CalcSizeFromPage, METH_VARARGS | METH_KEYWORDS }, + { "wxNotebook_HitTest", (PyCFunction) _wrap_wxNotebook_HitTest, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_SetTabSize", (PyCFunction) _wrap_wxNotebook_SetTabSize, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_SetPadding", (PyCFunction) _wrap_wxNotebook_SetPadding, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_SetPageSize", (PyCFunction) _wrap_wxNotebook_SetPageSize, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_GetRowCount", (PyCFunction) _wrap_wxNotebook_GetRowCount, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_SetPageImage", (PyCFunction) _wrap_wxNotebook_SetPageImage, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_GetPageImage", (PyCFunction) _wrap_wxNotebook_GetPageImage, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_GetImageList", (PyCFunction) _wrap_wxNotebook_GetImageList, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_AssignImageList", (PyCFunction) _wrap_wxNotebook_AssignImageList, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_SetImageList", (PyCFunction) _wrap_wxNotebook_SetImageList, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_GetPageText", (PyCFunction) _wrap_wxNotebook_GetPageText, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_SetPageText", (PyCFunction) _wrap_wxNotebook_SetPageText, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_GetSelection", (PyCFunction) _wrap_wxNotebook_GetSelection, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_GetPage", (PyCFunction) _wrap_wxNotebook_GetPage, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebook_GetPageCount", (PyCFunction) _wrap_wxNotebook_GetPageCount, METH_VARARGS | METH_KEYWORDS }, { "wxNotebook_Create", (PyCFunction) _wrap_wxNotebook_Create, METH_VARARGS | METH_KEYWORDS }, { "new_wxPreNotebook", (PyCFunction) _wrap_new_wxPreNotebook, METH_VARARGS | METH_KEYWORDS }, { "new_wxNotebook", (PyCFunction) _wrap_new_wxNotebook, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebookEvent_SetSelection", (PyCFunction) _wrap_wxNotebookEvent_SetSelection, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebookEvent_SetOldSelection", (PyCFunction) _wrap_wxNotebookEvent_SetOldSelection, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebookEvent_GetOldSelection", (PyCFunction) _wrap_wxNotebookEvent_GetOldSelection, METH_VARARGS | METH_KEYWORDS }, - { "wxNotebookEvent_GetSelection", (PyCFunction) _wrap_wxNotebookEvent_GetSelection, METH_VARARGS | METH_KEYWORDS }, - { "new_wxNotebookEvent", (PyCFunction) _wrap_new_wxNotebookEvent, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrlEvent_SetOldSelection", (PyCFunction) _wrap_wxBookCtrlEvent_SetOldSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrlEvent_GetOldSelection", (PyCFunction) _wrap_wxBookCtrlEvent_GetOldSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrlEvent_SetSelection", (PyCFunction) _wrap_wxBookCtrlEvent_SetSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrlEvent_GetSelection", (PyCFunction) _wrap_wxBookCtrlEvent_GetSelection, METH_VARARGS | METH_KEYWORDS }, + { "new_wxBookCtrlEvent", (PyCFunction) _wrap_new_wxBookCtrlEvent, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_AdvanceSelection", (PyCFunction) _wrap_wxBookCtrl_AdvanceSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_SetSelection", (PyCFunction) _wrap_wxBookCtrl_SetSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_InsertPage", (PyCFunction) _wrap_wxBookCtrl_InsertPage, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_AddPage", (PyCFunction) _wrap_wxBookCtrl_AddPage, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_DeleteAllPages", (PyCFunction) _wrap_wxBookCtrl_DeleteAllPages, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_RemovePage", (PyCFunction) _wrap_wxBookCtrl_RemovePage, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_DeletePage", (PyCFunction) _wrap_wxBookCtrl_DeletePage, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_CalcSizeFromPage", (PyCFunction) _wrap_wxBookCtrl_CalcSizeFromPage, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_SetPageSize", (PyCFunction) _wrap_wxBookCtrl_SetPageSize, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_SetPageImage", (PyCFunction) _wrap_wxBookCtrl_SetPageImage, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_GetPageImage", (PyCFunction) _wrap_wxBookCtrl_GetPageImage, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_GetImageList", (PyCFunction) _wrap_wxBookCtrl_GetImageList, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_AssignImageList", (PyCFunction) _wrap_wxBookCtrl_AssignImageList, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_SetImageList", (PyCFunction) _wrap_wxBookCtrl_SetImageList, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_GetPageText", (PyCFunction) _wrap_wxBookCtrl_GetPageText, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_SetPageText", (PyCFunction) _wrap_wxBookCtrl_SetPageText, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_GetSelection", (PyCFunction) _wrap_wxBookCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_GetPage", (PyCFunction) _wrap_wxBookCtrl_GetPage, METH_VARARGS | METH_KEYWORDS }, + { "wxBookCtrl_GetPageCount", (PyCFunction) _wrap_wxBookCtrl_GetPageCount, METH_VARARGS | METH_KEYWORDS }, { NULL, NULL } }; #ifdef __cplusplus @@ -5181,7 +5793,9 @@ static PyMethodDef windows2cMethods[] = { static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxEvent","_wxTaskBarIconEvent",SwigwxTaskBarIconEventTowxEvent}, { "_wxEvent","_wxSplitterEvent",SwigwxSplitterEventTowxEvent}, + { "_wxEvent","_wxListbookEvent",SwigwxListbookEventTowxEvent}, { "_wxEvent","_wxNotebookEvent",SwigwxNotebookEventTowxEvent}, + { "_wxEvent","_wxBookCtrlEvent",SwigwxBookCtrlEventTowxEvent}, { "_signed_long","_long",0}, { "_wxPrintQuality","_wxCoord",0}, { "_wxPrintQuality","_int",0}, @@ -5193,7 +5807,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_size_t",0}, { "_wxPrintQuality","_time_t",0}, { "_wxNotifyEvent","_wxSplitterEvent",SwigwxSplitterEventTowxNotifyEvent}, + { "_wxNotifyEvent","_wxListbookEvent",SwigwxListbookEventTowxNotifyEvent}, { "_wxNotifyEvent","_wxNotebookEvent",SwigwxNotebookEventTowxNotifyEvent}, + { "_wxNotifyEvent","_wxBookCtrlEvent",SwigwxBookCtrlEventTowxNotifyEvent}, { "_byte","_unsigned_char",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, @@ -5205,6 +5821,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, { "_wxPanel","_wxPyPanel",SwigwxPyPanelTowxPanel}, + { "_wxBookCtrlEvent","_wxListbookEvent",SwigwxListbookEventTowxBookCtrlEvent}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_time_t",0}, @@ -5214,7 +5831,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_wxWindowID",0}, { "_wxChar","_char",0}, { "_wxCommandEvent","_wxSplitterEvent",SwigwxSplitterEventTowxCommandEvent}, + { "_wxCommandEvent","_wxListbookEvent",SwigwxListbookEventTowxCommandEvent}, { "_wxCommandEvent","_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent}, + { "_wxCommandEvent","_wxBookCtrlEvent",SwigwxBookCtrlEventTowxCommandEvent}, { "_char","_wxChar",0}, { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, { "_EBool","_wxCoord",0}, @@ -5241,13 +5860,19 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxObject","_wxTaskBarIconEvent",SwigwxTaskBarIconEventTowxObject}, { "_wxObject","_wxSplitterWindow",SwigwxSplitterWindowTowxObject}, { "_wxObject","_wxSplitterEvent",SwigwxSplitterEventTowxObject}, - { "_wxObject","_wxNotebook",SwigwxNotebookTowxObject}, + { "_wxObject","_wxListbookEvent",SwigwxListbookEventTowxObject}, + { "_wxObject","_wxListbook",SwigwxListbookTowxObject}, { "_wxObject","_wxNotebookEvent",SwigwxNotebookEventTowxObject}, + { "_wxObject","_wxNotebook",SwigwxNotebookTowxObject}, + { "_wxObject","_wxBookCtrlEvent",SwigwxBookCtrlEventTowxObject}, + { "_wxObject","_wxBookCtrl",SwigwxBookCtrlTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, { "_unsigned_char","_byte",0}, { "_wxControl","_wxPyControl",SwigwxPyControlTowxControl}, + { "_wxControl","_wxListbook",SwigwxListbookTowxControl}, { "_wxControl","_wxNotebook",SwigwxNotebookTowxControl}, + { "_wxControl","_wxBookCtrl",SwigwxBookCtrlTowxControl}, { "_unsigned_int","_wxCoord",0}, { "_unsigned_int","_wxPrintQuality",0}, { "_unsigned_int","_time_t",0}, @@ -5258,6 +5883,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_short","_WXTYPE",0}, { "_short","_unsigned_short",0}, { "_short","_signed_short",0}, + { "_wxBookCtrl","_wxListbook",SwigwxListbookTowxBookCtrl}, + { "_wxBookCtrl","_wxNotebook",SwigwxNotebookTowxBookCtrl}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, { "_wxWindowID","_time_t",0}, @@ -5297,12 +5924,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxEvtHandler","_wxPyWindow",SwigwxPyWindowTowxEvtHandler}, { "_wxEvtHandler","_wxTaskBarIcon",SwigwxTaskBarIconTowxEvtHandler}, { "_wxEvtHandler","_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler}, + { "_wxEvtHandler","_wxListbook",SwigwxListbookTowxEvtHandler}, { "_wxEvtHandler","_wxNotebook",SwigwxNotebookTowxEvtHandler}, + { "_wxEvtHandler","_wxBookCtrl",SwigwxBookCtrlTowxEvtHandler}, { "_wxWindow","_wxPyPanel",SwigwxPyPanelTowxWindow}, { "_wxWindow","_wxPyControl",SwigwxPyControlTowxWindow}, { "_wxWindow","_wxPyWindow",SwigwxPyWindowTowxWindow}, { "_wxWindow","_wxSplitterWindow",SwigwxSplitterWindowTowxWindow}, + { "_wxWindow","_wxListbook",SwigwxListbookTowxWindow}, { "_wxWindow","_wxNotebook",SwigwxNotebookTowxWindow}, + { "_wxWindow","_wxBookCtrl",SwigwxBookCtrlTowxWindow}, {0,0,0}}; static PyObject *SWIG_globals; @@ -5326,6 +5957,14 @@ SWIGEXPORT(void) initwindows2c() { PyDict_SetItemString(d,"wxNB_HITTEST_ONICON", PyInt_FromLong((long) wxNB_HITTEST_ONICON)); PyDict_SetItemString(d,"wxNB_HITTEST_ONLABEL", PyInt_FromLong((long) wxNB_HITTEST_ONLABEL)); PyDict_SetItemString(d,"wxNB_HITTEST_ONITEM", PyInt_FromLong((long) wxNB_HITTEST_ONITEM)); + PyDict_SetItemString(d,"wxLB_DEFAULT", PyInt_FromLong((long) wxLB_DEFAULT)); + PyDict_SetItemString(d,"wxLB_TOP", PyInt_FromLong((long) wxLB_TOP)); + PyDict_SetItemString(d,"wxLB_BOTTOM", PyInt_FromLong((long) wxLB_BOTTOM)); + PyDict_SetItemString(d,"wxLB_LEFT", PyInt_FromLong((long) wxLB_LEFT)); + PyDict_SetItemString(d,"wxLB_RIGHT", PyInt_FromLong((long) wxLB_RIGHT)); + PyDict_SetItemString(d,"wxLB_ALIGN_MASK", PyInt_FromLong((long) wxLB_ALIGN_MASK)); + PyDict_SetItemString(d,"wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED)); + PyDict_SetItemString(d,"wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING)); PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING)); PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED)); PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_UNSPLIT", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_UNSPLIT)); diff --git a/wxPython/src/msw/windows2.py b/wxPython/src/msw/windows2.py index f5b73d4c9b..33a38d5928 100644 --- a/wxPython/src/msw/windows2.py +++ b/wxPython/src/msw/windows2.py @@ -16,6 +16,22 @@ from controls import * from events import * import wx +# wxNotebook events +def EVT_NOTEBOOK_PAGE_CHANGED(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, func) + +def EVT_NOTEBOOK_PAGE_CHANGING(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, func) + + +#wxListbook events +def EVT_LISTBOOK_PAGE_CHANGED(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, func) + +def EVT_LISTBOOK_PAGE_CHANGING(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, func) + + def EVT_TASKBAR_MOVE(win, func): win.Connect(-1, -1, wxEVT_TASKBAR_MOVE, func) @@ -37,109 +53,129 @@ def EVT_TASKBAR_LEFT_DCLICK(win, func): def EVT_TASKBAR_RIGHT_DCLICK(win, func): win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DCLICK, func) -class wxNotebookEventPtr(wxNotifyEventPtr): +class wxBookCtrlPtr(wxControlPtr): def __init__(self,this): self.this = this self.thisown = 0 - def GetSelection(self, *_args, **_kwargs): - val = windows2c.wxNotebookEvent_GetSelection(self, *_args, **_kwargs) - return val - def GetOldSelection(self, *_args, **_kwargs): - val = windows2c.wxNotebookEvent_GetOldSelection(self, *_args, **_kwargs) - return val - def SetOldSelection(self, *_args, **_kwargs): - val = windows2c.wxNotebookEvent_SetOldSelection(self, *_args, **_kwargs) - return val - def SetSelection(self, *_args, **_kwargs): - val = windows2c.wxNotebookEvent_SetSelection(self, *_args, **_kwargs) - return val - def __repr__(self): - return "<%s.%s instance; proxy of C++ wxNotebookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) -class wxNotebookEvent(wxNotebookEventPtr): - def __init__(self,*_args,**_kwargs): - self.this = windows2c.new_wxNotebookEvent(*_args,**_kwargs) - self.thisown = 1 - - - - -class wxNotebookPtr(wxControlPtr): - def __init__(self,this): - self.this = this - self.thisown = 0 - def Create(self, *_args, **_kwargs): - val = windows2c.wxNotebook_Create(self, *_args, **_kwargs) - return val def GetPageCount(self, *_args, **_kwargs): - val = windows2c.wxNotebook_GetPageCount(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_GetPageCount(self, *_args, **_kwargs) return val def GetPage(self, *_args, **_kwargs): - val = windows2c.wxNotebook_GetPage(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_GetPage(self, *_args, **_kwargs) return val def GetSelection(self, *_args, **_kwargs): - val = windows2c.wxNotebook_GetSelection(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_GetSelection(self, *_args, **_kwargs) return val def SetPageText(self, *_args, **_kwargs): - val = windows2c.wxNotebook_SetPageText(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_SetPageText(self, *_args, **_kwargs) return val def GetPageText(self, *_args, **_kwargs): - val = windows2c.wxNotebook_GetPageText(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_GetPageText(self, *_args, **_kwargs) return val def SetImageList(self, *_args, **_kwargs): - val = windows2c.wxNotebook_SetImageList(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_SetImageList(self, *_args, **_kwargs) return val def AssignImageList(self, *_args, **_kwargs): - val = windows2c.wxNotebook_AssignImageList(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_AssignImageList(self, *_args, **_kwargs) _args[0].thisown = 0 return val def GetImageList(self, *_args, **_kwargs): - val = windows2c.wxNotebook_GetImageList(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_GetImageList(self, *_args, **_kwargs) return val def GetPageImage(self, *_args, **_kwargs): - val = windows2c.wxNotebook_GetPageImage(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_GetPageImage(self, *_args, **_kwargs) return val def SetPageImage(self, *_args, **_kwargs): - val = windows2c.wxNotebook_SetPageImage(self, *_args, **_kwargs) - return val - def GetRowCount(self, *_args, **_kwargs): - val = windows2c.wxNotebook_GetRowCount(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_SetPageImage(self, *_args, **_kwargs) return val def SetPageSize(self, *_args, **_kwargs): - val = windows2c.wxNotebook_SetPageSize(self, *_args, **_kwargs) - return val - def SetPadding(self, *_args, **_kwargs): - val = windows2c.wxNotebook_SetPadding(self, *_args, **_kwargs) - return val - def SetTabSize(self, *_args, **_kwargs): - val = windows2c.wxNotebook_SetTabSize(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_SetPageSize(self, *_args, **_kwargs) return val def CalcSizeFromPage(self, *_args, **_kwargs): - val = windows2c.wxNotebook_CalcSizeFromPage(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_CalcSizeFromPage(self, *_args, **_kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val def DeletePage(self, *_args, **_kwargs): - val = windows2c.wxNotebook_DeletePage(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_DeletePage(self, *_args, **_kwargs) return val def RemovePage(self, *_args, **_kwargs): - val = windows2c.wxNotebook_RemovePage(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_RemovePage(self, *_args, **_kwargs) return val def DeleteAllPages(self, *_args, **_kwargs): - val = windows2c.wxNotebook_DeleteAllPages(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_DeleteAllPages(self, *_args, **_kwargs) return val def AddPage(self, *_args, **_kwargs): - val = windows2c.wxNotebook_AddPage(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_AddPage(self, *_args, **_kwargs) return val def InsertPage(self, *_args, **_kwargs): - val = windows2c.wxNotebook_InsertPage(self, *_args, **_kwargs) + val = windows2c.wxBookCtrl_InsertPage(self, *_args, **_kwargs) + return val + def SetSelection(self, *_args, **_kwargs): + val = windows2c.wxBookCtrl_SetSelection(self, *_args, **_kwargs) + return val + def AdvanceSelection(self, *_args, **_kwargs): + val = windows2c.wxBookCtrl_AdvanceSelection(self, *_args, **_kwargs) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxBookCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxBookCtrl(wxBookCtrlPtr): + def __init__(self,this): + self.this = this + + + + +class wxBookCtrlEventPtr(wxNotifyEventPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def GetSelection(self, *_args, **_kwargs): + val = windows2c.wxBookCtrlEvent_GetSelection(self, *_args, **_kwargs) return val def SetSelection(self, *_args, **_kwargs): - val = windows2c.wxNotebook_SetSelection(self, *_args, **_kwargs) + val = windows2c.wxBookCtrlEvent_SetSelection(self, *_args, **_kwargs) + return val + def GetOldSelection(self, *_args, **_kwargs): + val = windows2c.wxBookCtrlEvent_GetOldSelection(self, *_args, **_kwargs) + return val + def SetOldSelection(self, *_args, **_kwargs): + val = windows2c.wxBookCtrlEvent_SetOldSelection(self, *_args, **_kwargs) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxBookCtrlEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxBookCtrlEvent(wxBookCtrlEventPtr): + def __init__(self,*_args,**_kwargs): + self.this = windows2c.new_wxBookCtrlEvent(*_args,**_kwargs) + self.thisown = 1 + + + + +class wxNotebookPtr(wxBookCtrlPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def Create(self, *_args, **_kwargs): + val = windows2c.wxNotebook_Create(self, *_args, **_kwargs) + return val + def GetRowCount(self, *_args, **_kwargs): + val = windows2c.wxNotebook_GetRowCount(self, *_args, **_kwargs) + return val + def SetPadding(self, *_args, **_kwargs): + val = windows2c.wxNotebook_SetPadding(self, *_args, **_kwargs) + return val + def SetTabSize(self, *_args, **_kwargs): + val = windows2c.wxNotebook_SetTabSize(self, *_args, **_kwargs) return val def HitTest(self, *_args, **_kwargs): val = windows2c.wxNotebook_HitTest(self, *_args, **_kwargs) return val - def AdvanceSelection(self, *_args, **_kwargs): - val = windows2c.wxNotebook_AdvanceSelection(self, *_args, **_kwargs) + def CalcSizeFromPage(self, *_args, **_kwargs): + val = windows2c.wxNotebook_CalcSizeFromPage(self, *_args, **_kwargs) + if val: val = wxSizePtr(val) ; val.thisown = 1 + return val + def ApplyThemeBackground(self, *_args, **_kwargs): + val = windows2c.wxNotebook_ApplyThemeBackground(self, *_args, **_kwargs) return val def __repr__(self): return "<%s.%s instance; proxy of C++ wxNotebook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) @@ -158,6 +194,73 @@ def wxPreNotebook(*_args,**_kwargs): return val +class wxNotebookEventPtr(wxNotifyEventPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def GetSelection(self, *_args, **_kwargs): + val = windows2c.wxNotebookEvent_GetSelection(self, *_args, **_kwargs) + return val + def GetOldSelection(self, *_args, **_kwargs): + val = windows2c.wxNotebookEvent_GetOldSelection(self, *_args, **_kwargs) + return val + def SetOldSelection(self, *_args, **_kwargs): + val = windows2c.wxNotebookEvent_SetOldSelection(self, *_args, **_kwargs) + return val + def SetSelection(self, *_args, **_kwargs): + val = windows2c.wxNotebookEvent_SetSelection(self, *_args, **_kwargs) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxNotebookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxNotebookEvent(wxNotebookEventPtr): + def __init__(self,*_args,**_kwargs): + self.this = windows2c.new_wxNotebookEvent(*_args,**_kwargs) + self.thisown = 1 + + + + +class wxListbookPtr(wxBookCtrlPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def Create(self, *_args, **_kwargs): + val = windows2c.wxListbook_Create(self, *_args, **_kwargs) + return val + def IsVertical(self, *_args, **_kwargs): + val = windows2c.wxListbook_IsVertical(self, *_args, **_kwargs) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxListbook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxListbook(wxListbookPtr): + def __init__(self,*_args,**_kwargs): + self.this = windows2c.new_wxListbook(*_args,**_kwargs) + self.thisown = 1 + self._setOORInfo(self) + + + +def wxPreListbook(*_args,**_kwargs): + val = wxListbookPtr(windows2c.new_wxPreListbook(*_args,**_kwargs)) + val.thisown = 1 + val._setOORInfo(val) + return val + + +class wxListbookEventPtr(wxBookCtrlEventPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxListbookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxListbookEvent(wxListbookEventPtr): + def __init__(self,*_args,**_kwargs): + self.this = windows2c.new_wxListbookEvent(*_args,**_kwargs) + self.thisown = 1 + + + + class wxSplitterEventPtr(wxNotifyEventPtr): def __init__(self,this): self.this = this @@ -578,6 +681,14 @@ wxNB_HITTEST_NOWHERE = windows2c.wxNB_HITTEST_NOWHERE wxNB_HITTEST_ONICON = windows2c.wxNB_HITTEST_ONICON wxNB_HITTEST_ONLABEL = windows2c.wxNB_HITTEST_ONLABEL wxNB_HITTEST_ONITEM = windows2c.wxNB_HITTEST_ONITEM +wxLB_DEFAULT = windows2c.wxLB_DEFAULT +wxLB_TOP = windows2c.wxLB_TOP +wxLB_BOTTOM = windows2c.wxLB_BOTTOM +wxLB_LEFT = windows2c.wxLB_LEFT +wxLB_RIGHT = windows2c.wxLB_RIGHT +wxLB_ALIGN_MASK = windows2c.wxLB_ALIGN_MASK +wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = windows2c.wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED +wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING = windows2c.wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = windows2c.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = windows2c.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED wxEVT_COMMAND_SPLITTER_UNSPLIT = windows2c.wxEVT_COMMAND_SPLITTER_UNSPLIT diff --git a/wxPython/src/msw/windows3.cpp b/wxPython/src/msw/windows3.cpp index 23d8bf1264..debe25579c 100644 --- a/wxPython/src/msw/windows3.cpp +++ b/wxPython/src/msw/windows3.cpp @@ -4884,6 +4884,11 @@ SWIGEXPORT(void) initwindows3c() { PyDict_SetItemString(d,"wxLAYOUT_BOTTOM", PyInt_FromLong((long) wxLAYOUT_BOTTOM)); PyDict_SetItemString(d,"wxEVT_QUERY_LAYOUT_INFO", PyInt_FromLong((long) wxEVT_QUERY_LAYOUT_INFO)); PyDict_SetItemString(d,"wxEVT_CALCULATE_LAYOUT", PyInt_FromLong((long) wxEVT_CALCULATE_LAYOUT)); + + // Map renamed classes back to their common name for OOR + wxPyPtrTypeMap_Add("wxHtmlListBox", "wxPyHtmlListBox"); + wxPyPtrTypeMap_Add("wxVListBox", "wxPyVListBox"); + wxPyPtrTypeMap_Add("wxVScrolledWindow", "wxPyVScrolledWindow"); { int i; for (i = 0; _swig_mapping[i].n1; i++) diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py index f69a9cdb32..5dff12250f 100644 --- a/wxPython/src/msw/wx.py +++ b/wxPython/src/msw/wx.py @@ -1426,14 +1426,6 @@ def EVT_COMMAND_ENTER(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_ENTER, func) -# wxNotebook events -def EVT_NOTEBOOK_PAGE_CHANGED(win, id, func): - win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, func) - -def EVT_NOTEBOOK_PAGE_CHANGING(win, id, func): - win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, func) - - # wxSpinButton def EVT_SPIN_UP(win, id, func): win.Connect(id, -1, wxEVT_SCROLL_LINEUP, func) -- 2.45.2