%addtofunc --> %pythonAppend

Also used %pythonPrepend to provide backwards compatibility for a few
parameter name changes.

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

diff --git a/wxPython/contrib/gizmos/gizmos.i b/wxPython/contrib/gizmos/gizmos.i
index dedee2bc626ecb36e7bede97b68f176a6152da15..ef15215c46fba5363a0b425f49fd7d97bd4e5592 100644 (file)
--- a/wxPython/contrib/gizmos/gizmos.i
+++ b/wxPython/contrib/gizmos/gizmos.i
@@ -135,8 +135,8 @@ public:
 
 class wxDynamicSashWindow : public wxWindow {
 public:
-    %addtofunc wxDynamicSashWindow         "self._setOORInfo(self)"
-    %addtofunc wxDynamicSashWindow()       ""
+    %pythonAppend wxDynamicSashWindow         "self._setOORInfo(self)"
+    %pythonAppend wxDynamicSashWindow()       ""
 
     wxDynamicSashWindow(wxWindow *parent, wxWindowID id,
                         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
@@ -174,8 +174,8 @@ enum {
 class wxEditableListBox : public wxPanel
 {
 public:
-    %addtofunc wxEditableListBox         "self._setOORInfo(self)"
-    %addtofunc wxEditableListBox()       ""
+    %pythonAppend wxEditableListBox         "self._setOORInfo(self)"
+    %pythonAppend wxEditableListBox()       ""
 
     wxEditableListBox(wxWindow *parent, wxWindowID id,
                       const wxString& label,
@@ -224,8 +224,8 @@ public:
 class wxRemotelyScrolledTreeCtrl: public wxPyTreeCtrl
 {
 public:
-    %addtofunc wxRemotelyScrolledTreeCtrl         "self._setOORInfo(self)"
-    %addtofunc wxRemotelyScrolledTreeCtrl()       ""
+    %pythonAppend wxRemotelyScrolledTreeCtrl         "self._setOORInfo(self)"
+    %pythonAppend wxRemotelyScrolledTreeCtrl()       ""
 
     wxRemotelyScrolledTreeCtrl(wxWindow* parent, wxWindowID id,
                                const wxPoint& pos = wxDefaultPosition,
@@ -295,8 +295,8 @@ public:
 %name(TreeCompanionWindow) class wxPyTreeCompanionWindow: public wxWindow
 {
 public:
-    %addtofunc wxPyTreeCompanionWindow         "self._setOORInfo(self);self._setCallbackInfo(self, TreeCompanionWindow)"
-    %addtofunc wxPyTreeCompanionWindow()       ""
+    %pythonAppend wxPyTreeCompanionWindow         "self._setOORInfo(self);self._setCallbackInfo(self, TreeCompanionWindow)"
+    %pythonAppend wxPyTreeCompanionWindow()       ""
 
     wxPyTreeCompanionWindow(wxWindow* parent, wxWindowID id = -1,
                             const wxPoint& pos = wxDefaultPosition,
@@ -320,8 +320,8 @@ public:
 class wxThinSplitterWindow: public wxSplitterWindow
 {
 public:
-    %addtofunc wxThinSplitterWindow         "self._setOORInfo(self)"
-    %addtofunc wxThinSplitterWindow()       ""
+    %pythonAppend wxThinSplitterWindow         "self._setOORInfo(self)"
+    %pythonAppend wxThinSplitterWindow()       ""
 
     wxThinSplitterWindow(wxWindow* parent, wxWindowID id = -1,
                          const wxPoint& pos = wxDefaultPosition,
@@ -343,8 +343,8 @@ public:
 class wxSplitterScrolledWindow: public wxScrolledWindow
 {
 public:
-    %addtofunc wxSplitterScrolledWindow         "self._setOORInfo(self)"
-    %addtofunc wxSplitterScrolledWindow()       ""
+    %pythonAppend wxSplitterScrolledWindow         "self._setOORInfo(self)"
+    %pythonAppend wxSplitterScrolledWindow()       ""
 
     wxSplitterScrolledWindow(wxWindow* parent, wxWindowID id = -1,
                              const wxPoint& pos = wxDefaultPosition,
@@ -372,8 +372,8 @@ enum wxLEDValueAlign
 class wxLEDNumberCtrl :        public wxControl
 {
 public:
-    %addtofunc wxLEDNumberCtrl         "self._setOORInfo(self)"
-    %addtofunc wxLEDNumberCtrl()       ""
+    %pythonAppend wxLEDNumberCtrl         "self._setOORInfo(self)"
+    %pythonAppend wxLEDNumberCtrl()       ""
 
     wxLEDNumberCtrl(wxWindow *parent, wxWindowID id = -1,
                     const wxPoint& pos = wxDefaultPosition,
@@ -485,8 +485,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyTreeListCtrl, wxTreeListCtrl)
 %name(TreeListCtrl) class wxPyTreeListCtrl : public wxControl
 {
 public:
-    %addtofunc wxPyTreeListCtrl         "self._setOORInfo(self);self._setCallbackInfo(self, TreeListCtrl)"
-    %addtofunc wxPyTreeListCtrl()       ""
+    %pythonAppend wxPyTreeListCtrl         "self._setOORInfo(self);self._setCallbackInfo(self, TreeListCtrl)"
+    %pythonAppend wxPyTreeListCtrl()       ""
 
     wxPyTreeListCtrl(wxWindow *parent, wxWindowID id = -1,
                    const wxPoint& pos = wxDefaultPosition,

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index 197387eba8b89e5595a962f55d37f38e34487c5c..6f6f3708fa4651dbd6d17f6248769c62fafaf8b6 100644 (file)
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -116,7 +116,7 @@ enum {
 
 class wxGLCanvas : public wxWindow {
 public:
-    %addtofunc wxGLCanvas   "self._setOORInfo(self)"
+    %pythonAppend wxGLCanvas   "self._setOORInfo(self)"
     wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize, long style = 0,
@@ -124,7 +124,7 @@ public:
                int *attribList = NULL,
                const wxPalette& palette = wxNullPalette);
 
-    %addtofunc wxGLCanvas   "val._setOORInfo(val)"
+    %pythonAppend wxGLCanvas   "val._setOORInfo(val)"
     %name(GLCanvasWithContext)
         wxGLCanvas( wxWindow *parent,
                     const wxGLContext *shared = NULL,

diff --git a/wxPython/contrib/iewin/iewin.i b/wxPython/contrib/iewin/iewin.i
index 45e48f962930c1ea592961c3147af1510f86fae2..01764566aaae6f0108e50e14e3d8fb4b8427dd59 100644 (file)
--- a/wxPython/contrib/iewin/iewin.i
+++ b/wxPython/contrib/iewin/iewin.i
@@ -75,7 +75,7 @@ enum wxIEHtmlRefreshLevel {
 class wxIEHtmlWin : public wxWindow /* wxActiveX */ 
 {
 public:
-    %addtofunc wxIEHtmlWin      "self._setOORInfo(self)"
+    %pythonAppend wxIEHtmlWin      "self._setOORInfo(self)"
     
     wxIEHtmlWin(wxWindow * parent, wxWindowID id = -1,
                 const wxPoint& pos = wxDefaultPosition,

diff --git a/wxPython/contrib/ogl/_oglbasic.i b/wxPython/contrib/ogl/_oglbasic.i
index 5cbdfa7b7b925bc1351d8b3b790affcae2494e28..77b308fbe278bf307fcf076110667896a4da0e0c 100644 (file)
--- a/wxPython/contrib/ogl/_oglbasic.i
+++ b/wxPython/contrib/ogl/_oglbasic.i
@@ -81,7 +81,7 @@ public:
 
 class wxPyShapeEvtHandler : public wxObject {
 public:
-    %addtofunc wxPyShapeEvtHandler "self._setOORandCallbackInfo(PyShapeEvtHandler)"
+    %pythonAppend wxPyShapeEvtHandler "self._setOORandCallbackInfo(PyShapeEvtHandler)"
     
     wxPyShapeEvtHandler(wxPyShapeEvtHandler *prev = NULL,
                         wxPyShape *shape = NULL);
@@ -145,7 +145,7 @@ public:
 
 class wxPyShape : public wxPyShapeEvtHandler {
 public:
-    %addtofunc wxPyShape "self._setOORandCallbackInfo(PyShapeEvtHandler)"
+    %pythonAppend wxPyShape "self._setOORandCallbackInfo(PyShapeEvtHandler)"
     
     wxPyShape(wxPyShapeCanvas *can = NULL);  
 

diff --git a/wxPython/contrib/ogl/_oglcanvas.i b/wxPython/contrib/ogl/_oglcanvas.i
index 0521778e834679b56703d600f876cc860e7059c7..7dcf7ca4f851d13a8d1e9e362bea4fe11816f420 100644 (file)
--- a/wxPython/contrib/ogl/_oglcanvas.i
+++ b/wxPython/contrib/ogl/_oglcanvas.i
@@ -101,7 +101,7 @@ public:
 
 class wxPyShapeCanvas : public wxScrolledWindow {
 public:
-    %addtofunc wxPyShapeEvtHandler "self._setOORandCallbackInfo(PyShapeEvtHandler)"
+    %pythonAppend wxPyShapeEvtHandler "self._setOORandCallbackInfo(PyShapeEvtHandler)"
     
     wxPyShapeCanvas(wxWindow* parent = NULL, wxWindowID id = -1,
                     const wxPoint& pos = wxDefaultPosition,

diff --git a/wxPython/contrib/ogl/_oglshapes.i b/wxPython/contrib/ogl/_oglshapes.i
index ef27d7bba3c0fead2996fe30a66c45e6f0a48251..18e28fcc5c4186a91592da3017b0726fe11c67a3 100644 (file)
--- a/wxPython/contrib/ogl/_oglshapes.i
+++ b/wxPython/contrib/ogl/_oglshapes.i
@@ -124,7 +124,7 @@ public:
 
 class wxPyRectangleShape : public wxPyShape {
 public:
-    %addtofunc wxPyRectangleShape "self._setOORandCallbackInfo(PyRectangleShape)"
+    %pythonAppend wxPyRectangleShape "self._setOORandCallbackInfo(PyRectangleShape)"
     
     wxPyRectangleShape(double width = 0.0, double height = 0.0);
     void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -172,7 +172,7 @@ public:
 
 class wxPyControlPoint : public wxPyRectangleShape {
 public:
-    %addtofunc wxPyControlPoint "self._setOORandCallbackInfo(PyControlPoint)"
+    %pythonAppend wxPyControlPoint "self._setOORandCallbackInfo(PyControlPoint)"
     
     wxPyControlPoint(wxPyShapeCanvas *the_canvas = NULL,
                      wxPyShape *object = NULL,
@@ -223,7 +223,7 @@ public:
 
 class wxPyBitmapShape : public wxPyRectangleShape {
 public:
-    %addtofunc wxPyBitmapShape "self._setOORandCallbackInfo(PyBitmapShape)"
+    %pythonAppend wxPyBitmapShape "self._setOORandCallbackInfo(PyBitmapShape)"
     
     wxPyBitmapShape();
 
@@ -273,7 +273,7 @@ public:
 
 class wxPyDrawnShape : public wxPyRectangleShape {
 public:
-    %addtofunc wxPyDrawnShape "self._setOORandCallbackInfo(PyDrawnShape)"
+    %pythonAppend wxPyDrawnShape "self._setOORandCallbackInfo(PyDrawnShape)"
     
     wxPyDrawnShape();
 
@@ -378,7 +378,7 @@ public:
 
 class wxPyCompositeShape : public wxPyRectangleShape {
 public:
-    %addtofunc wxPyCompositeShape "self._setOORandCallbackInfo(PyCompositeShape)"
+    %pythonAppend wxPyCompositeShape "self._setOORandCallbackInfo(PyCompositeShape)"
     
     wxPyCompositeShape();
 
@@ -476,7 +476,7 @@ public:
 
 class wxPyDividedShape : public wxPyRectangleShape {
 public:
-    %addtofunc wxPyDividedShape "self._setOORandCallbackInfo(PyDividedShape)"
+    %pythonAppend wxPyDividedShape "self._setOORandCallbackInfo(PyDividedShape)"
     
     wxPyDividedShape(double width = 0.0, double height = 0.0);
 
@@ -526,7 +526,7 @@ public:
 
 class wxPyDivisionShape : public wxPyCompositeShape {
 public:
-    %addtofunc wxPyDivisionShape "self._setOORandCallbackInfo(PyDivisionShape)"
+    %pythonAppend wxPyDivisionShape "self._setOORandCallbackInfo(PyDivisionShape)"
     
     wxPyDivisionShape();
 

diff --git a/wxPython/contrib/ogl/_oglshapes2.i b/wxPython/contrib/ogl/_oglshapes2.i
index 8a8a570003e5b62882c7d45116fd51107f1c2efc..15c92da3296e7ea94663a7a111c23f1e0fb11782 100644 (file)
--- a/wxPython/contrib/ogl/_oglshapes2.i
+++ b/wxPython/contrib/ogl/_oglshapes2.i
@@ -22,7 +22,7 @@
 
 class wxPyEllipseShape : public wxPyShape {
 public:
-    %addtofunc wxPyEllipseShape "self._setOORandCallbackInfo(PyEllipseShape)"
+    %pythonAppend wxPyEllipseShape "self._setOORandCallbackInfo(PyEllipseShape)"
     
     wxPyEllipseShape(double width = 0.0, double height = 0.0);
 
@@ -66,7 +66,7 @@ public:
 
 class wxPyCircleShape : public wxPyEllipseShape {
 public:
-    %addtofunc wxPyCircleShape "self._setOORandCallbackInfo(PyCircleShape)"
+    %pythonAppend wxPyCircleShape "self._setOORandCallbackInfo(PyCircleShape)"
     
     wxPyCircleShape(double width = 0.0);
 
@@ -141,7 +141,7 @@ public:
 
 class wxPyLineShape : public wxPyShape {
 public:
-    %addtofunc wxPyLineShape "self._setOORandCallbackInfo(PyLineShape)"
+    %pythonAppend wxPyLineShape "self._setOORandCallbackInfo(PyLineShape)"
     
     wxPyLineShape();
 
@@ -254,7 +254,7 @@ public:
 
 class wxPyPolygonShape : public wxPyShape {
 public:
-    %addtofunc wxPyPolygonShape "self._setOORandCallbackInfo(PyPolygonShape)"
+    %pythonAppend wxPyPolygonShape "self._setOORandCallbackInfo(PyPolygonShape)"
     
     wxPyPolygonShape();
 
@@ -364,7 +364,7 @@ public:
 
 class wxPyTextShape : public wxPyRectangleShape {
 public:
-    %addtofunc wxPyTextShape "self._setOORandCallbackInfo(PyTextShape)"
+    %pythonAppend wxPyTextShape "self._setOORandCallbackInfo(PyTextShape)"
     
     wxPyTextShape(double width = 0.0, double height = 0.0);
 

diff --git a/wxPython/contrib/xrc/_xmlhandler.i b/wxPython/contrib/xrc/_xmlhandler.i
index 223bc2f62ee9542ffd7014c8bc7fc37601002024..018d20777aef8ea58957a90d70459aa5c67122f3 100644 (file)
--- a/wxPython/contrib/xrc/_xmlhandler.i
+++ b/wxPython/contrib/xrc/_xmlhandler.i
@@ -140,7 +140,7 @@ IMP_PYCALLBACK_BOOL_NODE_pure(wxPyXmlResourceHandler, wxXmlResourceHandler, CanH
 
 %name(XmlResourceHandler) class wxPyXmlResourceHandler : public wxObject {
 public:
-    %addtofunc wxPyXmlResourceHandler "self._setCallbackInfo(self, XmlResourceHandler)"
+    %pythonAppend wxPyXmlResourceHandler "self._setCallbackInfo(self, XmlResourceHandler)"
     wxPyXmlResourceHandler() : wxXmlResourceHandler() {}
     //~wxPyXmlResourceHandler();
 

diff --git a/wxPython/contrib/xrc/_xmlres.i b/wxPython/contrib/xrc/_xmlres.i
index 912d89e25ac2862565d5f3e82c655487d43b154a..fca287e729688026e6dc188f0042844d2b01c746 100644 (file)
--- a/wxPython/contrib/xrc/_xmlres.i
+++ b/wxPython/contrib/xrc/_xmlres.i
@@ -44,9 +44,9 @@ class wxXmlResource : public wxObject
 {
 public:
 
-    %addtofunc wxXmlResource(const wxString& filemask, int flags)        "self.InitAllHandlers()"
+    %pythonAppend wxXmlResource(const wxString& filemask, int flags)        "self.InitAllHandlers()"
 
-    %addtofunc wxXmlResource(int flags)        "val.InitAllHandlers()"
+    %pythonAppend wxXmlResource(int flags)        "val.InitAllHandlers()"
 
     // Ctors.
     // Flags: wxXRC_USE_LOCALE

diff --git a/wxPython/contrib/xrc/_xmlsub.i b/wxPython/contrib/xrc/_xmlsub.i
index fdd338ac3c9c6649bc82dcbe7a0835a4ddc99091..2722305c27f77e34ca6fd9846385288ff091daa4 100644 (file)
--- a/wxPython/contrib/xrc/_xmlsub.i
+++ b/wxPython/contrib/xrc/_xmlsub.i
@@ -34,7 +34,7 @@ IMP_PYCALLBACK_OBJECT_STRING_pure(wxPyXmlSubclassFactory, wxXmlSubclassFactory,
 
 %name(XmlSubclassFactory)class wxPyXmlSubclassFactory {
 public:
-    %addtofunc wxPyXmlSubclassFactory "self._setCallbackInfo(self, XmlSubclassFactory)"
+    %pythonAppend wxPyXmlSubclassFactory "self._setCallbackInfo(self, XmlSubclassFactory)"
     wxPyXmlSubclassFactory();
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 };

diff --git a/wxPython/src/_app.i b/wxPython/src/_app.i
index b938ac52ef5ed84fcbcfde6a20bf58461068aa7e..cee7c9a804b9d2175cbc3f884f63b96a139501b0 100644 (file)
--- a/wxPython/src/_app.i
+++ b/wxPython/src/_app.i
@@ -44,7 +44,7 @@ enum
 class wxPyApp : public wxEvtHandler {
 public:
 
-    %addtofunc wxPyApp
+    %pythonAppend wxPyApp
        "self._setCallbackInfo(self, PyApp)
         self._setOORInfo(self)";
 

diff --git a/wxPython/src/_artprov.i b/wxPython/src/_artprov.i
index 648b49fb695c3d0723f3bef6dc6a130cdcc9d923..4e8091e701be5ce2feb82810c39fbc1296fff376 100644 (file)
--- a/wxPython/src/_artprov.i
+++ b/wxPython/src/_artprov.i
@@ -106,7 +106,7 @@ public:
 {
 public:
 
-    %addtofunc wxPyArtProvider "self._setCallbackInfo(self, ArtProvider)"
+    %pythonAppend wxPyArtProvider "self._setCallbackInfo(self, ArtProvider)"
     wxPyArtProvider();
     
     void _setCallbackInfo(PyObject* self, PyObject* _class);

diff --git a/wxPython/src/_button.i b/wxPython/src/_button.i
index b83e1599c98a6c5fdd51075bf2a5628acdea7053..882d41e9c7a07b33c7a6f7b7af6c699635168d30 100644 (file)
--- a/wxPython/src/_button.i
+++ b/wxPython/src/_button.i
@@ -51,8 +51,8 @@ RefDoc(wxButton,  "
 class wxButton : public wxControl
 {
 public:
-    %addtofunc wxButton         "self._setOORInfo(self)"
-    %addtofunc wxButton()       ""
+    %pythonAppend wxButton         "self._setOORInfo(self)"
+    %pythonAppend wxButton()       ""
 
 
     DocStr(wxButton, "Create and show a button.");
@@ -102,8 +102,8 @@ DocStr(wxBitmapButton, "A Buttont that contains a bitmap.");
 class wxBitmapButton : public wxButton
 {
 public:
-    %addtofunc wxBitmapButton         "self._setOORInfo(self)"
-    %addtofunc wxBitmapButton()       ""
+    %pythonAppend wxBitmapButton         "self._setOORInfo(self)"
+    %pythonAppend wxBitmapButton()       ""
 
     DocStr(wxBitmapButton, "Create and show a button.")
     wxBitmapButton(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap,

diff --git a/wxPython/src/_checkbox.i b/wxPython/src/_checkbox.i
index 479c210060f195f85eeb0d9a2c5977fe44af0f22..7d2b4a1fce402b01fde360755b8a4c671d5b6425 100644 (file)
--- a/wxPython/src/_checkbox.i
+++ b/wxPython/src/_checkbox.i
@@ -47,8 +47,8 @@ enum wxCheckBoxState
 class wxCheckBox : public wxControl
 {
 public:
-    %addtofunc wxCheckBox         "self._setOORInfo(self)"
-    %addtofunc wxCheckBox()       ""
+    %pythonAppend wxCheckBox         "self._setOORInfo(self)"
+    %pythonAppend wxCheckBox()       ""
     
     wxCheckBox(wxWindow* parent, wxWindowID id, const wxString& label,
                const wxPoint& pos = wxDefaultPosition,

diff --git a/wxPython/src/_choice.i b/wxPython/src/_choice.i
index 49eec5186f7319b935432d140eb85bceae924034..9b818a61f007627db79c499351db0a64c0e766c0 100644 (file)
--- a/wxPython/src/_choice.i
+++ b/wxPython/src/_choice.i
@@ -24,8 +24,8 @@ MAKE_CONST_WXSTRING(ChoiceNameStr);
 class wxChoice : public wxControlWithItems
 {
 public:
-    %addtofunc wxChoice         "self._setOORInfo(self)"
-    %addtofunc wxChoice()       ""
+    %pythonAppend wxChoice         "self._setOORInfo(self)"
+    %pythonAppend wxChoice()       ""
 
     wxChoice(wxWindow *parent, wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,

diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i
index e6ae880860e989c7e7eff34e78cde9d7423b0871..59c2f3805fcaf06a3bb6b3778d06dea0a844e239 100644 (file)
--- a/wxPython/src/_cmndlgs.i
+++ b/wxPython/src/_cmndlgs.i
@@ -42,7 +42,7 @@ public:
 
 class wxColourDialog : public wxDialog {
 public:
-    %addtofunc wxColourDialog   "self._setOORInfo(self)"
+    %pythonAppend wxColourDialog   "self._setOORInfo(self)"
 
     wxColourDialog(wxWindow* parent, wxColourData* data = NULL);
 
@@ -55,7 +55,7 @@ public:
 
 class wxDirDialog : public wxDialog {
 public:
-    %addtofunc wxDirDialog   "self._setOORInfo(self)"
+    %pythonAppend wxDirDialog   "self._setOORInfo(self)"
     
     wxDirDialog(wxWindow* parent,
                 const wxString& message = wxPyDirSelectorPromptStr,
@@ -79,7 +79,7 @@ public:
 
 class wxFileDialog : public wxDialog {
 public:
-    %addtofunc wxFileDialog   "self._setOORInfo(self)"
+    %pythonAppend wxFileDialog   "self._setOORInfo(self)"
     
     wxFileDialog(wxWindow* parent,
                  const wxString& message = wxPyFileSelectorPromptStr,
@@ -150,7 +150,7 @@ enum { wxCHOICEDLG_STYLE };
 class wxMultiChoiceDialog : public wxDialog
 {
 public:
-    %addtofunc wxMultiChoiceDialog   "self._setOORInfo(self)"
+    %pythonAppend wxMultiChoiceDialog   "self._setOORInfo(self)"
     
     wxMultiChoiceDialog(wxWindow *parent,
                         const wxString& message,
@@ -174,7 +174,7 @@ public:
 
 class wxSingleChoiceDialog : public wxDialog {
 public:
-    %addtofunc wxSingleChoiceDialog   "self._setOORInfo(self)"
+    %pythonAppend wxSingleChoiceDialog   "self._setOORInfo(self)"
     
     %extend {
         // TODO: ignoring clientData for now...  FIX THIS
@@ -202,7 +202,7 @@ public:
 
 class wxTextEntryDialog : public wxDialog {
 public:
-    %addtofunc wxTextEntryDialog   "self._setOORInfo(self)"
+    %pythonAppend wxTextEntryDialog   "self._setOORInfo(self)"
     
     wxTextEntryDialog(wxWindow* parent,
                       const wxString& message,
@@ -241,7 +241,7 @@ public:
 
 class wxFontDialog : public wxDialog {
 public:
-    %addtofunc wxFontDialog   "self._setOORInfo(self)"
+    %pythonAppend wxFontDialog   "self._setOORInfo(self)"
     
     wxFontDialog(wxWindow* parent, const wxFontData& data);
 
@@ -254,7 +254,7 @@ public:
 
 class wxMessageDialog : public wxDialog {
 public:
-    %addtofunc wxMessageDialog   "self._setOORInfo(self)"
+    %pythonAppend wxMessageDialog   "self._setOORInfo(self)"
     
     wxMessageDialog(wxWindow* parent,
                     const wxString& message,
@@ -269,7 +269,7 @@ public:
 
 class wxProgressDialog : public wxFrame {
 public:
-    %addtofunc wxProgressDialog   "self._setOORInfo(self)"
+    %pythonAppend wxProgressDialog   "self._setOORInfo(self)"
     
     wxProgressDialog(const wxString& title,
                      const wxString& message,
@@ -368,8 +368,8 @@ public:
 
 class wxFindReplaceDialog : public wxDialog {
 public:
-    %addtofunc wxFindReplaceDialog     "self._setOORInfo(self)"
-    %addtofunc wxFindReplaceDialog()   ""
+    %pythonAppend wxFindReplaceDialog     "self._setOORInfo(self)"
+    %pythonAppend wxFindReplaceDialog()   ""
 
     wxFindReplaceDialog(wxWindow *parent,
                         wxFindReplaceData *data,

diff --git a/wxPython/src/_colour.i b/wxPython/src/_colour.i
index f16e701c48d928b147c27c40c1198e41aae8968a..a7db6a67ad20b04b6e67f8c0033578c7d2f24c9e 100644 (file)
--- a/wxPython/src/_colour.i
+++ b/wxPython/src/_colour.i
@@ -82,10 +82,11 @@ public:
         }
 };
 
-// %pythoncode {
-//     Color = Colour
-//     NamedColor = NamedColour    
-// }
+%pythoncode {
+    Color = Colour
+    NamedColor = NamedColour
+    ColorRGB = ColourRGB
+}
 
 //---------------------------------------------------------------------------
 

diff --git a/wxPython/src/_combobox.i b/wxPython/src/_combobox.i
index a9da630a6803e97968fb46fb9988ed75bfde566d..835d2e2be015042d50742aeb424d1569fc43dc5b 100644 (file)
--- a/wxPython/src/_combobox.i
+++ b/wxPython/src/_combobox.i
@@ -28,8 +28,8 @@ class wxComboBox : public wxControl, public wxItemContainer
 #endif
 {
 public:
-    %addtofunc wxComboBox         "self._setOORInfo(self)"
-    %addtofunc wxComboBox()       ""
+    %pythonAppend wxComboBox         "self._setOORInfo(self)"
+    %pythonAppend wxComboBox()       ""
 
     wxComboBox(wxWindow* parent, wxWindowID id,
                const wxString& value = wxPyEmptyString,

diff --git a/wxPython/src/_control.i b/wxPython/src/_control.i
index 1035fbb4f7e960e75d8d1c540a3bf84f54f40e5e..69c67f3da3246accfdda49fd06e725ee949412ce 100644 (file)
--- a/wxPython/src/_control.i
+++ b/wxPython/src/_control.i
@@ -28,8 +28,8 @@ MAKE_CONST_WXSTRING(ControlNameStr);
 class wxControl : public wxWindow
 {
 public:
-    %addtofunc wxControl         "self._setOORInfo(self)"
-    %addtofunc wxControl()       ""
+    %pythonAppend wxControl         "self._setOORInfo(self)"
+    %pythonAppend wxControl()       ""
 
     wxControl(wxWindow *parent,
               wxWindowID id,

diff --git a/wxPython/src/_cshelp.i b/wxPython/src/_cshelp.i
index f3287448473552a7d30a9ae97804a05fc4e1f8dc..21fbcbfda987167765904b536b19b8e994a5cb20 100644 (file)
--- a/wxPython/src/_cshelp.i
+++ b/wxPython/src/_cshelp.i
@@ -75,7 +75,7 @@ public:
 
 class wxContextHelpButton : public wxBitmapButton {
 public:
-    %addtofunc wxContextHelpButton "self._setOORInfo(self)"
+    %pythonAppend wxContextHelpButton "self._setOORInfo(self)"
 
     wxContextHelpButton(wxWindow* parent, wxWindowID id = wxID_CONTEXT_HELP,
                         const wxPoint& pos = wxDefaultPosition,

diff --git a/wxPython/src/_dataobj.i b/wxPython/src/_dataobj.i
index 8dacc168d8588d278f4b6e8c80067efa2068cfac..60b4a88421ba747562df64e084d3ffcff00509da 100644 (file)
--- a/wxPython/src/_dataobj.i
+++ b/wxPython/src/_dataobj.i
@@ -222,7 +222,7 @@ bool wxPyDataObjectSimple::SetData(size_t len, const void *buf) const{
 // Now define it for SWIG
 class wxPyDataObjectSimple : public wxDataObjectSimple {
 public:
-    %addtofunc wxPyDataObjectSimple   "self._setCallbackInfo(self, PyDataObjectSimple)"
+    %pythonAppend wxPyDataObjectSimple   "self._setCallbackInfo(self, PyDataObjectSimple)"
 
     wxPyDataObjectSimple(const wxDataFormat& format = wxFormatInvalid);
     void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -281,7 +281,7 @@ IMP_PYCALLBACK__STRING(wxPyTextDataObject, wxTextDataObject, SetText);
 // Now define it for SWIG
 class wxPyTextDataObject : public wxTextDataObject {
 public:
-    %addtofunc wxPyTextDataObject   "self._setCallbackInfo(self, PyTextDataObject)"
+    %pythonAppend wxPyTextDataObject   "self._setCallbackInfo(self, PyTextDataObject)"
 
     wxPyTextDataObject(const wxString& text = wxPyEmptyString);
     void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -344,7 +344,7 @@ void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) {
 // Now define it for SWIG
 class wxPyBitmapDataObject : public wxBitmapDataObject {
 public:
-    %addtofunc wxPyBitmapDataObject   "self._setCallbackInfo(self, PyBitmapDataObject)"
+    %pythonAppend wxPyBitmapDataObject   "self._setCallbackInfo(self, PyBitmapDataObject)"
 
     wxPyBitmapDataObject(const wxBitmap& bitmap = wxNullBitmap);
     void _setCallbackInfo(PyObject* self, PyObject* _class);

diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i
index def4b15852f0c97b73e63bd4db1e087210494436..466b5469a55db1cae1ce40633861e6f63c4e65f6 100644 (file)
--- a/wxPython/src/_dc.i
+++ b/wxPython/src/_dc.i
@@ -558,9 +558,9 @@ public:
 class wxBufferedDC : public wxMemoryDC
 {
 public:
-    %addtofunc wxBufferedDC( wxDC *dc, const wxBitmap &buffer )
+    %pythonAppend wxBufferedDC( wxDC *dc, const wxBitmap &buffer )
         "self._dc = args[0] # save a ref so the other dc will not be deleted before self";
-    %addtofunc wxBufferedDC( wxDC *dc, const wxSize &area )
+    %pythonAppend wxBufferedDC( wxDC *dc, const wxSize &area )
         "val._dc = args[0] # save a ref so the other dc will not be deleted before self";
 
     // Construct a wxBufferedDC using a user supplied buffer.

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index d7818e8883dcbe9ea7f280ffee08ef454ce45b48..16ee85809661df0be1d621432e8154bb58896f89 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -40,13 +40,14 @@ typedef unsigned char   byte;
 //----------------------------------------------------------------------
 // Various SWIG macros and such
 
-#define %addtofunc      %feature("addtofunc")
+#define %pythonAppend   %feature("pythonappend")
+#define %pythonPrepend  %feature("pythonprepend")
 #define %kwargs         %feature("kwargs")
 #define %nokwargs       %feature("nokwargs")
 
-#ifndef %shadow
-#define %shadow         %insert("shadow")
-#endif
+//#ifndef %shadow
+//#define %shadow         %insert("shadow")
+//#endif
 
 #ifndef %pythoncode
 #define %pythoncode     %insert("python")

diff --git a/wxPython/src/_dirctrl.i b/wxPython/src/_dirctrl.i
index 8d207caf6573bfc88736e4831c30093644fc616a..b9b7699ba48ad8818704204a681c45426852db67 100644 (file)
--- a/wxPython/src/_dirctrl.i
+++ b/wxPython/src/_dirctrl.i
@@ -57,8 +57,8 @@ public:
 class wxGenericDirCtrl: public wxControl
 {
 public:
-    %addtofunc wxGenericDirCtrl         "self._setOORInfo(self)"
-    %addtofunc wxGenericDirCtrl()       ""
+    %pythonAppend wxGenericDirCtrl         "self._setOORInfo(self)"
+    %pythonAppend wxGenericDirCtrl()       ""
 
     wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = -1,
                      const wxString& dir = wxPyDirDialogDefaultFolderStr,
@@ -137,8 +137,8 @@ public:
 class wxDirFilterListCtrl: public wxChoice
 {
 public:
-    %addtofunc wxDirFilterListCtrl         "self._setOORInfo(self)"
-    %addtofunc wxDirFilterListCtrl()       ""
+    %pythonAppend wxDirFilterListCtrl         "self._setOORInfo(self)"
+    %pythonAppend wxDirFilterListCtrl()       ""
 
     wxDirFilterListCtrl(wxGenericDirCtrl* parent, const wxWindowID id = -1,
                         const wxPoint& pos = wxDefaultPosition,

diff --git a/wxPython/src/_dnd.i b/wxPython/src/_dnd.i
index 19a9494430d2021d60d17dc721497a68883b3f6e..c1092402126571cba91f2b3bde5dd218a8bc134e 100644 (file)
--- a/wxPython/src/_dnd.i
+++ b/wxPython/src/_dnd.i
@@ -118,7 +118,7 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyDropTarget, wxDropTarget, OnDrop);
 %name(DropTarget) class wxPyDropTarget // : public wxDropTarget
 {
 public:
-    %addtofunc wxPyDropTarget
+    %pythonAppend wxPyDropTarget
        "self._setCallbackInfo(self, DropTarget)"
     %apply SWIGTYPE *DISOWN { wxDataObject *dataObject };
 
@@ -180,7 +180,7 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyTextDropTarget, wxTextDropTarget, OnDrop);
 
 %name(TextDropTarget) class wxPyTextDropTarget : public wxPyDropTarget {
 public:
-    %addtofunc wxPyTextDropTarget   "self._setCallbackInfo(self, TextDropTarget)"
+    %pythonAppend wxPyTextDropTarget   "self._setCallbackInfo(self, TextDropTarget)"
 
     wxPyTextDropTarget();
     void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -241,7 +241,7 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyFileDropTarget, wxFileDropTarget, OnDrop);
 %name(FileDropTarget) class wxPyFileDropTarget : public wxPyDropTarget
 {
 public:
-    %addtofunc wxPyFileDropTarget   "self._setCallbackInfo(self, FileDropTarget)"
+    %pythonAppend wxPyFileDropTarget   "self._setCallbackInfo(self, FileDropTarget)"
 
     wxPyFileDropTarget();
     void _setCallbackInfo(PyObject* self, PyObject* _class);

diff --git a/wxPython/src/_event.i b/wxPython/src/_event.i
index 3ddc61936a0777eaa7e4385e058afd34274a6d21..115650bc6d38dfb321f6510c0e7f126446760e9a 100644 (file)
--- a/wxPython/src/_event.i
+++ b/wxPython/src/_event.i
@@ -1211,7 +1211,7 @@ public:
 
 class wxPyEvent : public wxEvent {
 public:
-    %addtofunc wxPyEvent     "self.SetSelf(self)"
+    %pythonAppend wxPyEvent     "self.SetSelf(self)"
     wxPyEvent(int winid=0, wxEventType commandType = wxEVT_NULL );
     ~wxPyEvent();
 
@@ -1223,7 +1223,7 @@ public:
 
 class wxPyCommandEvent : public wxCommandEvent {
 public:
-    %addtofunc wxPyCommandEvent     "self.SetSelf(self)"
+    %pythonAppend wxPyCommandEvent     "self.SetSelf(self)"
     wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0);
     ~wxPyCommandEvent();
 

diff --git a/wxPython/src/_filesys.i b/wxPython/src/_filesys.i
index feb402665078229e043f738a3519c8c3d9a462f0..87e95b556ed9fe2fe0255cf939790d7fdb7d1b0b 100644 (file)
--- a/wxPython/src/_filesys.i
+++ b/wxPython/src/_filesys.i
@@ -95,7 +95,7 @@ public:
 %name(FileSystemHandler) class wxPyFileSystemHandler : public wxFileSystemHandler
 {
 public:
-    %addtofunc    wxPyFileSystemHandler "self._setCallbackInfo(self, FileSystemHandler)";
+    %pythonAppend    wxPyFileSystemHandler "self._setCallbackInfo(self, FileSystemHandler)";
     
     wxPyFileSystemHandler();
 

diff --git a/wxPython/src/_font.i b/wxPython/src/_font.i
index fc4d975bbf1609920ac2f73c1ae93c1e0e4830ba..833c37b9b48f813e774c6057e6cacec4b8a151dc 100644 (file)
--- a/wxPython/src/_font.i
+++ b/wxPython/src/_font.i
@@ -523,7 +523,7 @@ IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEnc
 
 %name(FontEnumerator) class wxPyFontEnumerator {
 public:
-    %addtofunc wxPyFontEnumerator "self._setCallbackInfo(self, FontEnumerator, 0)"
+    %pythonAppend wxPyFontEnumerator "self._setCallbackInfo(self, FontEnumerator, 0)"
 
     wxPyFontEnumerator();
     ~wxPyFontEnumerator();

diff --git a/wxPython/src/_gauge.i b/wxPython/src/_gauge.i
index 9171ca3dcff40105980e1a444a4cbde9bad2eec3..264683d27aea57c917b01afd4084db2d2db2e2aa 100644 (file)
--- a/wxPython/src/_gauge.i
+++ b/wxPython/src/_gauge.i
@@ -31,8 +31,8 @@ enum {
 
 class wxGauge : public wxControl {
 public:
-    %addtofunc wxGauge         "self._setOORInfo(self)"
-    %addtofunc wxGauge()       ""
+    %pythonAppend wxGauge         "self._setOORInfo(self)"
+    %pythonAppend wxGauge()       ""
 
     wxGauge(wxWindow* parent, wxWindowID id, int range,
             const wxPoint& pos = wxDefaultPosition,

diff --git a/wxPython/src/_listbox.i b/wxPython/src/_listbox.i
index 234eaddc2af47b9d0c11617adf0525f52b7d423e..3b2fb7ddd34ec7df6735b18c55be4940bd772501 100644 (file)
--- a/wxPython/src/_listbox.i
+++ b/wxPython/src/_listbox.i
@@ -29,8 +29,8 @@ MAKE_CONST_WXSTRING(ListBoxNameStr);
 class wxListBox : public wxControlWithItems
 {
 public:
-    %addtofunc wxListBox         "self._setOORInfo(self)"
-    %addtofunc wxListBox()       ""
+    %pythonAppend wxListBox         "self._setOORInfo(self)"
+    %pythonAppend wxListBox()       ""
 
     wxListBox(wxWindow* parent, wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
@@ -114,8 +114,8 @@ public:
 class wxCheckListBox : public wxListBox
 {
 public:
-    %addtofunc wxCheckListBox         "self._setOORInfo(self)"
-    %addtofunc wxCheckListBox()       ""
+    %pythonAppend wxCheckListBox         "self._setOORInfo(self)"
+    %pythonAppend wxCheckListBox()       ""
 
     wxCheckListBox(wxWindow *parent, wxWindowID id,
                    const wxPoint& pos = wxDefaultPosition,

diff --git a/wxPython/src/_listctrl.i b/wxPython/src/_listctrl.i
index 60f6ba3edc61e837d92d183008c7b648ace76187..1ecb636b6d782d5abb788ca529651c34224526d4 100644 (file)
--- a/wxPython/src/_listctrl.i
+++ b/wxPython/src/_listctrl.i
@@ -401,8 +401,8 @@ IMP_PYCALLBACK_LISTATTR_LONG(wxPyListCtrl, wxListCtrl, OnGetItemAttr);
 %name(ListCtrl)class wxPyListCtrl : public wxControl {
 public:
 
-    %addtofunc wxPyListCtrl         "self._setOORInfo(self);self._setCallbackInfo(self, ListCtrl)"
-    %addtofunc wxPyListCtrl()       ""
+    %pythonAppend wxPyListCtrl         "self._setOORInfo(self);self._setCallbackInfo(self, ListCtrl)"
+    %pythonAppend wxPyListCtrl()       ""
    
     wxPyListCtrl(wxWindow* parent, wxWindowID id = -1,
                  const wxPoint& pos = wxDefaultPosition,
@@ -427,7 +427,7 @@ public:
     bool SetBackgroundColour(const wxColour& col);
 
     // Gets information about this column
-    %addtofunc GetColumn "if val is not None: val.thisown = 1";  // %newobject doesn't work with OOR typemap
+    %pythonAppend GetColumn "if val is not None: val.thisown = 1";  // %newobject doesn't work with OOR typemap
     %extend {
         wxListItem* GetColumn(int col) {
             wxListItem item;
@@ -470,7 +470,7 @@ public:
 #endif
 
     // Gets information about the item
-    %addtofunc GetItem "if val is not None: val.thisown = 1";  // %newobject doesn't work with OOR typemap
+    %pythonAppend GetItem "if val is not None: val.thisown = 1";  // %newobject doesn't work with OOR typemap
     %extend {
         wxListItem* GetItem(long itemId, int col=0) {
             wxListItem* info = new wxListItem;
@@ -776,8 +776,8 @@ public:
 class wxListView : public wxPyListCtrl
 {
 public:
-    %addtofunc wxListView         "self._setOORInfo(self)"
-    %addtofunc wxListView()       ""
+    %pythonAppend wxListView         "self._setOORInfo(self)"
+    %pythonAppend wxListView()       ""
 
     wxListView( wxWindow *parent,
                 wxWindowID id = -1,

diff --git a/wxPython/src/_log.i b/wxPython/src/_log.i
index 4a3b7e26b8670ee2090c23231c610a2ace92c001..7960ba69f2a41392407894fe1f6973a748fc22da 100644 (file)
--- a/wxPython/src/_log.i
+++ b/wxPython/src/_log.i
@@ -281,7 +281,7 @@ public:
 // Now tell SWIG about it
 class wxPyLog : public wxLog {
 public:
-    %addtofunc wxPyLog   "self._setCallbackInfo(self, PyLog)"
+    %pythonAppend wxPyLog   "self._setCallbackInfo(self, PyLog)"
 
     wxPyLog();
     

diff --git a/wxPython/src/_mdi.i b/wxPython/src/_mdi.i
index 1ccaa7a1779e15f7a325817576bfc9f4f685d946..daf66d111ac943669290e5eea7e7ba6b1cd6f861 100644 (file)
--- a/wxPython/src/_mdi.i
+++ b/wxPython/src/_mdi.i
@@ -35,8 +35,8 @@
 
 class wxMDIParentFrame : public wxFrame {
 public:
-    %addtofunc wxMDIParentFrame         "self._setOORInfo(self)"
-    %addtofunc wxMDIParentFrame()       ""
+    %pythonAppend wxMDIParentFrame         "self._setOORInfo(self)"
+    %pythonAppend wxMDIParentFrame()       ""
 
     wxMDIParentFrame(wxWindow *parent,
                      const wxWindowID id,
@@ -80,8 +80,8 @@ public:
 
 class wxMDIChildFrame : public wxFrame {
 public:
-    %addtofunc wxMDIChildFrame         "self._setOORInfo(self)"
-    %addtofunc wxMDIChildFrame()       ""
+    %pythonAppend wxMDIChildFrame         "self._setOORInfo(self)"
+    %pythonAppend wxMDIChildFrame()       ""
 
     wxMDIChildFrame(wxMDIParentFrame* parent,
                     const wxWindowID id,
@@ -111,8 +111,8 @@ public:
 
 class wxMDIClientWindow : public wxWindow {
 public:
-    %addtofunc wxMDIClientWindow         "self._setOORInfo(self)"
-    %addtofunc wxMDIClientWindow()       ""
+    %pythonAppend wxMDIClientWindow         "self._setOORInfo(self)"
+    %pythonAppend wxMDIClientWindow()       ""
 
     wxMDIClientWindow(wxMDIParentFrame* parent, long style = 0);
     %name(PreMDIClientWindow)wxMDIClientWindow();

diff --git a/wxPython/src/_menu.i b/wxPython/src/_menu.i
index 8144d66acee5956e3d320616d4a26580b805edbd..02dc200a3c6bda354608dc173f622a762022570d 100644 (file)
--- a/wxPython/src/_menu.i
+++ b/wxPython/src/_menu.i
@@ -20,7 +20,7 @@
 class wxMenu : public wxEvtHandler
 {
 public:
-    %addtofunc wxMenu         "self._setOORInfo(self)"
+    %pythonAppend wxMenu         "self._setOORInfo(self)"
     wxMenu(const wxString& title = wxPyEmptyString, long style = 0);
 
 
@@ -206,7 +206,7 @@ public:
 class wxMenuBar : public wxWindow
 {
 public:
-    %addtofunc wxMenuBar         "self._setOORInfo(self)"
+    %pythonAppend wxMenuBar         "self._setOORInfo(self)"
     wxMenuBar(long style = 0);
 
 

diff --git a/wxPython/src/_notebook.i b/wxPython/src/_notebook.i
index 5cfb31366748289e7972a8086105d6c6a8546bcd..a01000f65aee3494233731da8168ad4b32f08ad7 100644 (file)
--- a/wxPython/src/_notebook.i
+++ b/wxPython/src/_notebook.i
@@ -159,8 +159,8 @@ enum {
 
 class wxNotebook : public wxBookCtrl {
 public:
-    %addtofunc wxNotebook         "self._setOORInfo(self)"
-    %addtofunc wxNotebook()       ""
+    %pythonAppend wxNotebook         "self._setOORInfo(self)"
+    %pythonAppend wxNotebook()       ""
 
     wxNotebook(wxWindow *parent,
                wxWindowID id,
@@ -283,8 +283,8 @@ enum
 class wxListbook : public wxBookCtrl
 {
 public:
-    %addtofunc wxListbook         "self._setOORInfo(self)"
-    %addtofunc wxListbook()       ""
+    %pythonAppend wxListbook         "self._setOORInfo(self)"
+    %pythonAppend wxListbook()       ""
 
     wxListbook(wxWindow *parent,
                wxWindowID id,
@@ -332,7 +332,7 @@ public:
 class wxBookCtrlSizer: public wxSizer
 {
 public:
-    %addtofunc wxBookCtrlSizer "self._setOORInfo(self)"
+    %pythonAppend wxBookCtrlSizer "self._setOORInfo(self)"
 
     wxBookCtrlSizer( wxBookCtrl *nb );
     
@@ -344,7 +344,7 @@ public:
 
 class wxNotebookSizer: public wxSizer {
 public:
-    %addtofunc wxNotebookSizer "self._setOORInfo(self)"
+    %pythonAppend wxNotebookSizer "self._setOORInfo(self)"
 
     wxNotebookSizer( wxNotebook *nb );
     

diff --git a/wxPython/src/_panel.i b/wxPython/src/_panel.i
index f318d26caf059b17accbdff99ef5615a36aa128d..76a7fb4d5f6a04c7ea96e3f3164b609856cbb634 100644 (file)
--- a/wxPython/src/_panel.i
+++ b/wxPython/src/_panel.i
@@ -25,8 +25,8 @@
 class wxPanel : public wxWindow
 {
 public:
-    %addtofunc wxPanel         "self._setOORInfo(self)"
-    %addtofunc wxPanel()       ""
+    %pythonAppend wxPanel         "self._setOORInfo(self)"
+    %pythonAppend wxPanel()       ""
 
     wxPanel(wxWindow* parent,
             const wxWindowID id=-1,
@@ -58,8 +58,8 @@ public:
 class wxScrolledWindow : public wxPanel
 {
 public:
-    %addtofunc wxScrolledWindow         "self._setOORInfo(self)"
-    %addtofunc wxScrolledWindow()       ""
+    %pythonAppend wxScrolledWindow         "self._setOORInfo(self)"
+    %pythonAppend wxScrolledWindow()       ""
 
     wxScrolledWindow(wxWindow* parent,
                      const wxWindowID id = -1,

diff --git a/wxPython/src/_popupwin.i b/wxPython/src/_popupwin.i
index 330b1dc3cb15f7ecbeb6fef98e48267546d4a60f..38ae99eda9404da38f6de6a86f51033f52d29a96 100644 (file)
--- a/wxPython/src/_popupwin.i
+++ b/wxPython/src/_popupwin.i
@@ -28,8 +28,8 @@
 // combobox popups and such.
 class wxPopupWindow : public wxWindow {
 public:
-    %addtofunc wxPopupWindow         "self._setOORInfo(self)"
-    %addtofunc wxPopupWindow()       ""
+    %pythonAppend wxPopupWindow         "self._setOORInfo(self)"
+    %pythonAppend wxPopupWindow()       ""
     
     wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE);
     %name(PrePopupWindow)wxPopupWindow();
@@ -79,8 +79,8 @@ IMP_PYCALLBACK_BOOL_(wxPyPopupTransientWindow, wxPopupTransientWindow, CanDismis
 %name(PopupTransientWindow) class wxPyPopupTransientWindow : public wxPopupWindow
 {
 public:
-    %addtofunc wxPyPopupTransientWindow         "self._setOORInfo(self);self._setCallbackInfo(self, PopupTransientWindow)"
-    %addtofunc wxPyPopupTransientWindow()       ""
+    %pythonAppend wxPyPopupTransientWindow         "self._setOORInfo(self);self._setCallbackInfo(self, PopupTransientWindow)"
+    %pythonAppend wxPyPopupTransientWindow()       ""
     
     wxPyPopupTransientWindow(wxWindow *parent, int style = wxBORDER_NONE);
     %name(PrePopupTransientWindow)wxPyPopupTransientWindow();

diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i
index 55ddfca1b1cbcfe4d5ecb8c1390c76973d79c8f4..48708018bc4bee518599a45a36115076f75c8a73 100644 (file)
--- a/wxPython/src/_printfw.i
+++ b/wxPython/src/_printfw.i
@@ -147,7 +147,7 @@ public:
 
 class wxPageSetupDialog : public wxDialog {
 public:
-    %addtofunc wxPageSetupDialog         "self._setOORInfo(self)"
+    %pythonAppend wxPageSetupDialog         "self._setOORInfo(self)"
 
     wxPageSetupDialog(wxWindow* parent, wxPageSetupDialogData* data = NULL);
 
@@ -213,7 +213,7 @@ public:
 
 class wxPrintDialog : public wxDialog {
 public:
-    %addtofunc wxPrintDialog         "self._setOORInfo(self)"
+    %pythonAppend wxPrintDialog         "self._setOORInfo(self)"
 
     wxPrintDialog(wxWindow* parent, wxPrintDialogData* data = NULL);
 
@@ -320,7 +320,7 @@ IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage);
 // Now define the custom class for SWIGging
 %name(Printout) class wxPyPrintout  : public wxObject {
 public:
-    %addtofunc wxPyPrintout   "self._setCallbackInfo(self, Printout)"
+    %pythonAppend wxPyPrintout   "self._setCallbackInfo(self, Printout)"
 
     wxPyPrintout(const wxString& title = wxPyPrintoutTitleStr);
     //~wxPyPrintout();      wxPrintPreview object takes ownership...
@@ -374,7 +374,7 @@ public:
 class wxPreviewCanvas: public wxScrolledWindow
 {
 public:
-    %addtofunc wxPreviewCanvas   "self._setOORInfo(self)"
+    %pythonAppend wxPreviewCanvas   "self._setOORInfo(self)"
 
     wxPreviewCanvas(wxPrintPreview *preview,
                     wxWindow *parent,
@@ -387,7 +387,7 @@ public:
 
 class wxPreviewFrame : public wxFrame {
 public:
-    %addtofunc wxPreviewFrame   "self._setOORInfo(self)"
+    %pythonAppend wxPreviewFrame   "self._setOORInfo(self)"
 
     wxPreviewFrame(wxPrintPreview* preview, wxFrame* parent, const wxString& title,
                    const wxPoint& pos = wxDefaultPosition,
@@ -427,7 +427,7 @@ enum {
 class wxPreviewControlBar: public wxPanel
 {
 public:
-    %addtofunc wxPreviewControlBar   "self._setOORInfo(self)"
+    %pythonAppend wxPreviewControlBar   "self._setOORInfo(self)"
 
     wxPreviewControlBar(wxPrintPreview *preview,
                         long buttons,
@@ -580,7 +580,7 @@ IMP_PYCALLBACK_VOID_        (wxPyPrintPreview, wxPrintPreview, DetermineScaling)
 class wxPyPrintPreview : public wxPrintPreview
 {
 public:
-    %addtofunc wxPyPrintPreview   "self._setCallbackInfo(self, PyPrintPreview)"
+    %pythonAppend wxPyPrintPreview   "self._setCallbackInfo(self, PyPrintPreview)"
 
     wxPyPrintPreview(wxPyPrintout* printout,
                      wxPyPrintout* printoutForPrinting,
@@ -635,7 +635,7 @@ IMP_PYCALLBACK_VOID_(wxPyPreviewFrame, wxPreviewFrame, CreateControlBar);
 class wxPyPreviewFrame : public wxPreviewFrame
 {
 public:
-    %addtofunc wxPyPreviewFrame "self._setCallbackInfo(self, PyPreviewFrame); self._setOORInfo(self)"
+    %pythonAppend wxPyPreviewFrame "self._setCallbackInfo(self, PyPreviewFrame); self._setOORInfo(self)"
 
     wxPyPreviewFrame(wxPrintPreview* preview, wxFrame* parent,
                      const wxString& title,
@@ -689,7 +689,7 @@ IMP_PYCALLBACK_VOID_INT(wxPyPreviewControlBar, wxPreviewControlBar, SetZoomContr
 class wxPyPreviewControlBar : public wxPreviewControlBar
 {
 public:
-    %addtofunc wxPyPreviewControlBar   "self._setCallbackInfo(self, PyPreviewControlBar); self._setOORInfo(self)"
+    %pythonAppend wxPyPreviewControlBar   "self._setCallbackInfo(self, PyPreviewControlBar); self._setOORInfo(self)"
 
     wxPyPreviewControlBar(wxPrintPreview *preview,
                           long buttons,

diff --git a/wxPython/src/_process.i b/wxPython/src/_process.i
index b3e1155429ff67eedb1976da85da7aa5394f5a99..642a03134e62a4d25102153bd5da4016e15d173f 100644 (file)
--- a/wxPython/src/_process.i
+++ b/wxPython/src/_process.i
@@ -89,7 +89,7 @@ public:
     static wxPyProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC);
 
 
-    %addtofunc wxPyProcess  "self._setCallbackInfo(self, Process)"
+    %pythonAppend wxPyProcess  "self._setCallbackInfo(self, Process)"
     wxPyProcess(wxEvtHandler *parent = NULL, int id = -1);
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);

diff --git a/wxPython/src/_pycontrol.i b/wxPython/src/_pycontrol.i
index 868e9b514321dd193581223b4324f1bad110ed99..98ff833b675874455caa5673f306ff276127a6d1 100644 (file)
--- a/wxPython/src/_pycontrol.i
+++ b/wxPython/src/_pycontrol.i
@@ -95,7 +95,7 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyControl, wxControl, RemoveChild);
 class wxPyControl : public wxControl
 {
 public:
-    %addtofunc wxPyControl         "self._setOORInfo(self); self._setCallbackInfo(self, PyControl)"
+    %pythonAppend wxPyControl         "self._setOORInfo(self); self._setCallbackInfo(self, PyControl)"
 
     wxPyControl(wxWindow* parent, const wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,

diff --git a/wxPython/src/_pywindows.i b/wxPython/src/_pywindows.i
index 74d5be5e307900528c77c2b8811dddfdf90edd2e..bac5f0d3f72a1c5dc3c55432206ebe3103822334 100644 (file)
--- a/wxPython/src/_pywindows.i
+++ b/wxPython/src/_pywindows.i
@@ -125,7 +125,7 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyWindow, wxWindow, RemoveChild);
 class wxPyWindow : public wxWindow
 {
 public:
-    %addtofunc wxPyWindow         "self._setOORInfo(self); self._setCallbackInfo(self, PyWindow)"
+    %pythonAppend wxPyWindow         "self._setOORInfo(self); self._setCallbackInfo(self, PyWindow)"
 
     wxPyWindow(wxWindow* parent, const wxWindowID id,
                const wxPoint& pos = wxDefaultPosition,
@@ -250,7 +250,7 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyPanel, wxPanel, RemoveChild);
 class wxPyPanel : public wxPanel
 {
 public:
-    %addtofunc wxPyPanel         "self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)"
+    %pythonAppend wxPyPanel         "self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)"
 
     wxPyPanel(wxWindow* parent, const wxWindowID id,
                const wxPoint& pos = wxDefaultPosition,

diff --git a/wxPython/src/_radio.i b/wxPython/src/_radio.i
index aaced88af9b707f75ce2ec0cc215d010a81ce54c..e6974a375f39eda6b7119c79b9af01dd6f0e46c4 100644 (file)
--- a/wxPython/src/_radio.i
+++ b/wxPython/src/_radio.i
@@ -24,12 +24,14 @@ MAKE_CONST_WXSTRING(RadioButtonNameStr);
 class wxRadioBox : public wxControl
 {
 public:
-    %addtofunc wxRadioBox         "self._setOORInfo(self)"
-    %addtofunc wxRadioBox()       ""
+    %pythonPrepend wxRadioBox         "if kwargs.has_key('point'): kwargs['pos'] = kwargs['point']"
+    %pythonPrepend wxRadioBox()       ""
+    %pythonAppend  wxRadioBox         "self._setOORInfo(self)"
+    %pythonAppend  wxRadioBox()       ""
 
     wxRadioBox(wxWindow* parent, wxWindowID id,
                const wxString& label,
-               const wxPoint& point = wxDefaultPosition,
+               const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                int choices = 0, wxString* choices_array = NULL,
                int majorDimension = 0,
@@ -40,7 +42,7 @@ public:
 
     bool Create(wxWindow* parent, wxWindowID id,
                const wxString& label,
-               const wxPoint& point = wxDefaultPosition,
+               const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                int choices = 0, wxString* choices_array = NULL,
                int majorDimension = 0,
@@ -91,8 +93,8 @@ public:
 class wxRadioButton : public wxControl
 {
 public:
-    %addtofunc wxRadioButton         "self._setOORInfo(self)"
-    %addtofunc wxRadioButton()       ""
+    %pythonAppend wxRadioButton         "self._setOORInfo(self)"
+    %pythonAppend wxRadioButton()       ""
 
     wxRadioButton(wxWindow* parent, wxWindowID id,
                   const wxString& label,

diff --git a/wxPython/src/_sashwin.i b/wxPython/src/_sashwin.i
index da6752c2853365068c558853096f0e380ce741d1..eb2d828ac9b13805b00183e0b9ff94685cf7d054 100644 (file)
--- a/wxPython/src/_sashwin.i
+++ b/wxPython/src/_sashwin.i
@@ -51,8 +51,8 @@ enum wxSashEdgePosition {
 class wxSashWindow: public wxWindow
 {
 public:
-    %addtofunc wxSashWindow         "self._setOORInfo(self)"
-    %addtofunc wxSashWindow()       ""
+    %pythonAppend wxSashWindow         "self._setOORInfo(self)"
+    %pythonAppend wxSashWindow()       ""
 
     wxSashWindow(wxWindow* parent, wxWindowID id,
                  const wxPoint& pos = wxDefaultPosition,
@@ -237,8 +237,8 @@ public:
 class wxSashLayoutWindow: public wxSashWindow
 {
 public:
-    %addtofunc wxSashLayoutWindow         "self._setOORInfo(self)"
-    %addtofunc wxSashLayoutWindow()       ""
+    %pythonAppend wxSashLayoutWindow         "self._setOORInfo(self)"
+    %pythonAppend wxSashLayoutWindow()       ""
     
     wxSashLayoutWindow(wxWindow* parent, wxWindowID id,
                        const wxPoint& pos = wxDefaultPosition,

diff --git a/wxPython/src/_scrolbar.i b/wxPython/src/_scrolbar.i
index 5a32c1503f9827c58a9fce50707a40fb105a363a..8155c4502eb943c98277c1b8a27d195470a0c3d6 100644 (file)
--- a/wxPython/src/_scrolbar.i
+++ b/wxPython/src/_scrolbar.i
@@ -22,8 +22,8 @@ MAKE_CONST_WXSTRING(ScrollBarNameStr);
 
 class wxScrollBar : public wxControl {
 public:
-    %addtofunc wxScrollBar         "self._setOORInfo(self)"
-    %addtofunc wxScrollBar()       ""
+    %pythonAppend wxScrollBar         "self._setOORInfo(self)"
+    %pythonAppend wxScrollBar()       ""
 
     wxScrollBar(wxWindow* parent, wxWindowID id = -1,
                 const wxPoint& pos = wxDefaultPosition,

diff --git a/wxPython/src/_sizers.i b/wxPython/src/_sizers.i
index b4da96010a143c71dfc89cd13a4a546eabe874f7..9263606e546608c11b450abb586d859ef9ba27f2 100644 (file)
--- a/wxPython/src/_sizers.i
+++ b/wxPython/src/_sizers.i
@@ -382,7 +382,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPySizer, wxSizer);
 
 class wxPySizer : public wxSizer {
 public:
-    %addtofunc wxPySizer "self._setCallbackInfo(self, PySizer);self._setOORInfo(self)"
+    %pythonAppend wxPySizer "self._setCallbackInfo(self, PySizer);self._setOORInfo(self)"
 
     wxPySizer();
     void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -394,7 +394,7 @@ public:
 
 class  wxBoxSizer : public wxSizer {
 public:
-    %addtofunc wxBoxSizer "self._setOORInfo(self)"
+    %pythonAppend wxBoxSizer "self._setOORInfo(self)"
 
     wxBoxSizer(int orient = wxHORIZONTAL);
 
@@ -409,7 +409,7 @@ public:
 
 class  wxStaticBoxSizer : public wxBoxSizer {
 public:
-    %addtofunc wxStaticBoxSizer "self._setOORInfo(self)"
+    %pythonAppend wxStaticBoxSizer "self._setOORInfo(self)"
 
     wxStaticBoxSizer(wxStaticBox *box, int orient = wxHORIZONTAL);
     
@@ -424,7 +424,7 @@ public:
 class wxGridSizer: public wxSizer
 {
 public:
-    %addtofunc wxGridSizer "self._setOORInfo(self)"
+    %pythonAppend wxGridSizer "self._setOORInfo(self)"
 
     wxGridSizer( int rows=1, int cols=0, int vgap=0, int hgap=0 );
 
@@ -460,7 +460,7 @@ enum wxFlexSizerGrowMode
 class wxFlexGridSizer: public wxGridSizer
 {
 public:
-    %addtofunc wxFlexGridSizer "self._setOORInfo(self)"
+    %pythonAppend wxFlexGridSizer "self._setOORInfo(self)"
 
     wxFlexGridSizer( int rows=1, int cols=0, int vgap=0, int hgap=0 );
     

diff --git a/wxPython/src/_slider.i b/wxPython/src/_slider.i
index 21bae7b0edcb06b28b74b8a867ab36a4f532804d..4ed28e4ff03bd2f3dc2e739dc964d72802e33af1 100644 (file)
--- a/wxPython/src/_slider.i
+++ b/wxPython/src/_slider.i
@@ -27,12 +27,14 @@ MAKE_CONST_WXSTRING(SliderNameStr);
 
 class wxSlider : public wxControl {
 public:
-    %addtofunc wxSlider         "self._setOORInfo(self)"
-    %addtofunc wxSlider()       ""
+    %pythonPrepend wxSlider         "if kwargs.has_key('point'): kwargs['pos'] = kwargs['point']"
+    %pythonPrepend wxSlider()       ""
+    %pythonAppend  wxSlider         "self._setOORInfo(self)"
+    %pythonAppend  wxSlider()       ""
 
     wxSlider(wxWindow* parent, wxWindowID id,
              int value, int minValue, int maxValue,
-             const wxPoint& point = wxDefaultPosition,
+             const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxSL_HORIZONTAL,
              const wxValidator& validator = wxDefaultValidator,
@@ -41,7 +43,7 @@ public:
 
     bool Create(wxWindow* parent, wxWindowID id,
              int value, int minValue, int maxValue,
-             const wxPoint& point = wxDefaultPosition,
+             const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxSL_HORIZONTAL,
              const wxValidator& validator = wxDefaultValidator,
@@ -71,7 +73,7 @@ public:
     virtual void SetThumbLength(int lenPixels);
     virtual int GetThumbLength() const;
 
-    virtual void SetTickFreq(int n, int pos);
+    virtual void SetTickFreq(int n, int pos=1);
     virtual int GetTickFreq() const;
     virtual void ClearTicks();
     virtual void SetTick(int tickPos);

diff --git a/wxPython/src/_spin.i b/wxPython/src/_spin.i
index 36a921eb3d7ad93d284f5d621484316ebf62588d..1b100a21e5b521844d4380c66cc5b750b6346ece 100644 (file)
--- a/wxPython/src/_spin.i
+++ b/wxPython/src/_spin.i
@@ -41,8 +41,8 @@ enum {
 class wxSpinButton : public wxControl
 {
 public:
-    %addtofunc wxSpinButton         "self._setOORInfo(self)"
-    %addtofunc wxSpinButton()       ""
+    %pythonAppend wxSpinButton         "self._setOORInfo(self)"
+    %pythonAppend wxSpinButton()       ""
 
     wxSpinButton(wxWindow* parent, wxWindowID id = -1,
                  const wxPoint& pos = wxDefaultPosition,
@@ -80,8 +80,8 @@ public:
 class wxSpinCtrl : public wxControl
 {
 public:
-    %addtofunc wxSpinCtrl         "self._setOORInfo(self)"
-    %addtofunc wxSpinCtrl()       ""
+    %pythonAppend wxSpinCtrl         "self._setOORInfo(self)"
+    %pythonAppend wxSpinCtrl()       ""
 
     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = -1,

diff --git a/wxPython/src/_splitter.i b/wxPython/src/_splitter.i
index 0c3a7fb6de4488e0e8049e00990ce485c40c9541..5f839f6287dc38a6d7e90b1ea90bec8554b279b1 100644 (file)
--- a/wxPython/src/_splitter.i
+++ b/wxPython/src/_splitter.i
@@ -53,18 +53,20 @@ enum
 class wxSplitterWindow: public wxWindow
 {
 public:
-    %addtofunc wxSplitterWindow         "self._setOORInfo(self)"
-    %addtofunc wxSplitterWindow()       ""
+    %pythonPrepend wxSplitterWindow         "if kwargs.has_key('point'): kwargs['pos'] = kwargs['point']"
+    %pythonPrepend wxSplitterWindow()       ""
+    %pythonAppend  wxSplitterWindow         "self._setOORInfo(self)"
+    %pythonAppend  wxSplitterWindow()       ""
 
     wxSplitterWindow(wxWindow* parent, wxWindowID id,
-                     const wxPoint& point = wxDefaultPosition,
+                     const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style=wxSP_3D,
                      const wxString& name = wxPySplitterNameStr);
     %name(PreSplitterWindow)wxSplitterWindow();
 
     bool Create(wxWindow* parent, wxWindowID id,
-                const wxPoint& point = wxDefaultPosition,
+                const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style=wxSP_3D,
                 const wxString& name = wxPySplitterNameStr);

diff --git a/wxPython/src/_statctrls.i b/wxPython/src/_statctrls.i
index 097e0f314dcdaa499d68a88c9058db3d71ff9c4e..63dc0fe569babb9c6568857dcadd84df617975a1 100644 (file)
--- a/wxPython/src/_statctrls.i
+++ b/wxPython/src/_statctrls.i
@@ -25,8 +25,8 @@ MAKE_CONST_WXSTRING(StaticTextNameStr);
 
 class wxStaticBox : public wxControl {
 public:
-    %addtofunc wxStaticBox         "self._setOORInfo(self)"
-    %addtofunc wxStaticBox()       ""
+    %pythonAppend wxStaticBox         "self._setOORInfo(self)"
+    %pythonAppend wxStaticBox()       ""
 
     wxStaticBox(wxWindow* parent, wxWindowID id, const wxString& label,
                 const wxPoint& pos = wxDefaultPosition,
@@ -49,8 +49,8 @@ public:
 
 class wxStaticLine : public wxControl {
 public:
-    %addtofunc wxStaticLine         "self._setOORInfo(self)"
-    %addtofunc wxStaticLine()       ""
+    %pythonAppend wxStaticLine         "self._setOORInfo(self)"
+    %pythonAppend wxStaticLine()       ""
 
     wxStaticLine( wxWindow *parent, wxWindowID id,
                   const wxPoint &pos = wxDefaultPosition,
@@ -79,8 +79,8 @@ public:
 
 class wxStaticText : public wxControl {
 public:
-    %addtofunc wxStaticText         "self._setOORInfo(self)"
-    %addtofunc wxStaticText()       ""
+    %pythonAppend wxStaticText         "self._setOORInfo(self)"
+    %pythonAppend wxStaticText()       ""
 
     wxStaticText(wxWindow* parent, wxWindowID id, const wxString& label,
                  const wxPoint& pos = wxDefaultPosition,
@@ -101,8 +101,8 @@ public:
 
 class wxStaticBitmap : public wxControl {
 public:
-    %addtofunc wxStaticText         "self._setOORInfo(self)"
-    %addtofunc wxStaticText()       ""
+    %pythonAppend wxStaticText         "self._setOORInfo(self)"
+    %pythonAppend wxStaticText()       ""
 
     wxStaticBitmap(wxWindow* parent, wxWindowID id,
                    const wxBitmap& bitmap,

diff --git a/wxPython/src/_statusbar.i b/wxPython/src/_statusbar.i
index 48ef90034fc0e40a5250ccaaa23405b99780e714..6888f583bde23ee23095407f1306746358cb4bdc 100644 (file)
--- a/wxPython/src/_statusbar.i
+++ b/wxPython/src/_statusbar.i
@@ -26,8 +26,8 @@
 class wxStatusBar : public wxWindow
 {
 public:
-    %addtofunc wxStatusBar         "self._setOORInfo(self)"
-    %addtofunc wxStatusBar()       ""
+    %pythonAppend wxStatusBar         "self._setOORInfo(self)"
+    %pythonAppend wxStatusBar()       ""
     
     wxStatusBar(wxWindow* parent, wxWindowID id = -1,
                 long style = wxST_SIZEGRIP,

diff --git a/wxPython/src/_stockobjs.i b/wxPython/src/_stockobjs.i
index 3abd60a2e25488e836250fd334aaa95bd915455a..12aa01349259a6e338a7b80ec3a77ca65c307db9 100644 (file)
--- a/wxPython/src/_stockobjs.i
+++ b/wxPython/src/_stockobjs.i
@@ -17,6 +17,63 @@
 %newgroup
 
 
+// See also wxPy_ReinitStockObjects in helpers.cpp
+%immutable;
+
+wxFont* const wxNORMAL_FONT;
+wxFont* const wxSMALL_FONT;
+wxFont* const wxITALIC_FONT;
+wxFont* const wxSWISS_FONT;
+
+wxPen* const wxRED_PEN;
+wxPen* const wxCYAN_PEN;
+wxPen* const wxGREEN_PEN;
+wxPen* const wxBLACK_PEN;
+wxPen* const wxWHITE_PEN;
+wxPen* const wxTRANSPARENT_PEN;
+wxPen* const wxBLACK_DASHED_PEN;
+wxPen* const wxGREY_PEN;
+wxPen* const wxMEDIUM_GREY_PEN;
+wxPen* const wxLIGHT_GREY_PEN;
+
+wxBrush* const wxBLUE_BRUSH;
+wxBrush* const wxGREEN_BRUSH;
+wxBrush* const wxWHITE_BRUSH;
+wxBrush* const wxBLACK_BRUSH;
+wxBrush* const wxTRANSPARENT_BRUSH;
+wxBrush* const wxCYAN_BRUSH;
+wxBrush* const wxRED_BRUSH;
+wxBrush* const wxGREY_BRUSH;
+wxBrush* const wxMEDIUM_GREY_BRUSH;
+wxBrush* const wxLIGHT_GREY_BRUSH;
+
+wxColour* const wxBLACK;
+wxColour* const wxWHITE;
+wxColour* const wxRED;
+wxColour* const wxBLUE;
+wxColour* const wxGREEN;
+wxColour* const wxCYAN;
+wxColour* const wxLIGHT_GREY;
+
+wxCursor* const wxSTANDARD_CURSOR;
+wxCursor* const wxHOURGLASS_CURSOR;
+wxCursor* const wxCROSS_CURSOR;
+
+
+const wxBitmap wxNullBitmap;
+const wxIcon   wxNullIcon;
+const wxCursor wxNullCursor;
+const wxPen    wxNullPen;
+const wxBrush  wxNullBrush;
+const wxPalette wxNullPalette;
+const wxFont   wxNullFont;
+const wxColour wxNullColour;
+
+%mutable;
+
+
+//---------------------------------------------------------------------------
+
 class wxPenList : public wxObject {
 public:
 
@@ -80,65 +137,10 @@ public:
 %newgroup
 
 
-// %typemap(varout) wxFont* {
-//     // my typemap
-//     $result = SWIG_NewPointerObj((void *) $1, $1_descriptor, 0);
-// }
-
 
 // See also wxPy_ReinitStockObjects in helpers.cpp
 %immutable;
 
-wxFont* const wxNORMAL_FONT;
-wxFont* const wxSMALL_FONT;
-wxFont* const wxITALIC_FONT;
-wxFont* const wxSWISS_FONT;
-
-wxPen* const wxRED_PEN;
-wxPen* const wxCYAN_PEN;
-wxPen* const wxGREEN_PEN;
-wxPen* const wxBLACK_PEN;
-wxPen* const wxWHITE_PEN;
-wxPen* const wxTRANSPARENT_PEN;
-wxPen* const wxBLACK_DASHED_PEN;
-wxPen* const wxGREY_PEN;
-wxPen* const wxMEDIUM_GREY_PEN;
-wxPen* const wxLIGHT_GREY_PEN;
-
-wxBrush* const wxBLUE_BRUSH;
-wxBrush* const wxGREEN_BRUSH;
-wxBrush* const wxWHITE_BRUSH;
-wxBrush* const wxBLACK_BRUSH;
-wxBrush* const wxTRANSPARENT_BRUSH;
-wxBrush* const wxCYAN_BRUSH;
-wxBrush* const wxRED_BRUSH;
-wxBrush* const wxGREY_BRUSH;
-wxBrush* const wxMEDIUM_GREY_BRUSH;
-wxBrush* const wxLIGHT_GREY_BRUSH;
-
-wxColour* const wxBLACK;
-wxColour* const wxWHITE;
-wxColour* const wxRED;
-wxColour* const wxBLUE;
-wxColour* const wxGREEN;
-wxColour* const wxCYAN;
-wxColour* const wxLIGHT_GREY;
-
-wxCursor* const wxSTANDARD_CURSOR;
-wxCursor* const wxHOURGLASS_CURSOR;
-wxCursor* const wxCROSS_CURSOR;
-
-
-const wxBitmap wxNullBitmap;
-const wxIcon   wxNullIcon;
-const wxCursor wxNullCursor;
-const wxPen    wxNullPen;
-const wxBrush  wxNullBrush;
-const wxPalette wxNullPalette;
-const wxFont   wxNullFont;
-const wxColour wxNullColour;
-
-
 wxFontList*       const wxTheFontList;
 wxPenList*        const wxThePenList;
 wxBrushList*      const wxTheBrushList;
@@ -149,3 +151,8 @@ wxColourDatabase* const wxTheColourDatabase;
 
 //---------------------------------------------------------------------------
  
+%pythoncode { NullColor = NullColour }
+
+
+
+

diff --git a/wxPython/src/_textctrl.i b/wxPython/src/_textctrl.i
index 3a36c5e3e505ed6b5d6dc4986f518722287c4b17..7ec0cae82938eac26da231eac367cff962edb71d 100644 (file)
--- a/wxPython/src/_textctrl.i
+++ b/wxPython/src/_textctrl.i
@@ -102,7 +102,8 @@ public:
                const wxColour& colBack = wxNullColour,
                const wxFont& font = wxNullFont,
                wxTextAttrAlignment alignment = wxTEXT_ALIGNMENT_DEFAULT);
-
+    ~wxTextAttr();
+    
     // operations
     void Init();
 
@@ -153,8 +154,8 @@ public:
 class wxTextCtrl : public wxControl
 {
 public:
-    %addtofunc wxTextCtrl         "self._setOORInfo(self)"
-    %addtofunc wxTextCtrl()       ""
+    %pythonAppend wxTextCtrl         "self._setOORInfo(self)"
+    %pythonAppend wxTextCtrl()       ""
 
     wxTextCtrl(wxWindow* parent, wxWindowID id,
                const wxString& value = wxPyEmptyString,

diff --git a/wxPython/src/_tglbtn.i b/wxPython/src/_tglbtn.i
index a0a755e0de6ea06286f4472de5043daefc669a88..cc36561c4e023d89b1dd5c66f1570297548a10a1 100644 (file)
--- a/wxPython/src/_tglbtn.i
+++ b/wxPython/src/_tglbtn.i
@@ -53,8 +53,8 @@ public:
 class wxToggleButton : public wxControl
 {
 public:
-    %addtofunc wxToggleButton         "self._setOORInfo(self)"
-    %addtofunc wxToggleButton()       ""
+    %pythonAppend wxToggleButton         "self._setOORInfo(self)"
+    %pythonAppend wxToggleButton()       ""
 
     wxToggleButton(wxWindow *parent,
                    wxWindowID id,

diff --git a/wxPython/src/_timer.i b/wxPython/src/_timer.i
index b0d2dae880ae5ba676648d729498096f93f695a2..a82aa5a626ca0f69accee8e6276b801d8681b1fa 100644 (file)
--- a/wxPython/src/_timer.i
+++ b/wxPython/src/_timer.i
@@ -40,7 +40,7 @@ IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify);
 %name(Timer) class wxPyTimer : public wxEvtHandler
 {
 public:
-    %addtofunc wxPyTimer         "self._setCallbackInfo(self, Timer)"
+    %pythonAppend wxPyTimer         "self._setCallbackInfo(self, Timer)"
 
     // if you don't call SetOwner() or provide an owner in the contstructor
     // then you must override Notify() inorder to receive the timer

diff --git a/wxPython/src/_tipwin.i b/wxPython/src/_tipwin.i
index cb9b94187975ab3bc900b3ade1fd3a0f2493806f..1cb3e5cc5e23184c0078a269d6bffb8983c30d86 100644 (file)
--- a/wxPython/src/_tipwin.i
+++ b/wxPython/src/_tipwin.i
@@ -31,7 +31,7 @@ class wxTipWindow :
 #endif
 {
 public:
-    %addtofunc wxTipWindow         "self._setOORInfo(self)"
+    %pythonAppend wxTipWindow         "self._setOORInfo(self)"
     
     %extend {
         wxTipWindow(wxWindow *parent,

diff --git a/wxPython/src/_toolbar.i b/wxPython/src/_toolbar.i
index f3779512632ff4825f2cd23fd81e694d41b4cd69..4286bb886f2c5d6a14a63b7960b18d6af521dcbb 100644 (file)
--- a/wxPython/src/_toolbar.i
+++ b/wxPython/src/_toolbar.i
@@ -386,8 +386,8 @@ public:
 
 class wxToolBar : public wxToolBarBase {
 public:
-    %addtofunc wxToolBar         "self._setOORInfo(self)"
-    %addtofunc wxToolBar()       ""
+    %pythonAppend wxToolBar         "self._setOORInfo(self)"
+    %pythonAppend wxToolBar()       ""
     
     wxToolBar(wxWindow *parent,
               wxWindowID id,

diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i
index 1e23183f42c341fcd94a70bd4b37da489e33281d..fc1f7a25a58b399846cf97054d853129b3acacd1 100644 (file)
--- a/wxPython/src/_toplvl.i
+++ b/wxPython/src/_toplvl.i
@@ -109,8 +109,8 @@ public:
 
 class wxFrame : public wxTopLevelWindow {
 public:
-    %addtofunc wxFrame         "self._setOORInfo(self)"
-    %addtofunc wxFrame()       ""
+    %pythonAppend wxFrame         "self._setOORInfo(self)"
+    %pythonAppend wxFrame()       ""
 
     wxFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
@@ -216,8 +216,8 @@ public:
 
 class wxDialog : public wxTopLevelWindow {
 public:
-    %addtofunc wxDialog   "self._setOORInfo(self)"
-    %addtofunc wxDialog() ""
+    %pythonAppend wxDialog   "self._setOORInfo(self)"
+    %pythonAppend wxDialog() ""
 
     wxDialog(wxWindow* parent,
              const wxWindowID id,
@@ -280,8 +280,8 @@ public:
 
 class wxMiniFrame : public wxFrame {
 public:
-    %addtofunc wxMiniFrame         "self._setOORInfo(self)"
-    %addtofunc wxMiniFrame()       ""
+    %pythonAppend wxMiniFrame         "self._setOORInfo(self)"
+    %pythonAppend wxMiniFrame()       ""
 
     wxMiniFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
                 const wxPoint& pos = wxDefaultPosition,
@@ -315,7 +315,7 @@ enum {
 class wxSplashScreenWindow: public wxWindow
 {
 public:
-    %addtofunc wxSplashScreenWindow         "self._setOORInfo(self)"
+    %pythonAppend wxSplashScreenWindow         "self._setOORInfo(self)"
 
     wxSplashScreenWindow(const wxBitmap& bitmap,
                          wxWindow* parent, wxWindowID id,
@@ -330,7 +330,7 @@ public:
 
 class wxSplashScreen : public wxFrame {
 public:
-    %addtofunc wxSplashScreen         "self._setOORInfo(self)"
+    %pythonAppend wxSplashScreen         "self._setOORInfo(self)"
 
     wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds,
                    wxWindow* parent, wxWindowID id,

diff --git a/wxPython/src/_treectrl.i b/wxPython/src/_treectrl.i
index 5bbec4256f57cbadf2d2466f508a339378564389..bf455ec4ae3f0a7dce7a279111fec19508f59d23 100644 (file)
--- a/wxPython/src/_treectrl.i
+++ b/wxPython/src/_treectrl.i
@@ -318,8 +318,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl);
  
 %name(TreeCtrl)class wxPyTreeCtrl : public wxControl {
 public:
-    %addtofunc wxPyTreeCtrl         "self._setOORInfo(self);self._setCallbackInfo(self, TreeCtrl)"
-    %addtofunc wxPyTreeCtrl()       ""
+    %pythonAppend wxPyTreeCtrl         "self._setOORInfo(self);self._setCallbackInfo(self, TreeCtrl)"
+    %pythonAppend wxPyTreeCtrl()       ""
    
     wxPyTreeCtrl(wxWindow *parent, wxWindowID id = -1,
                  const wxPoint& pos = wxDefaultPosition,

diff --git a/wxPython/src/_validator.i b/wxPython/src/_validator.i
index 10da1778a52ff7264bbe8453792aad88b254418a..2951244f365c354b9123e3da686fedfc82be83ed 100644 (file)
--- a/wxPython/src/_validator.i
+++ b/wxPython/src/_validator.i
@@ -32,7 +32,7 @@
 class wxValidator : public wxEvtHandler
 {
 public:
-    %addtofunc wxValidator "self._setOORInfo(self)"
+    %pythonAppend wxValidator "self._setOORInfo(self)"
     wxValidator();
     //~wxValidator();
 
@@ -73,7 +73,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPyValidator, wxValidator);
 
 class wxPyValidator : public wxValidator {
 public:
-    %addtofunc wxPyValidator "
+    %pythonAppend wxPyValidator "
         self._setCallbackInfo(self, PyValidator, 1)
         self._setOORInfo(self)"
     wxPyValidator();

diff --git a/wxPython/src/_vscroll.i b/wxPython/src/_vscroll.i
index 19a1a26d11eaa27f3ce838abcefc3100f2ee66c6..90b84d9012a60931e13b365f3bcd0ef2e79424c3 100644 (file)
--- a/wxPython/src/_vscroll.i
+++ b/wxPython/src/_vscroll.i
@@ -128,8 +128,8 @@ IMP_PYCALLBACK_COORD_const          (wxPyVScrolledWindow, wxVScrolledWindow, Est
 %name(VScrolledWindow) class wxPyVScrolledWindow : public wxPanel
 {
 public:
-    %addtofunc wxPyVScrolledWindow         "self._setOORInfo(self); self._setCallbackInfo(self, VScrolledWindow)"
-    %addtofunc wxPyVScrolledWindow()       ""
+    %pythonAppend wxPyVScrolledWindow         "self._setOORInfo(self); self._setCallbackInfo(self, VScrolledWindow)"
+    %pythonAppend wxPyVScrolledWindow()       ""
     
 
     wxPyVScrolledWindow(wxWindow *parent,
@@ -285,8 +285,8 @@ IMP_PYCALLBACK__DCRECTSIZET_const    (wxPyVListBox, wxVListBox, OnDrawBackground
 %name(VListBox) class wxPyVListBox : public wxPyVScrolledWindow
 {
 public:
-    %addtofunc wxPyVListBox         "self._setOORInfo(self);self._setCallbackInfo(self, VListBox)"
-    %addtofunc wxPyVListBox()       ""
+    %pythonAppend wxPyVListBox         "self._setOORInfo(self);self._setCallbackInfo(self, VListBox)"
+    %pythonAppend wxPyVListBox()       ""
     
 
     wxPyVListBox(wxWindow *parent,
@@ -481,8 +481,8 @@ IMP_PYCALLBACK_STRING_SIZET     (wxPyHtmlListBox, wxHtmlListBox, OnGetItemMarkup
 %name(HtmlListBox) class wxPyHtmlListBox : public wxPyVListBox
 {
 public:
-    %addtofunc wxPyHtmlListBox         "self._setOORInfo(self);self._setCallbackInfo(self, HtmlListBox)"
-    %addtofunc wxPyHtmlListBox()       ""
+    %pythonAppend wxPyHtmlListBox         "self._setOORInfo(self);self._setCallbackInfo(self, HtmlListBox)"
+    %pythonAppend wxPyHtmlListBox()       ""
     
 
     // normal constructor which calls Create() internally

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index 3ffc44537df66e10d274cd41973459318f1d7d96..d6d9ad156edbcccdd358f410b2a95c48bd906594 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -26,8 +26,8 @@ MAKE_CONST_WXSTRING(PanelNameStr);
 class wxWindow : public wxEvtHandler
 {
 public:
-    %addtofunc wxWindow         "self._setOORInfo(self)"
-    %addtofunc wxWindow()       ""
+    %pythonAppend wxWindow         "self._setOORInfo(self)"
+    %pythonAppend wxWindow()       ""
 
     wxWindow(wxWindow* parent, const wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,

diff --git a/wxPython/src/calendar.i b/wxPython/src/calendar.i
index df3df17bc93265ee09a410c2e670f9c2346b4a92..c86759672171dbc5e9e56ed54d6b8e25ec187c93 100644 (file)
--- a/wxPython/src/calendar.i
+++ b/wxPython/src/calendar.i
@@ -143,8 +143,8 @@ MAKE_CONST_WXSTRING(CalendarNameStr);
 class wxCalendarCtrl : public wxControl
 {
 public:
-    %addtofunc wxCalendarCtrl      "self._setOORInfo(self)"
-    %addtofunc wxCalendarCtrl()    ""
+    %pythonAppend wxCalendarCtrl      "self._setOORInfo(self)"
+    %pythonAppend wxCalendarCtrl()    ""
 
     wxCalendarCtrl(wxWindow *parent,
                    wxWindowID id,

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index cebed93efa21a7d169a702f07617d6adbba83573..c4adcb1b93ee4386bdbba3f465bf7b2d0a587f81 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -649,7 +649,7 @@ IMP_PYCALLBACK__STRING( wxPyGridCellRenderer, wxGridCellRenderer, SetParameters)
 // Let SWIG know about it so it can create the Python version
 class wxPyGridCellRenderer : public wxGridCellRenderer {
 public:
-    %addtofunc wxPyGridCellRenderer  "self._setCallbackInfo(self, PyGridCellRenderer);self._setOORInfo(self)"
+    %pythonAppend wxPyGridCellRenderer  "self._setCallbackInfo(self, PyGridCellRenderer);self._setOORInfo(self)"
 
     wxPyGridCellRenderer();
     void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -663,7 +663,7 @@ public:
 class wxGridCellStringRenderer : public wxGridCellRenderer
 {
 public:
-    %addtofunc wxGridCellStringRenderer "self._setOORInfo(self)"
+    %pythonAppend wxGridCellStringRenderer "self._setOORInfo(self)"
     wxGridCellStringRenderer();
 };
 
@@ -671,7 +671,7 @@ public:
 class  wxGridCellNumberRenderer : public wxGridCellStringRenderer
 {
 public:
-    %addtofunc wxGridCellNumberRenderer "self._setOORInfo(self)"
+    %pythonAppend wxGridCellNumberRenderer "self._setOORInfo(self)"
     wxGridCellNumberRenderer();
 };
 
@@ -679,7 +679,7 @@ public:
 class  wxGridCellFloatRenderer : public wxGridCellStringRenderer
 {
 public:
-    %addtofunc wxGridCellFloatRenderer "self._setOORInfo(self)"
+    %pythonAppend wxGridCellFloatRenderer "self._setOORInfo(self)"
     wxGridCellFloatRenderer(int width = -1, int precision = -1);
 
     int GetWidth() const;
@@ -692,7 +692,7 @@ public:
 class  wxGridCellBoolRenderer : public wxGridCellRenderer
 {
 public:
-    %addtofunc wxGridCellBoolRenderer "self._setOORInfo(self)"
+    %pythonAppend wxGridCellBoolRenderer "self._setOORInfo(self)"
     wxGridCellBoolRenderer();
 };
 
@@ -700,7 +700,7 @@ public:
 class wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
 {
 public:
-    %addtofunc wxGridCellDateTimeRenderer "self._setOORInfo(self)"
+    %pythonAppend wxGridCellDateTimeRenderer "self._setOORInfo(self)"
     wxGridCellDateTimeRenderer(wxString outformat = wxPyDateTimeFormatStr,
                                wxString informat =  wxPyDateTimeFormatStr);
 };
@@ -709,7 +709,7 @@ public:
 class wxGridCellEnumRenderer : public wxGridCellStringRenderer
 {
 public:
-    %addtofunc wxGridCellEnumRenderer "self._setOORInfo(self)"
+    %pythonAppend wxGridCellEnumRenderer "self._setOORInfo(self)"
     wxGridCellEnumRenderer( const wxString& choices = wxPyEmptyString );
 };
 
@@ -717,7 +717,7 @@ public:
 class wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
 {
 public:
-    %addtofunc wxGridCellAutoWrapStringRenderer "self._setOORInfo(self)"
+    %pythonAppend wxGridCellAutoWrapStringRenderer "self._setOORInfo(self)"
     wxGridCellAutoWrapStringRenderer();
 };
 
@@ -897,7 +897,7 @@ IMP_PYCALLBACK_STRING__constpure(wxPyGridCellEditor, wxGridCellEditor, GetValue)
 // Let SWIG know about it so it can create the Python version
 class wxPyGridCellEditor : public wxGridCellEditor {
 public:
-    %addtofunc wxPyGridCellEditor  "self._setCallbackInfo(self, PyGridCellEditor);self._setOORInfo(self)"
+    %pythonAppend wxPyGridCellEditor  "self._setCallbackInfo(self, PyGridCellEditor);self._setOORInfo(self)"
     
     wxPyGridCellEditor();
     void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -919,7 +919,7 @@ public:
 class wxGridCellTextEditor : public wxGridCellEditor
 {
 public:
-    %addtofunc wxGridCellTextEditor  "self._setOORInfo(self)"
+    %pythonAppend wxGridCellTextEditor  "self._setOORInfo(self)"
     wxGridCellTextEditor();
     virtual wxString GetValue();
 };
@@ -928,7 +928,7 @@ public:
 class wxGridCellNumberEditor : public wxGridCellTextEditor
 {
 public:
-    %addtofunc wxGridCellNumberEditor  "self._setOORInfo(self)"
+    %pythonAppend wxGridCellNumberEditor  "self._setOORInfo(self)"
     wxGridCellNumberEditor(int min = -1, int max = -1);
     virtual wxString GetValue();
 };
@@ -937,7 +937,7 @@ public:
 class wxGridCellFloatEditor : public wxGridCellTextEditor
 {
 public:
-    %addtofunc wxGridCellFloatEditor  "self._setOORInfo(self)"
+    %pythonAppend wxGridCellFloatEditor  "self._setOORInfo(self)"
     wxGridCellFloatEditor();
     virtual wxString GetValue();
 };
@@ -946,7 +946,7 @@ public:
 class wxGridCellBoolEditor : public wxGridCellEditor
 {
 public:
-    %addtofunc wxGridCellBoolEditor  "self._setOORInfo(self)"
+    %pythonAppend wxGridCellBoolEditor  "self._setOORInfo(self)"
     wxGridCellBoolEditor();
     virtual wxString GetValue();
 };
@@ -954,7 +954,7 @@ public:
 class wxGridCellChoiceEditor : public wxGridCellEditor
 {
 public:
-    %addtofunc wxGridCellChoiceEditor  "self._setOORInfo(self)"
+    %pythonAppend wxGridCellChoiceEditor  "self._setOORInfo(self)"
     wxGridCellChoiceEditor(int choices = 0,
                            const wxString* choices_array = NULL,
                            bool allowOthers = False);
@@ -965,7 +965,7 @@ public:
 class wxGridCellEnumEditor : public wxGridCellChoiceEditor
 {
 public:
-    %addtofunc wxGridCellEnumEditor  "self._setOORInfo(self)"
+    %pythonAppend wxGridCellEnumEditor  "self._setOORInfo(self)"
     wxGridCellEnumEditor( const wxString& choices = wxPyEmptyString );
     virtual wxString GetValue();
 };
@@ -974,7 +974,7 @@ public:
 class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
 {
 public:
-    %addtofunc wxGridCellAutoWrapStringEditor  "self._setOORInfo(self)"
+    %pythonAppend wxGridCellAutoWrapStringEditor  "self._setOORInfo(self)"
     wxGridCellAutoWrapStringEditor();
     virtual wxString GetValue();
 };
@@ -1003,7 +1003,7 @@ public:
         }
     }
     
-    %addtofunc wxGridCellAttr  "self._setOORInfo(self)"
+    %pythonAppend wxGridCellAttr  "self._setOORInfo(self)"
 
     wxGridCellAttr(wxGridCellAttr *attrDefault = NULL);
 
@@ -1057,7 +1057,7 @@ public:
 class wxGridCellAttrProvider
 {
 public:
-    %addtofunc wxGridCellAttrProvider "self._setOORInfo(self)"
+    %pythonAppend wxGridCellAttrProvider "self._setOORInfo(self)"
     wxGridCellAttrProvider();
     // ???? virtual ~wxGridCellAttrProvider();
 
@@ -1100,7 +1100,7 @@ public:
 class wxPyGridCellAttrProvider : public wxGridCellAttrProvider
 {
 public:
-    %addtofunc wxPyGridCellAttrProvider  "self._setCallbackInfo(self, PyGridCellAttrProvider)"
+    %pythonAppend wxPyGridCellAttrProvider  "self._setCallbackInfo(self, PyGridCellAttrProvider)"
     wxPyGridCellAttrProvider();
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
@@ -1314,7 +1314,7 @@ public:
 class wxPyGridTableBase : public wxGridTableBase
 {
 public:
-    %addtofunc wxPyGridTableBase "self._setCallbackInfo(self, PyGridTableBase);self._setOORInfo(self)"
+    %pythonAppend wxPyGridTableBase "self._setCallbackInfo(self, PyGridTableBase);self._setOORInfo(self)"
     wxPyGridTableBase();
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
@@ -1349,7 +1349,7 @@ public:
 class  wxGridStringTable : public wxGridTableBase
 {
 public:
-    %addtofunc wxGridStringTable "self._setOORInfo(self)"
+    %pythonAppend wxGridStringTable "self._setOORInfo(self)"
     wxGridStringTable( int numRows=0, int numCols=0 );
 };
 
@@ -1533,7 +1533,7 @@ typedef wxGrid::wxGridSelectionModes WXGRIDSELECTIONMODES;
 class wxGrid : public wxScrolledWindow
 {
 public:
-    %addtofunc wxGrid "self._setOORInfo(self)"
+    %pythonAppend wxGrid "self._setOORInfo(self)"
 
     wxGrid( wxWindow *parent,
             wxWindowID id,

diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index 5c2e764a1f5dae54f3284e21dba195868135e19f..868249905725685bfe39c43fef5e81ece61c7787 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -249,7 +249,7 @@ IMP_PYCALLBACK_BOOL_TAG_pure(wxPyHtmlTagHandler, wxHtmlTagHandler, HandleTag);
 
 %name(HtmlTagHandler) class wxPyHtmlTagHandler : public wxObject {
 public:
-    %addtofunc wxPyHtmlTagHandler   "self._setCallbackInfo(self, HtmlTagHandler)"    
+    %pythonAppend wxPyHtmlTagHandler   "self._setCallbackInfo(self, HtmlTagHandler)"    
     wxPyHtmlTagHandler();
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -287,7 +287,7 @@ IMP_PYCALLBACK_BOOL_TAG_pure(wxPyHtmlWinTagHandler, wxHtmlWinTagHandler, HandleT
 
 %name(HtmlWinTagHandler) class wxPyHtmlWinTagHandler : public wxPyHtmlTagHandler {
 public:
-    %addtofunc wxPyHtmlWinTagHandler    "self._setCallbackInfo(self, HtmlWinTagHandler)"
+    %pythonAppend wxPyHtmlWinTagHandler    "self._setCallbackInfo(self, HtmlWinTagHandler)"
     wxPyHtmlWinTagHandler();
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -667,7 +667,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyHtmlFilter, wxHtmlFilter);
 
 %name(HtmlFilter) class wxPyHtmlFilter : public wxObject {
 public:
-    %addtofunc wxPyHtmlFilter   "self._setCallbackInfo(self, HtmlFilter)"
+    %pythonAppend wxPyHtmlFilter   "self._setCallbackInfo(self, HtmlFilter)"
     wxPyHtmlFilter();
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -778,8 +778,8 @@ wxHtmlOpeningStatus wxPyHtmlWindow::OnOpeningURL(wxHtmlURLType type,
 
 %name(HtmlWindow) class wxPyHtmlWindow : public wxScrolledWindow {
 public:
-    %addtofunc wxPyHtmlWindow      "self._setCallbackInfo(self, HtmlWindow); self._setOORInfo(self)"
-    %addtofunc wxPyHtmlWindow()    ""
+    %pythonAppend wxPyHtmlWindow      "self._setCallbackInfo(self, HtmlWindow); self._setOORInfo(self)"
+    %pythonAppend wxPyHtmlWindow()    ""
     
     wxPyHtmlWindow(wxWindow *parent, int id = -1,
                  const wxPoint& pos = wxDefaultPosition,
@@ -1087,7 +1087,7 @@ public:
 
 class wxHtmlHelpFrame : public wxFrame {
 public:
-    %addtofunc wxHtmlHelpFrame    "self._setOORInfo(self)"
+    %pythonAppend wxHtmlHelpFrame    "self._setOORInfo(self)"
     
     wxHtmlHelpFrame(wxWindow* parent, int wxWindowID,
                    const wxString& title = wxPyEmptyString,
@@ -1124,7 +1124,7 @@ enum {
 
 class wxHtmlHelpController : public wxEvtHandler {
 public:
-    %addtofunc wxHtmlHelpController "self._setOORInfo(self)"
+    %pythonAppend wxHtmlHelpController "self._setOORInfo(self)"
     
     wxHtmlHelpController(int style = wxHF_DEFAULTSTYLE);
     ~wxHtmlHelpController();

diff --git a/wxPython/src/wizard.i b/wxPython/src/wizard.i
index 0eac0cdb21aba6cf7ae3885c671ac56d72e29f1b..542abb0b85b7cda4c27ee2073675e485f047c646 100644 (file)
--- a/wxPython/src/wizard.i
+++ b/wxPython/src/wizard.i
@@ -196,8 +196,8 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyWizardPage, wxWizardPage, RemoveChild);
 class wxPyWizardPage : public wxWizardPage {
 public:
 
-    %addtofunc wxPyWizardPage   "self._setCallbackInfo(self, PyWizardPage);self._setOORInfo(self)"
-    %addtofunc wxPyWizardPage() ""
+    %pythonAppend wxPyWizardPage   "self._setCallbackInfo(self, PyWizardPage);self._setOORInfo(self)"
+    %pythonAppend wxPyWizardPage() ""
     
     // ctor accepts an optional bitmap which will be used for this page instead
     // of the default one for this wizard (should be of the same size). Notice
@@ -274,8 +274,8 @@ class wxWizardPageSimple : public wxWizardPage
 {
 public:
 
-    %addtofunc wxWizardPageSimple   "self._setOORInfo(self)"
-    %addtofunc wxWizardPageSimple() ""
+    %pythonAppend wxWizardPageSimple   "self._setOORInfo(self)"
+    %pythonAppend wxWizardPageSimple() ""
     
     // ctor takes the previous and next pages
     wxWizardPageSimple(wxWizard *parent,
@@ -305,8 +305,8 @@ public:
 class  wxWizard : public wxDialog
 {
 public:
-    %addtofunc wxWizard   "self._setOORInfo(self)"
-    %addtofunc wxWizard() ""
+    %pythonAppend wxWizard   "self._setOORInfo(self)"
+    %pythonAppend wxWizard() ""
     
     // ctor
     wxWizard(wxWindow *parent,