typo fix

[wxWidgets.git] / wxPython / src / _notebook.i

diff --git a/wxPython/src/_notebook.i b/wxPython/src/_notebook.i
index 81c854cc62fbbfd238d77edeb36dd5aec230f919..e058b6e9bf0ed439abdba462fd5d3aacf81463c0 100644 (file)
--- a/wxPython/src/_notebook.i
+++ b/wxPython/src/_notebook.i
@@ -22,6 +22,8 @@ MAKE_CONST_WXSTRING(NOTEBOOK_NAME);
 
 // TODO:  Virtualize this class so other book controls can be derived in Python
 
 
 // TODO:  Virtualize this class so other book controls can be derived in Python
 

+MustHaveApp(wxBookCtrl);
+

 //  Common base class for wxList/Tree/Notebook
 class wxBookCtrl : public wxControl
 {
 //  Common base class for wxList/Tree/Notebook
 class wxBookCtrl : public wxControl
 {


@@ -160,10 +162,13 @@ enum {
 
 
 
 
 
 

+MustHaveApp(wxNotebook);
+

 class wxNotebook : public wxBookCtrl {
 public:
     %pythonAppend wxNotebook         "self._setOORInfo(self)"
     %pythonAppend wxNotebook()       ""
 class wxNotebook : public wxBookCtrl {
 public:
     %pythonAppend wxNotebook         "self._setOORInfo(self)"
     %pythonAppend wxNotebook()       ""

+    %typemap(out) wxNotebook*;    // turn off this typemap

 
     wxNotebook(wxWindow *parent,
                wxWindowID id=-1,
 
     wxNotebook(wxWindow *parent,
                wxWindowID id=-1,


@@ -173,8 +178,11 @@ public:
                const wxString& name = wxPyNOTEBOOK_NAME);
     %name(PreNotebook)wxNotebook();
 
                const wxString& name = wxPyNOTEBOOK_NAME);
     %name(PreNotebook)wxNotebook();
 

+    // Turn it back on again
+    %typemap(out) wxNotebook* { $result = wxPyMake_wxObject($1, $owner); }
+

     bool Create(wxWindow *parent,
     bool Create(wxWindow *parent,

-               wxWindowID id,
+               wxWindowID id=-1,

                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,


@@ -286,6 +294,8 @@ enum
 
 
 
 
 
 

+MustHaveApp(wxListbook);
+

 //  wxListCtrl and wxNotebook combination
 class wxListbook : public wxBookCtrl
 {
 //  wxListCtrl and wxNotebook combination
 class wxListbook : public wxBookCtrl
 {


@@ -302,7 +312,7 @@ public:
     %name(PreListbook)wxListbook();
 
     bool Create(wxWindow *parent,
     %name(PreListbook)wxListbook();
 
     bool Create(wxWindow *parent,

-                wxWindowID id,
+                wxWindowID id=-1,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,