wxWindowsPrinter::Print ignored the "All pages" option, instead it was using the...

[wxWidgets.git] / wxPython / src / gtk / windows2.cpp

diff --git a/wxPython/src/gtk/windows2.cpp b/wxPython/src/gtk/windows2.cpp
index 54d802fd96db1225af22d7d7e8c3a33e140f19bb..ec767cadbf71a75bb0bde8c0d9dacf5960cd498b 100644 (file)
--- a/wxPython/src/gtk/windows2.cpp
+++ b/wxPython/src/gtk/windows2.cpp
@@ -56,10 +56,11 @@ extern PyObject *SWIG_newvarlink(void);
 
 #include "helpers.h"
 #include <wx/notebook.h>
 
 #include "helpers.h"
 #include <wx/notebook.h>

+#include <wx/listbook.h>

 #include <wx/splitter.h>
 #include <wx/imaglist.h>
 #ifdef __WXMSW__
 #include <wx/splitter.h>
 #include <wx/imaglist.h>
 #ifdef __WXMSW__

-#include <wx/msw/taskbar.h>
+#include <wx/taskbar.h>

 #endif
 
     // Put some wx default wxChar* values into wxStrings.
 #endif
 
     // Put some wx default wxChar* values into wxStrings.


@@ -302,89 +303,116 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyPanel, wxPanel, RemoveChild);
 #ifdef __cplusplus
 extern "C" {
 #endif
 #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;
 }
 
     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;
 }
 
     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;
 }
 
     return (void *) dest;
 }
 

-static void *SwigwxNotebookEventTowxObject(void *ptr) {
-    wxNotebookEvent *src;
+static void *SwigwxBookCtrlTowxObject(void *ptr) {
+    wxBookCtrl *src;

     wxObject *dest;
     wxObject *dest;

-    src = (wxNotebookEvent *) ptr;
+    src = (wxBookCtrl *) ptr;

     dest = (wxObject *) src;
     return (void *) dest;
 }
 
     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;
     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;
 
     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;
         return NULL;

+        }
+    }

 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (wxNotebookEvent *)new_wxNotebookEvent(_arg0,_arg1,_arg2,_arg3);
+    _result = (size_t )wxBookCtrl_GetPageCount(_arg0);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     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;
 }
 
     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;
     PyObject * _resultobj;
     int  _result;

-    wxNotebookEvent * _arg0;
+    wxBookCtrl * _arg0;

     PyObject * _argo0 = 0;
     char *_kwnames[] = { "self", NULL };
 
     self = self;
     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; }
         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();
         return NULL;
         }
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (int )wxNotebookEvent_GetSelection(_arg0);
+    _result = (int )wxBookCtrl_GetSelection(_arg0);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;


@@ -392,55 +420,113 @@ static PyObject *_wrap_wxNotebookEvent_GetSelection(PyObject *self, PyObject *ar
     return _resultobj;
 }
 
     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;
     PyObject * _resultobj;

-    int  _result;
-    wxNotebookEvent * _arg0;
+    bool  _result;
+    wxBookCtrl * _arg0;
+    size_t  _arg1;
+    wxString * _arg2;

     PyObject * _argo0 = 0;
     PyObject * _argo0 = 0;

-    char *_kwnames[] = { "self", NULL };
+    PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","n","strText", NULL };

 
     self = self;
 
     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; }
         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;
         }
     }
         return NULL;
         }
     }

+{
+    _arg2 = wxString_in_helper(_obj2);
+    if (_arg2 == NULL)
+        return NULL;
+}

 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 {
     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);
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 }    _resultobj = Py_BuildValue("i",_result);

+{
+    if (_obj2)
+        delete _arg2;
+}

     return _resultobj;
 }
 
     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;
     PyObject * _resultobj;

-    wxNotebookEvent * _arg0;
-    int  _arg1;
+    wxString * _result;
+    wxBookCtrl * _arg0;
+    size_t  _arg1;

     PyObject * _argo0 = 0;
     PyObject * _argo0 = 0;

-    char *_kwnames[] = { "self","page", NULL };
+    char *_kwnames[] = { "self","n", NULL };

 
     self = self;
 
     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; }
         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();
         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;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;


@@ -449,27 +535,35 @@ static PyObject *_wrap_wxNotebookEvent_SetOldSelection(PyObject *self, PyObject
     return _resultobj;
 }
 
     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;
     PyObject * _resultobj;

-    wxNotebookEvent * _arg0;
-    int  _arg1;
+    wxBookCtrl * _arg0;
+    wxImageList * _arg1;

     PyObject * _argo0 = 0;
     PyObject * _argo0 = 0;

-    char *_kwnames[] = { "self","page", NULL };
+    PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","imageList", NULL };

 
     self = self;
 
     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; }
         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();
         return NULL;
         }
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    wxNotebookEvent_SetSelection(_arg0,_arg1);
+    wxBookCtrl_AssignImageList(_arg0,_arg1);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;


@@ -478,250 +572,380 @@ static PyObject *_wrap_wxNotebookEvent_SetSelection(PyObject *self, PyObject *ar
     return _resultobj;
 }
 
     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;
     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;
     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;
 
     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; }
         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;
         }
     }
         return NULL;
         }
     }

-    if (_obj2)

 {
 {

-    _arg2 = &temp;
-    if (! wxPoint_helper(_obj2, &_arg2))
+    _arg1 = &temp;
+    if (! wxSize_helper(_obj1, &_arg1))

         return NULL;
 }
         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();
         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;
 
     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;
 }
 
     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;
     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;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPreNotebook",_kwnames)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBookCtrl_RemovePage",_kwnames,&_argo0,&_arg1)) 

         return NULL;
         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();
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (wxNotebook *)new_wxPreNotebook();
+    _result = (bool )wxBookCtrl_RemovePage(_arg0,_arg1);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     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;
 }
 
     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;
     PyObject * _resultobj;
     bool  _result;

-    wxNotebook * _arg0;
+    wxBookCtrl * _arg0;

     wxWindow * _arg1;
     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;
     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","select","imageId", NULL };

 
     self = self;
 
     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; }
         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")) {
         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;
         }
     }
         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)
+    _arg2 = wxString_in_helper(_obj2);
+    if (_arg2 == NULL)

         return NULL;
 }
         return NULL;
 }

+    _arg3 = (bool ) tempbool3;

 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (bool )wxNotebook_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,*_arg6);
+    _result = (bool )wxBookCtrl_AddPage(_arg0,_arg1,*_arg2,_arg3,_arg4);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 }    _resultobj = Py_BuildValue("i",_result);
 {
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 }    _resultobj = Py_BuildValue("i",_result);
 {

-    if (_obj6)
-        delete _arg6;
+    if (_obj2)
+        delete _arg2;

 }
     return _resultobj;
 }
 
 }
     return _resultobj;
 }
 

-#define wxNotebook_GetPageCount(_swigobj)  (_swigobj->GetPageCount())
-static PyObject *_wrap_wxNotebook_GetPageCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+#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;
     PyObject * _resultobj;

-    int  _result;
-    wxNotebook * _arg0;
+    bool  _result;
+    wxBookCtrl * _arg0;
+    size_t  _arg1;
+    wxWindow * _arg2;
+    wxString * _arg3;
+    bool  _arg4 = (bool ) false;
+    int  _arg5 = (int ) -1;

     PyObject * _argo0 = 0;
     PyObject * _argo0 = 0;

-    char *_kwnames[] = { "self", NULL };
+    PyObject * _argo2 = 0;
+    PyObject * _obj3 = 0;
+    int tempbool4 = (int) false;
+    char *_kwnames[] = { "self","n","page","text","select","imageId", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_GetPageCount",_kwnames,&_argo0)) 
+    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; }
         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_InsertPage. Expected _wxBookCtrl_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 wxBookCtrl_InsertPage. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

+{
+    _arg3 = wxString_in_helper(_obj3);
+    if (_arg3 == NULL)
+        return NULL;
+}
+    _arg4 = (bool ) tempbool4;

 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (int )wxNotebook_GetPageCount(_arg0);
+    _result = (bool )wxBookCtrl_InsertPage(_arg0,_arg1,_arg2,*_arg3,_arg4,_arg5);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 }    _resultobj = Py_BuildValue("i",_result);
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 }    _resultobj = Py_BuildValue("i",_result);

+{
+    if (_obj3)
+        delete _arg3;
+}

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxNotebook_SetSelection(_swigobj,_swigarg0)  (_swigobj->SetSelection(_swigarg0))
-static PyObject *_wrap_wxNotebook_SetSelection(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;
     PyObject * _resultobj;
     int  _result;

-    wxNotebook * _arg0;
-    int  _arg1;
+    wxBookCtrl * _arg0;
+    size_t  _arg1;

     PyObject * _argo0 = 0;
     PyObject * _argo0 = 0;

-    char *_kwnames[] = { "self","page", NULL };
+    char *_kwnames[] = { "self","n", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_SetSelection",_kwnames,&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBookCtrl_SetSelection",_kwnames,&_argo0,&_arg1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         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,"_wxBookCtrl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrl_SetSelection. Expected _wxBookCtrl_p.");

         return NULL;
         }
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
         return NULL;
         }
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (int )wxNotebook_SetSelection(_arg0,_arg1);
+    _result = (int )wxBookCtrl_SetSelection(_arg0,_arg1);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;


@@ -729,29 +953,29 @@ static PyObject *_wrap_wxNotebook_SetSelection(PyObject *self, PyObject *args, P
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxNotebook_AdvanceSelection(_swigobj,_swigarg0)  (_swigobj->AdvanceSelection(_swigarg0))
-static PyObject *_wrap_wxNotebook_AdvanceSelection(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;
     PyObject * _resultobj;

-    wxNotebook * _arg0;
-    bool  _arg1 = (bool ) TRUE;
+    wxBookCtrl * _arg0;
+    bool  _arg1 = (bool ) true;

     PyObject * _argo0 = 0;
     PyObject * _argo0 = 0;

-    int tempbool1 = (int) TRUE;
+    int tempbool1 = (int) true;

     char *_kwnames[] = { "self","forward", NULL };
 
     self = self;
     char *_kwnames[] = { "self","forward", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxNotebook_AdvanceSelection",_kwnames,&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxBookCtrl_AdvanceSelection",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         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.");
+        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();
         return NULL;
         }
     }
     _arg1 = (bool ) tempbool1;
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    wxNotebook_AdvanceSelection(_arg0,_arg1);
+    wxBookCtrl_AdvanceSelection(_arg0,_arg1);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;


@@ -760,27 +984,89 @@ static PyObject *_wrap_wxNotebook_AdvanceSelection(PyObject *self, PyObject *arg
     return _resultobj;
 }
 
     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;
+    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,"|iiii:new_wxBookCtrlEvent",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
+        return NULL;
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    _result = (wxBookCtrlEvent *)new_wxBookCtrlEvent(_arg0,_arg1,_arg2,_arg3);
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    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 wxBookCtrlEvent_GetSelection(_swigobj)  (_swigobj->GetSelection())
+static PyObject *_wrap_wxBookCtrlEvent_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     PyObject * _resultobj;
     int  _result;

-    wxNotebook * _arg0;
+    wxBookCtrlEvent * _arg0;

     PyObject * _argo0 = 0;
     char *_kwnames[] = { "self", NULL };
 
     self = self;
     PyObject * _argo0 = 0;
     char *_kwnames[] = { "self", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_GetSelection",_kwnames,&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBookCtrlEvent_GetSelection",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         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.");
+        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;
         }
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
         return NULL;
         }
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (int )wxNotebook_GetSelection(_arg0);
+    _result = (int )wxBookCtrlEvent_GetSelection(_arg0);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;


@@ -788,290 +1074,459 @@ static PyObject *_wrap_wxNotebook_GetSelection(PyObject *self, PyObject *args, P
     return _resultobj;
 }
 
     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_SetSelection(_swigobj,_swigarg0)  (_swigobj->SetSelection(_swigarg0))
+static PyObject *_wrap_wxBookCtrlEvent_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    bool  _result;
-    wxNotebook * _arg0;
+    wxBookCtrlEvent * _arg0;

     int  _arg1;
     int  _arg1;

-    wxString * _arg2;

     PyObject * _argo0 = 0;
     PyObject * _argo0 = 0;

-    PyObject * _obj2 = 0;
-    char *_kwnames[] = { "self","page","text", NULL };
+    char *_kwnames[] = { "self","nSel", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxNotebook_SetPageText",_kwnames,&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBookCtrlEvent_SetSelection",_kwnames,&_argo0,&_arg1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         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_SetSelection. Expected _wxBookCtrlEvent_p.");

         return NULL;
         }
     }
 {
         return NULL;
         }
     }
 {

-    _arg2 = wxString_in_helper(_obj2);
-    if (_arg2 == NULL)
-        return NULL;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxBookCtrlEvent_SetSelection(_arg0,_arg1);
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;

 }
 }

+
+#define wxBookCtrlEvent_GetOldSelection(_swigobj)  (_swigobj->GetOldSelection())
+static PyObject *_wrap_wxBookCtrlEvent_GetOldSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    int  _result;
+    wxBookCtrlEvent * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    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,"_wxBookCtrlEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBookCtrlEvent_GetOldSelection. Expected _wxBookCtrlEvent_p.");
+        return NULL;
+        }
+    }

 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (bool )wxNotebook_SetPageText(_arg0,_arg1,*_arg2);
+    _result = (int )wxBookCtrlEvent_GetOldSelection(_arg0);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 }    _resultobj = Py_BuildValue("i",_result);
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 }    _resultobj = Py_BuildValue("i",_result);

-{
-    if (_obj2)
-        delete _arg2;
-}

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxNotebook_GetPageText(_swigobj,_swigarg0)  (_swigobj->GetPageText(_swigarg0))
-static PyObject *_wrap_wxNotebook_GetPageText(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;
     PyObject * _resultobj;

-    wxString * _result;
-    wxNotebook * _arg0;
+    wxBookCtrlEvent * _arg0;

     int  _arg1;
     PyObject * _argo0 = 0;
     int  _arg1;
     PyObject * _argo0 = 0;

-    char *_kwnames[] = { "self","page", NULL };
+    char *_kwnames[] = { "self","nOldSel", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPageText",_kwnames,&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBookCtrlEvent_SetOldSelection",_kwnames,&_argo0,&_arg1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         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_SetOldSelection. Expected _wxBookCtrlEvent_p.");
+        return NULL;
+        }
+    }
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxBookCtrlEvent_SetOldSelection(_arg0,_arg1);
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+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;
+    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;
+    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_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,"_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;
         return NULL;

-        }
-    }
+}

 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = new wxString (wxNotebook_GetPageText(_arg0,_arg1));
+    _result = (wxNotebook *)new_wxNotebook(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     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
-}
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxNotebook_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

 {
 {

-    delete _result;
+    if (_obj5)
+        delete _arg5;

 }
     return _resultobj;
 }
 
 }
     return _resultobj;
 }
 

-#define wxNotebook_SetImageList(_swigobj,_swigarg0)  (_swigobj->SetImageList(_swigarg0))
-static PyObject *_wrap_wxNotebook_SetImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define new_wxPreNotebook() (new wxNotebook())
+static PyObject *_wrap_new_wxPreNotebook(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxNotebook * _arg0;
-    wxImageList * _arg1;
-    PyObject * _argo0 = 0;
-    PyObject * _argo1 = 0;
-    char *_kwnames[] = { "self","imageList", NULL };
+    wxNotebook * _result;
+    char *_kwnames[] = {  NULL };
+    char _ptemp[128];

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_SetImageList",_kwnames,&_argo0,&_argo1)) 
-        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.");
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPreNotebook",_kwnames)) 

         return NULL;
         return NULL;

-        }
-    }

 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    wxNotebook_SetImageList(_arg0,_arg1);
+    _result = (wxNotebook *)new_wxPreNotebook();

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;

-}    Py_INCREF(Py_None);
-    _resultobj = Py_None;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxNotebook_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxNotebook_AssignImageList(_swigobj,_swigarg0)  (_swigobj->AssignImageList(_swigarg0))
-static PyObject *_wrap_wxNotebook_AssignImageList(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;
     PyObject * _resultobj;

+    bool  _result;

     wxNotebook * _arg0;
     wxNotebook * _arg0;

-    wxImageList * _arg1;
+    wxWindow * _arg1;
+    wxWindowID  _arg2;
+    wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
+    wxSize * _arg4 = (wxSize *) &wxDefaultSize;
+    long  _arg5 = (long ) 0;
+    wxString * _arg6 = (wxString *) &wxPyNOTEBOOK_NAME;

     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;

-    char *_kwnames[] = { "self","imageList", NULL };
+    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;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_AssignImageList",_kwnames,&_argo0,&_argo1)) 
+    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")) {
         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.");
+            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; }
         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(_argo1,(void **) &_arg1,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxNotebook_Create. Expected _wxWindow_p.");

         return NULL;
         }
     }
         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();
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    wxNotebook_AssignImageList(_arg0,_arg1);
+    _result = (bool )wxNotebook_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,*_arg6);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;

-}    Py_INCREF(Py_None);
-    _resultobj = Py_None;
+}    _resultobj = Py_BuildValue("i",_result);
+{
+    if (_obj6)
+        delete _arg6;
+}

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxNotebook_GetImageList(_swigobj)  (_swigobj->GetImageList())
-static PyObject *_wrap_wxNotebook_GetImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxNotebook_GetRowCount(_swigobj)  (_swigobj->GetRowCount())
+static PyObject *_wrap_wxNotebook_GetRowCount(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxImageList * _result;
+    int  _result;

     wxNotebook * _arg0;
     PyObject * _argo0 = 0;
     char *_kwnames[] = { "self", NULL };
 
     self = self;
     wxNotebook * _arg0;
     PyObject * _argo0 = 0;
     char *_kwnames[] = { "self", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_GetImageList",_kwnames,&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_GetRowCount",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {
         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.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetRowCount. Expected _wxNotebook_p.");

         return NULL;
         }
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
         return NULL;
         }
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (wxImageList *)wxNotebook_GetImageList(_arg0);
+    _result = (int )wxNotebook_GetRowCount(_arg0);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;

-}{ _resultobj = wxPyMake_wxObject(_result); }
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxNotebook_GetPageImage(_swigobj,_swigarg0)  (_swigobj->GetPageImage(_swigarg0))
-static PyObject *_wrap_wxNotebook_GetPageImage(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;
     PyObject * _resultobj;

-    int  _result;

     wxNotebook * _arg0;
     wxNotebook * _arg0;

-    int  _arg1;
+    wxSize * _arg1;

     PyObject * _argo0 = 0;
     PyObject * _argo0 = 0;

-    char *_kwnames[] = { "self","page", NULL };
+    wxSize  temp;
+    PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","padding", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPageImage",_kwnames,&_argo0,&_arg1)) 
+    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")) {
         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.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetPadding. Expected _wxNotebook_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

+{
+    _arg1 = &temp;
+    if (! wxSize_helper(_obj1, &_arg1))
+        return NULL;
+}

 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (int )wxNotebook_GetPageImage(_arg0,_arg1);
+    wxNotebook_SetPadding(_arg0,*_arg1);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;

-}    _resultobj = Py_BuildValue("i",_result);
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;

     return _resultobj;
 }
 
     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_SetTabSize(_swigobj,_swigarg0)  (_swigobj->SetTabSize(_swigarg0))
+static PyObject *_wrap_wxNotebook_SetTabSize(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    bool  _result;

     wxNotebook * _arg0;
     wxNotebook * _arg0;

-    int  _arg1;
-    int  _arg2;
+    wxSize * _arg1;

     PyObject * _argo0 = 0;
     PyObject * _argo0 = 0;

-    char *_kwnames[] = { "self","page","image", NULL };
+    wxSize  temp;
+    PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","sz", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxNotebook_SetPageImage",_kwnames,&_argo0,&_arg1,&_arg2)) 
+    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")) {
         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_SetTabSize. Expected _wxNotebook_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

+{
+    _arg1 = &temp;
+    if (! wxSize_helper(_obj1, &_arg1))
+        return NULL;
+}

 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (bool )wxNotebook_SetPageImage(_arg0,_arg1,_arg2);
+    wxNotebook_SetTabSize(_arg0,*_arg1);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;

-}    _resultobj = Py_BuildValue("i",_result);
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxNotebook_GetRowCount(_swigobj)  (_swigobj->GetRowCount())
-static PyObject *_wrap_wxNotebook_GetRowCount(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;
     PyObject * _resultobj;
     int  _result;
     wxNotebook * _arg0;

+    wxPoint * _arg1;
+    long * _arg2;
+    long  temp;

     PyObject * _argo0 = 0;
     PyObject * _argo0 = 0;

-    char *_kwnames[] = { "self", NULL };
+    wxPoint  temp0;
+    PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","pt", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_GetRowCount",_kwnames,&_argo0)) 
+{
+  _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")) {
         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_GetRowCount. Expected _wxNotebook_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_HitTest. Expected _wxNotebook_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

+{
+    _arg1 = &temp0;
+    if (! wxPoint_helper(_obj1, &_arg1))
+        return NULL;
+}

 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (int )wxNotebook_GetRowCount(_arg0);
+    _result = (int )wxNotebook_HitTest(_arg0,*_arg1,_arg2);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 }    _resultobj = Py_BuildValue("i",_result);
 
     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);
+}

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxNotebook_SetPageSize(_swigobj,_swigarg0)  (_swigobj->SetPageSize(_swigarg0))
-static PyObject *_wrap_wxNotebook_SetPageSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxNotebook_CalcSizeFromPage(_swigobj,_swigarg0)  (_swigobj->CalcSizeFromPage(_swigarg0))
+static PyObject *_wrap_wxNotebook_CalcSizeFromPage(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

+    wxSize * _result;

     wxNotebook * _arg0;
     wxSize * _arg1;
     PyObject * _argo0 = 0;
     wxSize  temp;
     PyObject * _obj1 = 0;
     wxNotebook * _arg0;
     wxSize * _arg1;
     PyObject * _argo0 = 0;
     wxSize  temp;
     PyObject * _obj1 = 0;

-    char *_kwnames[] = { "self","size", NULL };
+    char *_kwnames[] = { "self","sizePage", NULL };
+    char _ptemp[128];

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_SetPageSize",_kwnames,&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_CalcSizeFromPage",_kwnames,&_argo0,&_obj1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {
         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_CalcSizeFromPage. Expected _wxNotebook_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -1082,73 +1537,126 @@ static PyObject *_wrap_wxNotebook_SetPageSize(PyObject *self, PyObject *args, Py
 }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    wxNotebook_SetPageSize(_arg0,*_arg1);
+    _result = new wxSize (wxNotebook_CalcSizeFromPage(_arg0,*_arg1));

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;

-}    Py_INCREF(Py_None);
-    _resultobj = Py_None;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
+    _resultobj = Py_BuildValue("s",_ptemp);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxNotebook_SetPadding(_swigobj,_swigarg0)  (_swigobj->SetPadding(_swigarg0))
-static PyObject *_wrap_wxNotebook_SetPadding(PyObject *self, PyObject *args, PyObject *kwargs) {
+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;
     PyObject * _resultobj;

-    wxNotebook * _arg0;
-    wxSize * _arg1;
+    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;
     PyObject * _argo0 = 0;

-    wxSize  temp;
-    PyObject * _obj1 = 0;
-    char *_kwnames[] = { "self","padding", NULL };
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_SetPadding",_kwnames,&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebookEvent_GetSelection",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         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.");
+        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;
         }
     }
         return NULL;
         }
     }

-{
-    _arg1 = &temp;
-    if (! wxSize_helper(_obj1, &_arg1))
-        return NULL;
-}

 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    wxNotebook_SetPadding(_arg0,*_arg1);
+    _result = (int )wxNotebookEvent_GetSelection(_arg0);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;

-}    Py_INCREF(Py_None);
-    _resultobj = Py_None;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxNotebook_DeletePage(_swigobj,_swigarg0)  (_swigobj->DeletePage(_swigarg0))
-static PyObject *_wrap_wxNotebook_DeletePage(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;
     PyObject * _resultobj;

-    bool  _result;
-    wxNotebook * _arg0;
-    int  _arg1;
+    int  _result;
+    wxNotebookEvent * _arg0;

     PyObject * _argo0 = 0;
     PyObject * _argo0 = 0;

-    char *_kwnames[] = { "self","page", NULL };
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_DeletePage",_kwnames,&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebookEvent_GetOldSelection",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         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.");
+        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();
         return NULL;
         }
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (bool )wxNotebook_DeletePage(_arg0,_arg1);
+    _result = (int )wxNotebookEvent_GetOldSelection(_arg0);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;


@@ -1156,223 +1664,361 @@ static PyObject *_wrap_wxNotebook_DeletePage(PyObject *self, PyObject *args, PyO
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxNotebook_RemovePage(_swigobj,_swigarg0)  (_swigobj->RemovePage(_swigarg0))
-static PyObject *_wrap_wxNotebook_RemovePage(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxNotebookEvent_SetOldSelection(_swigobj,_swigarg0)  (_swigobj->SetOldSelection(_swigarg0))
+static PyObject *_wrap_wxNotebookEvent_SetOldSelection(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    bool  _result;
-    wxNotebook * _arg0;
+    wxNotebookEvent * _arg0;

     int  _arg1;
     PyObject * _argo0 = 0;
     char *_kwnames[] = { "self","page", NULL };
 
     self = self;
     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; }
         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();
         return NULL;
         }
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (bool )wxNotebook_RemovePage(_arg0,_arg1);
+    wxNotebookEvent_SetOldSelection(_arg0,_arg1);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;

-}    _resultobj = Py_BuildValue("i",_result);
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;

     return _resultobj;
 }
 
     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;
     PyObject * _resultobj;

-    bool  _result;
-    wxNotebook * _arg0;
+    wxNotebookEvent * _arg0;
+    int  _arg1;

     PyObject * _argo0 = 0;
     PyObject * _argo0 = 0;

-    char *_kwnames[] = { "self", NULL };
+    char *_kwnames[] = { "self","page", NULL };

 
     self = self;
 
     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; }
         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();
         return NULL;
         }
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (bool )wxNotebook_DeleteAllPages(_arg0);
+    wxNotebookEvent_SetSelection(_arg0,_arg1);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;

-}    _resultobj = Py_BuildValue("i",_result);
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;

     return _resultobj;
 }
 
     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;
     PyObject * _resultobj;

-    bool  _result;
-    wxNotebook * _arg0;
-    wxWindow * _arg1;
-    wxString * _arg2;
-    int  _arg3 = (int ) 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 * _argo0 = 0;

-    PyObject * _argo1 = 0;
+    wxPoint  temp;

     PyObject * _obj2 = 0;
     PyObject * _obj2 = 0;

-    char *_kwnames[] = { "self","page","text","select","imageId", NULL };
+    wxSize  temp0;
+    PyObject * _obj3 = 0;
+    PyObject * _obj5 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };
+    char _ptemp[128];

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|ii:wxNotebook_AddPage",_kwnames,&_argo0,&_argo1,&_obj2,&_arg3,&_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; }
         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;
         }
     }
         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;
         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;
 }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
         return NULL;
 }
 {
     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;
 
     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;
 }
 
     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;
     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 * _argo0 = 0;

-    PyObject * _argo2 = 0;
+    PyObject * _argo1 = 0;
+    wxPoint  temp;

     PyObject * _obj3 = 0;
     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;
 
     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; }
         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;
         }
     }
         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;
         }
     }
         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;
 }
         return NULL;
 }

-    _arg4 = (bool ) tempbool4;

 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 {
     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);
 {
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 }    _resultobj = Py_BuildValue("i",_result);
 {

-    if (_obj3)
-        delete _arg3;
+    if (_obj6)
+        delete _arg6;

 }
     return _resultobj;
 }
 
 }
     return _resultobj;
 }
 

-#define wxNotebook_GetPage(_swigobj,_swigarg0)  (_swigobj->GetPage(_swigarg0))
-static PyObject *_wrap_wxNotebook_GetPage(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;
     PyObject * _resultobj;

-    wxWindow * _result;
-    wxNotebook * _arg0;
-    int  _arg1;
+    bool  _result;
+    wxListbook * _arg0;

     PyObject * _argo0 = 0;
     PyObject * _argo0 = 0;

-    char *_kwnames[] = { "self","page", NULL };
+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPage",_kwnames,&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListbook_IsVertical",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         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,"_wxListbook_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListbook_IsVertical. Expected _wxListbook_p.");

         return NULL;
         }
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
         return NULL;
         }
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (wxWindow *)wxNotebook_GetPage(_arg0,_arg1);
+    _result = (bool )wxListbook_IsVertical(_arg0);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;

-}{ _resultobj = wxPyMake_wxObject(_result); }
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-static void  wxNotebook_ResizeChildren(wxNotebook *self) {
-            wxSizeEvent evt(self->GetClientSize());
-            self->GetEventHandler()->ProcessEvent(evt);
-        }
-static PyObject *_wrap_wxNotebook_ResizeChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static void *SwigwxListbookEventTowxBookCtrlEvent(void *ptr) {
+    wxListbookEvent *src;
+    wxBookCtrlEvent *dest;
+    src = (wxListbookEvent *) ptr;
+    dest = (wxBookCtrlEvent *) src;
+    return (void *) dest;
+}
+
+static void *SwigwxListbookEventTowxNotifyEvent(void *ptr) {
+    wxListbookEvent *src;
+    wxNotifyEvent *dest;
+    src = (wxListbookEvent *) ptr;
+    dest = (wxNotifyEvent *) src;
+    return (void *) dest;
+}
+
+static void *SwigwxListbookEventTowxCommandEvent(void *ptr) {
+    wxListbookEvent *src;
+    wxCommandEvent *dest;
+    src = (wxListbookEvent *) ptr;
+    dest = (wxCommandEvent *) src;
+    return (void *) dest;
+}
+
+static void *SwigwxListbookEventTowxEvent(void *ptr) {
+    wxListbookEvent *src;
+    wxEvent *dest;
+    src = (wxListbookEvent *) ptr;
+    dest = (wxEvent *) src;
+    return (void *) dest;
+}
+
+static void *SwigwxListbookEventTowxObject(void *ptr) {
+    wxListbookEvent *src;
+    wxObject *dest;
+    src = (wxListbookEvent *) ptr;
+    dest = (wxObject *) src;
+    return (void *) dest;
+}
+
+#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;
     PyObject * _resultobj;

-    wxNotebook * _arg0;
-    PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self", 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;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_ResizeChildren",_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_ResizeChildren. Expected _wxNotebook_p.");
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iiii:new_wxListbookEvent",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 

         return NULL;
         return NULL;

-        }
-    }

 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    wxNotebook_ResizeChildren(_arg0);
+    _result = (wxListbookEvent *)new_wxListbookEvent(_arg0,_arg1,_arg2,_arg3);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     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;
 }
 
     return _resultobj;
 }
 


@@ -1617,7 +2263,7 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args, PyOb
     wxWindowID  _arg1;
     wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
     wxSize * _arg3 = (wxSize *) &wxDefaultSize;
     wxWindowID  _arg1;
     wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
     wxSize * _arg3 = (wxSize *) &wxDefaultSize;

-    long  _arg4 = (long ) wxSP_3D|wxCLIP_CHILDREN;
+    long  _arg4 = (long ) (wxSP_3D)|wxCLIP_CHILDREN;

     wxString * _arg5 = (wxString *) &wxPySplitterNameStr;
     PyObject * _argo0 = 0;
     wxPoint  temp;
     wxString * _arg5 = (wxString *) &wxPySplitterNameStr;
     PyObject * _argo0 = 0;
     wxPoint  temp;


@@ -1711,7 +2357,7 @@ static PyObject *_wrap_wxSplitterWindow_Create(PyObject *self, PyObject *args, P
     wxWindowID  _arg2;
     wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
     wxSize * _arg4 = (wxSize *) &wxDefaultSize;
     wxWindowID  _arg2;
     wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
     wxSize * _arg4 = (wxSize *) &wxDefaultSize;

-    long  _arg5 = (long ) wxSP_3D|wxCLIP_CHILDREN;
+    long  _arg5 = (long ) (wxSP_3D)|wxCLIP_CHILDREN;

     wxString * _arg6 = (wxString *) &wxPySplitterNameStr;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     wxString * _arg6 = (wxString *) &wxPySplitterNameStr;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;


@@ -4749,35 +5395,48 @@ 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 },
         { "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_ResizeChildren", (PyCFunction) _wrap_wxNotebook_ResizeChildren, METH_VARARGS | METH_KEYWORDS },
-        { "wxNotebook_GetPage", (PyCFunction) _wrap_wxNotebook_GetPage, 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 },
-        { "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_AdvanceSelection", (PyCFunction) _wrap_wxNotebook_AdvanceSelection, METH_VARARGS | METH_KEYWORDS },
-        { "wxNotebook_SetSelection", (PyCFunction) _wrap_wxNotebook_SetSelection, 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 },
+        { "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 },
         { "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_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_GetRowCount", (PyCFunction) _wrap_wxNotebook_GetRowCount, 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 },
+        { "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
         { NULL, NULL }
 };
 #ifdef __cplusplus


@@ -4788,7 +5447,9 @@ static PyMethodDef windows2cMethods[] = {
  */
 static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxEvent","_wxSplitterEvent",SwigwxSplitterEventTowxEvent},
  */
 static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxEvent","_wxSplitterEvent",SwigwxSplitterEventTowxEvent},

+    { "_wxEvent","_wxListbookEvent",SwigwxListbookEventTowxEvent},

     { "_wxEvent","_wxNotebookEvent",SwigwxNotebookEventTowxEvent},
     { "_wxEvent","_wxNotebookEvent",SwigwxNotebookEventTowxEvent},

+    { "_wxEvent","_wxBookCtrlEvent",SwigwxBookCtrlEventTowxEvent},

     { "_signed_long","_long",0},
     { "_wxPrintQuality","_wxCoord",0},
     { "_wxPrintQuality","_int",0},
     { "_signed_long","_long",0},
     { "_wxPrintQuality","_wxCoord",0},
     { "_wxPrintQuality","_int",0},


@@ -4800,7 +5461,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxPrintQuality","_size_t",0},
     { "_wxPrintQuality","_time_t",0},
     { "_wxNotifyEvent","_wxSplitterEvent",SwigwxSplitterEventTowxNotifyEvent},
     { "_wxPrintQuality","_size_t",0},
     { "_wxPrintQuality","_time_t",0},
     { "_wxNotifyEvent","_wxSplitterEvent",SwigwxSplitterEventTowxNotifyEvent},

+    { "_wxNotifyEvent","_wxListbookEvent",SwigwxListbookEventTowxNotifyEvent},

     { "_wxNotifyEvent","_wxNotebookEvent",SwigwxNotebookEventTowxNotifyEvent},
     { "_wxNotifyEvent","_wxNotebookEvent",SwigwxNotebookEventTowxNotifyEvent},

+    { "_wxNotifyEvent","_wxBookCtrlEvent",SwigwxBookCtrlEventTowxNotifyEvent},

     { "_byte","_unsigned_char",0},
     { "_long","_unsigned_long",0},
     { "_long","_signed_long",0},
     { "_byte","_unsigned_char",0},
     { "_long","_unsigned_long",0},
     { "_long","_signed_long",0},


@@ -4812,6 +5475,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_size_t","_wxWindowID",0},
     { "_size_t","_uint",0},
     { "_wxPanel","_wxPyPanel",SwigwxPyPanelTowxPanel},
     { "_size_t","_wxWindowID",0},
     { "_size_t","_uint",0},
     { "_wxPanel","_wxPyPanel",SwigwxPyPanelTowxPanel},

+    { "_wxBookCtrlEvent","_wxListbookEvent",SwigwxListbookEventTowxBookCtrlEvent},

     { "_uint","_wxCoord",0},
     { "_uint","_wxPrintQuality",0},
     { "_uint","_time_t",0},
     { "_uint","_wxCoord",0},
     { "_uint","_wxPrintQuality",0},
     { "_uint","_time_t",0},


@@ -4821,7 +5485,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_uint","_wxWindowID",0},
     { "_wxChar","_char",0},
     { "_wxCommandEvent","_wxSplitterEvent",SwigwxSplitterEventTowxCommandEvent},
     { "_uint","_wxWindowID",0},
     { "_wxChar","_char",0},
     { "_wxCommandEvent","_wxSplitterEvent",SwigwxSplitterEventTowxCommandEvent},

+    { "_wxCommandEvent","_wxListbookEvent",SwigwxListbookEventTowxCommandEvent},

     { "_wxCommandEvent","_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent},
     { "_wxCommandEvent","_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent},

+    { "_wxCommandEvent","_wxBookCtrlEvent",SwigwxBookCtrlEventTowxCommandEvent},

     { "_char","_wxChar",0},
     { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
     { "_EBool","_wxCoord",0},
     { "_char","_wxChar",0},
     { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
     { "_EBool","_wxCoord",0},


@@ -4846,13 +5512,19 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxObject","_wxPyWindow",SwigwxPyWindowTowxObject},
     { "_wxObject","_wxSplitterWindow",SwigwxSplitterWindowTowxObject},
     { "_wxObject","_wxSplitterEvent",SwigwxSplitterEventTowxObject},
     { "_wxObject","_wxPyWindow",SwigwxPyWindowTowxObject},
     { "_wxObject","_wxSplitterWindow",SwigwxSplitterWindowTowxObject},
     { "_wxObject","_wxSplitterEvent",SwigwxSplitterEventTowxObject},

-    { "_wxObject","_wxNotebook",SwigwxNotebookTowxObject},
+    { "_wxObject","_wxListbookEvent",SwigwxListbookEventTowxObject},
+    { "_wxObject","_wxListbook",SwigwxListbookTowxObject},

     { "_wxObject","_wxNotebookEvent",SwigwxNotebookEventTowxObject},
     { "_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},
     { "_signed_short","_WXTYPE",0},
     { "_signed_short","_short",0},
     { "_unsigned_char","_byte",0},
     { "_wxControl","_wxPyControl",SwigwxPyControlTowxControl},

+    { "_wxControl","_wxListbook",SwigwxListbookTowxControl},

     { "_wxControl","_wxNotebook",SwigwxNotebookTowxControl},
     { "_wxControl","_wxNotebook",SwigwxNotebookTowxControl},

+    { "_wxControl","_wxBookCtrl",SwigwxBookCtrlTowxControl},

     { "_unsigned_int","_wxCoord",0},
     { "_unsigned_int","_wxPrintQuality",0},
     { "_unsigned_int","_time_t",0},
     { "_unsigned_int","_wxCoord",0},
     { "_unsigned_int","_wxPrintQuality",0},
     { "_unsigned_int","_time_t",0},


@@ -4863,6 +5535,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_short","_WXTYPE",0},
     { "_short","_unsigned_short",0},
     { "_short","_signed_short",0},
     { "_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},
     { "_wxWindowID","_wxCoord",0},
     { "_wxWindowID","_wxPrintQuality",0},
     { "_wxWindowID","_time_t",0},


@@ -4901,12 +5575,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxEvtHandler","_wxPyControl",SwigwxPyControlTowxEvtHandler},
     { "_wxEvtHandler","_wxPyWindow",SwigwxPyWindowTowxEvtHandler},
     { "_wxEvtHandler","_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler},
     { "_wxEvtHandler","_wxPyControl",SwigwxPyControlTowxEvtHandler},
     { "_wxEvtHandler","_wxPyWindow",SwigwxPyWindowTowxEvtHandler},
     { "_wxEvtHandler","_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler},

+    { "_wxEvtHandler","_wxListbook",SwigwxListbookTowxEvtHandler},

     { "_wxEvtHandler","_wxNotebook",SwigwxNotebookTowxEvtHandler},
     { "_wxEvtHandler","_wxNotebook",SwigwxNotebookTowxEvtHandler},

+    { "_wxEvtHandler","_wxBookCtrl",SwigwxBookCtrlTowxEvtHandler},

     { "_wxWindow","_wxPyPanel",SwigwxPyPanelTowxWindow},
     { "_wxWindow","_wxPyControl",SwigwxPyControlTowxWindow},
     { "_wxWindow","_wxPyWindow",SwigwxPyWindowTowxWindow},
     { "_wxWindow","_wxSplitterWindow",SwigwxSplitterWindowTowxWindow},
     { "_wxWindow","_wxPyPanel",SwigwxPyPanelTowxWindow},
     { "_wxWindow","_wxPyControl",SwigwxPyControlTowxWindow},
     { "_wxWindow","_wxPyWindow",SwigwxPyWindowTowxWindow},
     { "_wxWindow","_wxSplitterWindow",SwigwxSplitterWindowTowxWindow},

+    { "_wxWindow","_wxListbook",SwigwxListbookTowxWindow},

     { "_wxWindow","_wxNotebook",SwigwxNotebookTowxWindow},
     { "_wxWindow","_wxNotebook",SwigwxNotebookTowxWindow},

+    { "_wxWindow","_wxBookCtrl",SwigwxBookCtrlTowxWindow},

 {0,0,0}};
 
 static PyObject *SWIG_globals;
 {0,0,0}};
 
 static PyObject *SWIG_globals;


@@ -4920,6 +5598,24 @@ SWIGEXPORT(void) initwindows2c() {
         d = PyModule_GetDict(m);
         PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED));
         PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING));
         d = PyModule_GetDict(m);
         PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED));
         PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING));

+        PyDict_SetItemString(d,"wxNB_FIXEDWIDTH", PyInt_FromLong((long) wxNB_FIXEDWIDTH));
+        PyDict_SetItemString(d,"wxNB_TOP", PyInt_FromLong((long) wxNB_TOP));
+        PyDict_SetItemString(d,"wxNB_LEFT", PyInt_FromLong((long) wxNB_LEFT));
+        PyDict_SetItemString(d,"wxNB_RIGHT", PyInt_FromLong((long) wxNB_RIGHT));
+        PyDict_SetItemString(d,"wxNB_BOTTOM", PyInt_FromLong((long) wxNB_BOTTOM));
+        PyDict_SetItemString(d,"wxNB_MULTILINE", PyInt_FromLong((long) wxNB_MULTILINE));
+        PyDict_SetItemString(d,"wxNB_HITTEST_NOWHERE", PyInt_FromLong((long) wxNB_HITTEST_NOWHERE));
+        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));
         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));


@@ -4929,6 +5625,18 @@ SWIGEXPORT(void) initwindows2c() {
         PyDict_SetItemString(d,"wxSPLIT_DRAG_NONE", PyInt_FromLong((long) wxSPLIT_DRAG_NONE));
         PyDict_SetItemString(d,"wxSPLIT_DRAG_DRAGGING", PyInt_FromLong((long) wxSPLIT_DRAG_DRAGGING));
         PyDict_SetItemString(d,"wxSPLIT_DRAG_LEFT_DOWN", PyInt_FromLong((long) wxSPLIT_DRAG_LEFT_DOWN));
         PyDict_SetItemString(d,"wxSPLIT_DRAG_NONE", PyInt_FromLong((long) wxSPLIT_DRAG_NONE));
         PyDict_SetItemString(d,"wxSPLIT_DRAG_DRAGGING", PyInt_FromLong((long) wxSPLIT_DRAG_DRAGGING));
         PyDict_SetItemString(d,"wxSPLIT_DRAG_LEFT_DOWN", PyInt_FromLong((long) wxSPLIT_DRAG_LEFT_DOWN));

+        PyDict_SetItemString(d,"wxSP_VERTICAL", PyInt_FromLong((long) wxSP_VERTICAL));
+        PyDict_SetItemString(d,"wxSP_HORIZONTAL", PyInt_FromLong((long) wxSP_HORIZONTAL));
+        PyDict_SetItemString(d,"wxSP_ARROW_KEYS", PyInt_FromLong((long) wxSP_ARROW_KEYS));
+        PyDict_SetItemString(d,"wxSP_WRAP", PyInt_FromLong((long) wxSP_WRAP));
+        PyDict_SetItemString(d,"wxSP_NOBORDER", PyInt_FromLong((long) wxSP_NOBORDER));
+        PyDict_SetItemString(d,"wxSP_3D", PyInt_FromLong((long) wxSP_3D));
+        PyDict_SetItemString(d,"wxSP_3DSASH", PyInt_FromLong((long) wxSP_3DSASH));
+        PyDict_SetItemString(d,"wxSP_3DBORDER", PyInt_FromLong((long) wxSP_3DBORDER));
+        PyDict_SetItemString(d,"wxSP_FULLSASH", PyInt_FromLong((long) wxSP_FULLSASH));
+        PyDict_SetItemString(d,"wxSP_BORDER", PyInt_FromLong((long) wxSP_BORDER));
+        PyDict_SetItemString(d,"wxSP_LIVE_UPDATE", PyInt_FromLong((long) wxSP_LIVE_UPDATE));
+        PyDict_SetItemString(d,"wxSP_PERMIT_UNSPLIT", PyInt_FromLong((long) wxSP_PERMIT_UNSPLIT));

 {
    int i;
    for (i = 0; _swig_mapping[i].n1; i++)
 {
    int i;
    for (i = 0; _swig_mapping[i].n1; i++)