added defines for wxchar workaround

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

diff --git a/wxPython/src/_notebook.i b/wxPython/src/_notebook.i
index 9f3274e83564f185d5bed4ba652ab6e015971b72..c63e2eaa7971b551a6a8aafd827d2501fcb9f31b 100644 (file)
--- a/wxPython/src/_notebook.i
+++ b/wxPython/src/_notebook.i
@@ -15,9 +15,7 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-%{
-    DECLARE_DEF_STRING(NOTEBOOK_NAME);
-%}
+MAKE_CONST_WXSTRING(NOTEBOOK_NAME);

 
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup


@@ -66,8 +64,9 @@ public:
     virtual void SetImageList(wxImageList *imageList);
 
     // as SetImageList() but we will delete the image list ourselves
     virtual void SetImageList(wxImageList *imageList);
 
     // as SetImageList() but we will delete the image list ourselves

-    %addtofunc AssignImageList "args[1].thisown = 0"
+    %apply SWIGTYPE *DISOWN { wxImageList *imageList };

     void AssignImageList(wxImageList *imageList);
     void AssignImageList(wxImageList *imageList);

+    %clear wxImageList *imageList;

 
     // get pointer (may be NULL) to the associated image list
     wxImageList* GetImageList() const;
 
     // get pointer (may be NULL) to the associated image list
     wxImageList* GetImageList() const;


@@ -160,11 +159,11 @@ enum {
 
 class wxNotebook : public wxBookCtrl {
 public:
 
 class wxNotebook : public wxBookCtrl {
 public:

-    %addtofunc wxNotebook         "self._setOORInfo(self)"
-    %addtofunc wxNotebook()       ""
+    %pythonAppend wxNotebook         "self._setOORInfo(self)"
+    %pythonAppend wxNotebook()       ""

 
     wxNotebook(wxWindow *parent,
 
     wxNotebook(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,


@@ -191,7 +190,10 @@ public:
 
     // hit test, returns which tab is hit and, optionally, where (icon, label)
     // (not implemented on all platforms)
 
     // hit test, returns which tab is hit and, optionally, where (icon, label)
     // (not implemented on all platforms)

-    virtual int HitTest(const wxPoint& pt, long* OUTPUT) const;
+    DocDeclAStr(
+        virtual int, HitTest(const wxPoint& pt, long* OUTPUT) const,
+        "HitTest(Point pt) -> (tab, where)",
+        "Returns the tab which is hit, and flags indicating where using wx.NB_HITTEST_ flags.");

 
     // implement some base class functions
     virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
 
     // implement some base class functions
     virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;


@@ -281,11 +283,11 @@ enum
 class wxListbook : public wxBookCtrl
 {
 public:
 class wxListbook : public wxBookCtrl
 {
 public:

-    %addtofunc wxListbook         "self._setOORInfo(self)"
-    %addtofunc wxListbook()       ""
+    %pythonAppend wxListbook         "self._setOORInfo(self)"
+    %pythonAppend wxListbook()       ""

 
     wxListbook(wxWindow *parent,
 
     wxListbook(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,


@@ -330,7 +332,7 @@ public:
 class wxBookCtrlSizer: public wxSizer
 {
 public:
 class wxBookCtrlSizer: public wxSizer
 {
 public:

-    %addtofunc wxBookCtrlSizer "self._setOORInfo(self)"
+    %pythonAppend wxBookCtrlSizer "self._setOORInfo(self)"

 
     wxBookCtrlSizer( wxBookCtrl *nb );
     
 
     wxBookCtrlSizer( wxBookCtrl *nb );
     


@@ -342,7 +344,7 @@ public:
 
 class wxNotebookSizer: public wxSizer {
 public:
 
 class wxNotebookSizer: public wxSizer {
 public:

-    %addtofunc wxNotebookSizer "self._setOORInfo(self)"
+    %pythonAppend wxNotebookSizer "self._setOORInfo(self)"

 
     wxNotebookSizer( wxNotebook *nb );
     
 
     wxNotebookSizer( wxNotebook *nb );