reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/src/mac/stattool.cpp

@@ -56,7 +56,6 @@ extern PyObject *SWIG_newvarlink(void);
 
 #include "helpers.h"
 #include <wx/toolbar.h>
-#include <wx/tbarsmpl.h>
 
 
 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},

wxPython/src/mac/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 ------------------

wxPython/src/mac/windows2.py

@@ -15,6 +15,160 @@ 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)
+
+class wxBookCtrlPtr(wxControlPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetPageCount(self, *_args, **_kwargs):
+        val = windows2c.wxBookCtrl_GetPageCount(self, *_args, **_kwargs)
+        return val
+    def GetPage(self, *_args, **_kwargs):
+        val = windows2c.wxBookCtrl_GetPage(self, *_args, **_kwargs)
+        return val
+    def GetSelection(self, *_args, **_kwargs):
+        val = windows2c.wxBookCtrl_GetSelection(self, *_args, **_kwargs)
+        return val
+    def SetPageText(self, *_args, **_kwargs):
+        val = windows2c.wxBookCtrl_SetPageText(self, *_args, **_kwargs)
+        return val
+    def GetPageText(self, *_args, **_kwargs):
+        val = windows2c.wxBookCtrl_GetPageText(self, *_args, **_kwargs)
+        return val
+    def SetImageList(self, *_args, **_kwargs):
+        val = windows2c.wxBookCtrl_SetImageList(self, *_args, **_kwargs)
+        return val
+    def AssignImageList(self, *_args, **_kwargs):
+        val = windows2c.wxBookCtrl_AssignImageList(self, *_args, **_kwargs)
+        _args[0].thisown = 0
+        return val
+    def GetImageList(self, *_args, **_kwargs):
+        val = windows2c.wxBookCtrl_GetImageList(self, *_args, **_kwargs)
+        return val
+    def GetPageImage(self, *_args, **_kwargs):
+        val = windows2c.wxBookCtrl_GetPageImage(self, *_args, **_kwargs)
+        return val
+    def SetPageImage(self, *_args, **_kwargs):
+        val = windows2c.wxBookCtrl_SetPageImage(self, *_args, **_kwargs)
+        return val
+    def SetPageSize(self, *_args, **_kwargs):
+        val = windows2c.wxBookCtrl_SetPageSize(self, *_args, **_kwargs)
+        return val
+    def 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.wxBookCtrl_DeletePage(self, *_args, **_kwargs)
+        return val
+    def RemovePage(self, *_args, **_kwargs):
+        val = windows2c.wxBookCtrl_RemovePage(self, *_args, **_kwargs)
+        return val
+    def DeleteAllPages(self, *_args, **_kwargs):
+        val = windows2c.wxBookCtrl_DeleteAllPages(self, *_args, **_kwargs)
+        return val
+    def AddPage(self, *_args, **_kwargs):
+        val = windows2c.wxBookCtrl_AddPage(self, *_args, **_kwargs)
+        return val
+    def 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.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 CalcSizeFromPage(self, *_args, **_kwargs):
+        val = windows2c.wxNotebook_CalcSizeFromPage(self, *_args, **_kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
+        return val
+    def __repr__(self):
+        return "<%s.%s instance; proxy of C++ wxNotebook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+class wxNotebook(wxNotebookPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = windows2c.new_wxNotebook(*_args,**_kwargs)
+        self.thisown = 1
+        self._setOORInfo(self)
+
+
+
+def wxPreNotebook(*_args,**_kwargs):
+    val = wxNotebookPtr(windows2c.new_wxPreNotebook(*_args,**_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+
+
 class wxNotebookEventPtr(wxNotifyEventPtr):
     def __init__(self,this):
         self.this = this
@@ -41,101 +195,47 @@ class wxNotebookEvent(wxNotebookEventPtr):
 
 
 
-class wxNotebookPtr(wxControlPtr):
+class wxListbookPtr(wxBookCtrlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = windows2c.wxNotebook_Create(self, *_args, **_kwargs)
+        val = windows2c.wxListbook_Create(self, *_args, **_kwargs)
         return val
-    def GetPageCount(self, *_args, **_kwargs):
+    def IsVertical(self, *_args, **_kwargs):
-        val = windows2c.wxNotebook_GetPageCount(self, *_args, **_kwargs)
+        val = windows2c.wxListbook_IsVertical(self, *_args, **_kwargs)
-        return val
-    def GetPage(self, *_args, **_kwargs):
-        val = windows2c.wxNotebook_GetPage(self, *_args, **_kwargs)
-        return val
-    def GetSelection(self, *_args, **_kwargs):
-        val = windows2c.wxNotebook_GetSelection(self, *_args, **_kwargs)
-        return val
-    def SetPageText(self, *_args, **_kwargs):
-        val = windows2c.wxNotebook_SetPageText(self, *_args, **_kwargs)
-        return val
-    def GetPageText(self, *_args, **_kwargs):
-        val = windows2c.wxNotebook_GetPageText(self, *_args, **_kwargs)
-        return val
-    def SetImageList(self, *_args, **_kwargs):
-        val = windows2c.wxNotebook_SetImageList(self, *_args, **_kwargs)
-        return val
-    def AssignImageList(self, *_args, **_kwargs):
-        val = windows2c.wxNotebook_AssignImageList(self, *_args, **_kwargs)
-        _args[0].thisown = 0
-        return val
-    def GetImageList(self, *_args, **_kwargs):
-        val = windows2c.wxNotebook_GetImageList(self, *_args, **_kwargs)
-        return val
-    def GetPageImage(self, *_args, **_kwargs):
-        val = windows2c.wxNotebook_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)
-        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)
-        return val
-    def CalcSizeFromPage(self, *_args, **_kwargs):
-        val = windows2c.wxNotebook_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)
-        return val
-    def RemovePage(self, *_args, **_kwargs):
-        val = windows2c.wxNotebook_RemovePage(self, *_args, **_kwargs)
-        return val
-    def DeleteAllPages(self, *_args, **_kwargs):
-        val = windows2c.wxNotebook_DeleteAllPages(self, *_args, **_kwargs)
-        return val
-    def AddPage(self, *_args, **_kwargs):
-        val = windows2c.wxNotebook_AddPage(self, *_args, **_kwargs)
-        return val
-    def InsertPage(self, *_args, **_kwargs):
-        val = windows2c.wxNotebook_InsertPage(self, *_args, **_kwargs)
-        return val
-    def SetSelection(self, *_args, **_kwargs):
-        val = windows2c.wxNotebook_SetSelection(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)
         return val
     def __repr__(self):
-        return "<%s.%s instance; proxy of C++ wxNotebook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+        return "<%s.%s instance; proxy of C++ wxListbook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
-class wxNotebook(wxNotebookPtr):
+class wxListbook(wxListbookPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = windows2c.new_wxNotebook(*_args,**_kwargs)
+        self.this = windows2c.new_wxListbook(*_args,**_kwargs)
         self.thisown = 1
         self._setOORInfo(self)
 
 
 
-def wxPreNotebook(*_args,**_kwargs):
+def wxPreListbook(*_args,**_kwargs):
-    val = wxNotebookPtr(windows2c.new_wxPreNotebook(*_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
@@ -500,6 +600,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

wxPython/src/mac/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)