Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

%addtofunc --> %pythonAppend

Browse Source 
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
This commit is contained in:
Robin Dunn
2004-01-31 01:18:37 +00:00
parent d7f8258414
commit 2b9048c56f
65 changed files with 313 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
wxPython/contrib/gizmos/gizmos.i
View File

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

4
wxPython/contrib/glcanvas/glcanvas.i
View File

@@ -116,7 +116,7 @@ enum {
class wxGLCanvas : public wxWindow { class wxGLCanvas : public wxWindow {
public: public:
%addtofunc wxGLCanvas "self._setOORInfo(self)" %pythonAppend wxGLCanvas "self._setOORInfo(self)"
wxGLCanvas(wxWindow *parent, wxWindowID id = -1, wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
@@ -124,7 +124,7 @@ public:
int *attribList = NULL, int *attribList = NULL,
const wxPalette& palette = wxNullPalette); const wxPalette& palette = wxNullPalette);
%addtofunc wxGLCanvas "val._setOORInfo(val)" %pythonAppend wxGLCanvas "val._setOORInfo(val)"
%name(GLCanvasWithContext) %name(GLCanvasWithContext)
wxGLCanvas( wxWindow *parent, wxGLCanvas( wxWindow *parent,
const wxGLContext *shared = NULL, const wxGLContext *shared = NULL,

2
wxPython/contrib/iewin/iewin.i
View File

@@ -75,7 +75,7 @@ enum wxIEHtmlRefreshLevel {
class wxIEHtmlWin : public wxWindow /* wxActiveX */ class wxIEHtmlWin : public wxWindow /* wxActiveX */
{ {
public: public:
%addtofunc wxIEHtmlWin "self._setOORInfo(self)" %pythonAppend wxIEHtmlWin "self._setOORInfo(self)"
wxIEHtmlWin(wxWindow * parent, wxWindowID id = -1, wxIEHtmlWin(wxWindow * parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,

4
wxPython/contrib/ogl/_oglbasic.i
View File

@@ -81,7 +81,7 @@ public:
class wxPyShapeEvtHandler : public wxObject { class wxPyShapeEvtHandler : public wxObject {
public: public:
%addtofunc wxPyShapeEvtHandler "self._setOORandCallbackInfo(PyShapeEvtHandler)" %pythonAppend wxPyShapeEvtHandler "self._setOORandCallbackInfo(PyShapeEvtHandler)"
wxPyShapeEvtHandler(wxPyShapeEvtHandler *prev = NULL, wxPyShapeEvtHandler(wxPyShapeEvtHandler *prev = NULL,
wxPyShape *shape = NULL); wxPyShape *shape = NULL);
@@ -145,7 +145,7 @@ public:
class wxPyShape : public wxPyShapeEvtHandler { class wxPyShape : public wxPyShapeEvtHandler {
public: public:
%addtofunc wxPyShape "self._setOORandCallbackInfo(PyShapeEvtHandler)" %pythonAppend wxPyShape "self._setOORandCallbackInfo(PyShapeEvtHandler)"
wxPyShape(wxPyShapeCanvas *can = NULL); wxPyShape(wxPyShapeCanvas *can = NULL);

2
wxPython/contrib/ogl/_oglcanvas.i
View File

@@ -101,7 +101,7 @@ public:
class wxPyShapeCanvas : public wxScrolledWindow { class wxPyShapeCanvas : public wxScrolledWindow {
public: public:
%addtofunc wxPyShapeEvtHandler "self._setOORandCallbackInfo(PyShapeEvtHandler)" %pythonAppend wxPyShapeEvtHandler "self._setOORandCallbackInfo(PyShapeEvtHandler)"
wxPyShapeCanvas(wxWindow* parent = NULL, wxWindowID id = -1, wxPyShapeCanvas(wxWindow* parent = NULL, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,

14
wxPython/contrib/ogl/_oglshapes.i
View File

@@ -124,7 +124,7 @@ public:
class wxPyRectangleShape : public wxPyShape { class wxPyRectangleShape : public wxPyShape {
public: public:
%addtofunc wxPyRectangleShape "self._setOORandCallbackInfo(PyRectangleShape)" %pythonAppend wxPyRectangleShape "self._setOORandCallbackInfo(PyRectangleShape)"
wxPyRectangleShape(double width = 0.0, double height = 0.0); wxPyRectangleShape(double width = 0.0, double height = 0.0);
void _setCallbackInfo(PyObject* self, PyObject* _class); void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -172,7 +172,7 @@ public:
class wxPyControlPoint : public wxPyRectangleShape { class wxPyControlPoint : public wxPyRectangleShape {
public: public:
%addtofunc wxPyControlPoint "self._setOORandCallbackInfo(PyControlPoint)" %pythonAppend wxPyControlPoint "self._setOORandCallbackInfo(PyControlPoint)"
wxPyControlPoint(wxPyShapeCanvas *the_canvas = NULL, wxPyControlPoint(wxPyShapeCanvas *the_canvas = NULL,
wxPyShape *object = NULL, wxPyShape *object = NULL,
@@ -223,7 +223,7 @@ public:
class wxPyBitmapShape : public wxPyRectangleShape { class wxPyBitmapShape : public wxPyRectangleShape {
public: public:
%addtofunc wxPyBitmapShape "self._setOORandCallbackInfo(PyBitmapShape)" %pythonAppend wxPyBitmapShape "self._setOORandCallbackInfo(PyBitmapShape)"
wxPyBitmapShape(); wxPyBitmapShape();
@@ -273,7 +273,7 @@ public:
class wxPyDrawnShape : public wxPyRectangleShape { class wxPyDrawnShape : public wxPyRectangleShape {
public: public:
%addtofunc wxPyDrawnShape "self._setOORandCallbackInfo(PyDrawnShape)" %pythonAppend wxPyDrawnShape "self._setOORandCallbackInfo(PyDrawnShape)"
wxPyDrawnShape(); wxPyDrawnShape();
@@ -378,7 +378,7 @@ public:
class wxPyCompositeShape : public wxPyRectangleShape { class wxPyCompositeShape : public wxPyRectangleShape {
public: public:
%addtofunc wxPyCompositeShape "self._setOORandCallbackInfo(PyCompositeShape)" %pythonAppend wxPyCompositeShape "self._setOORandCallbackInfo(PyCompositeShape)"
wxPyCompositeShape(); wxPyCompositeShape();
@@ -476,7 +476,7 @@ public:
class wxPyDividedShape : public wxPyRectangleShape { class wxPyDividedShape : public wxPyRectangleShape {
public: public:
%addtofunc wxPyDividedShape "self._setOORandCallbackInfo(PyDividedShape)" %pythonAppend wxPyDividedShape "self._setOORandCallbackInfo(PyDividedShape)"
wxPyDividedShape(double width = 0.0, double height = 0.0); wxPyDividedShape(double width = 0.0, double height = 0.0);
@@ -526,7 +526,7 @@ public:
class wxPyDivisionShape : public wxPyCompositeShape { class wxPyDivisionShape : public wxPyCompositeShape {
public: public:
%addtofunc wxPyDivisionShape "self._setOORandCallbackInfo(PyDivisionShape)" %pythonAppend wxPyDivisionShape "self._setOORandCallbackInfo(PyDivisionShape)"
wxPyDivisionShape(); wxPyDivisionShape();

10
wxPython/contrib/ogl/_oglshapes2.i
View File

@@ -22,7 +22,7 @@
class wxPyEllipseShape : public wxPyShape { class wxPyEllipseShape : public wxPyShape {
public: public:
%addtofunc wxPyEllipseShape "self._setOORandCallbackInfo(PyEllipseShape)" %pythonAppend wxPyEllipseShape "self._setOORandCallbackInfo(PyEllipseShape)"
wxPyEllipseShape(double width = 0.0, double height = 0.0); wxPyEllipseShape(double width = 0.0, double height = 0.0);
@@ -66,7 +66,7 @@ public:
class wxPyCircleShape : public wxPyEllipseShape { class wxPyCircleShape : public wxPyEllipseShape {
public: public:
%addtofunc wxPyCircleShape "self._setOORandCallbackInfo(PyCircleShape)" %pythonAppend wxPyCircleShape "self._setOORandCallbackInfo(PyCircleShape)"
wxPyCircleShape(double width = 0.0); wxPyCircleShape(double width = 0.0);
@@ -141,7 +141,7 @@ public:
class wxPyLineShape : public wxPyShape { class wxPyLineShape : public wxPyShape {
public: public:
%addtofunc wxPyLineShape "self._setOORandCallbackInfo(PyLineShape)" %pythonAppend wxPyLineShape "self._setOORandCallbackInfo(PyLineShape)"
wxPyLineShape(); wxPyLineShape();
@@ -254,7 +254,7 @@ public:
class wxPyPolygonShape : public wxPyShape { class wxPyPolygonShape : public wxPyShape {
public: public:
%addtofunc wxPyPolygonShape "self._setOORandCallbackInfo(PyPolygonShape)" %pythonAppend wxPyPolygonShape "self._setOORandCallbackInfo(PyPolygonShape)"
wxPyPolygonShape(); wxPyPolygonShape();
@@ -364,7 +364,7 @@ public:
class wxPyTextShape : public wxPyRectangleShape { class wxPyTextShape : public wxPyRectangleShape {
public: public:
%addtofunc wxPyTextShape "self._setOORandCallbackInfo(PyTextShape)" %pythonAppend wxPyTextShape "self._setOORandCallbackInfo(PyTextShape)"
wxPyTextShape(double width = 0.0, double height = 0.0); wxPyTextShape(double width = 0.0, double height = 0.0);

2
wxPython/contrib/xrc/_xmlhandler.i
View File

@@ -140,7 +140,7 @@ IMP_PYCALLBACK_BOOL_NODE_pure(wxPyXmlResourceHandler, wxXmlResourceHandler, CanH
%name(XmlResourceHandler) class wxPyXmlResourceHandler : public wxObject { %name(XmlResourceHandler) class wxPyXmlResourceHandler : public wxObject {
public: public:
%addtofunc wxPyXmlResourceHandler "self._setCallbackInfo(self, XmlResourceHandler)" %pythonAppend wxPyXmlResourceHandler "self._setCallbackInfo(self, XmlResourceHandler)"
wxPyXmlResourceHandler() : wxXmlResourceHandler() {} wxPyXmlResourceHandler() : wxXmlResourceHandler() {}
//~wxPyXmlResourceHandler(); //~wxPyXmlResourceHandler();

4
wxPython/contrib/xrc/_xmlres.i
View File

@@ -44,9 +44,9 @@ class wxXmlResource : public wxObject
{ {
public: 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. // Ctors.
// Flags: wxXRC_USE_LOCALE // Flags: wxXRC_USE_LOCALE

2
wxPython/contrib/xrc/_xmlsub.i
View File

@@ -34,7 +34,7 @@ IMP_PYCALLBACK_OBJECT_STRING_pure(wxPyXmlSubclassFactory, wxXmlSubclassFactory,
%name(XmlSubclassFactory)class wxPyXmlSubclassFactory { %name(XmlSubclassFactory)class wxPyXmlSubclassFactory {
public: public:
%addtofunc wxPyXmlSubclassFactory "self._setCallbackInfo(self, XmlSubclassFactory)" %pythonAppend wxPyXmlSubclassFactory "self._setCallbackInfo(self, XmlSubclassFactory)"
wxPyXmlSubclassFactory(); wxPyXmlSubclassFactory();
void _setCallbackInfo(PyObject* self, PyObject* _class); void _setCallbackInfo(PyObject* self, PyObject* _class);
}; };

2
wxPython/src/_app.i
View File

@@ -44,7 +44,7 @@ enum
class wxPyApp : public wxEvtHandler { class wxPyApp : public wxEvtHandler {
public: public:
%addtofunc wxPyApp %pythonAppend wxPyApp
"self._setCallbackInfo(self, PyApp) "self._setCallbackInfo(self, PyApp)
self._setOORInfo(self)"; self._setOORInfo(self)";

2
wxPython/src/_artprov.i
View File

@@ -106,7 +106,7 @@ public:
{ {
public: public:
%addtofunc wxPyArtProvider "self._setCallbackInfo(self, ArtProvider)" %pythonAppend wxPyArtProvider "self._setCallbackInfo(self, ArtProvider)"
wxPyArtProvider(); wxPyArtProvider();
void _setCallbackInfo(PyObject* self, PyObject* _class); void _setCallbackInfo(PyObject* self, PyObject* _class);

8
wxPython/src/_button.i
View File

@@ -51,8 +51,8 @@ RefDoc(wxButton, "
class wxButton : public wxControl class wxButton : public wxControl
{ {
public: public:
%addtofunc wxButton "self._setOORInfo(self)" %pythonAppend wxButton "self._setOORInfo(self)"
%addtofunc wxButton() "" %pythonAppend wxButton() ""
DocStr(wxButton, "Create and show a button."); DocStr(wxButton, "Create and show a button.");
@@ -102,8 +102,8 @@ DocStr(wxBitmapButton, "A Buttont that contains a bitmap.");
class wxBitmapButton : public wxButton class wxBitmapButton : public wxButton
{ {
public: public:
%addtofunc wxBitmapButton "self._setOORInfo(self)" %pythonAppend wxBitmapButton "self._setOORInfo(self)"
%addtofunc wxBitmapButton() "" %pythonAppend wxBitmapButton() ""
DocStr(wxBitmapButton, "Create and show a button.") DocStr(wxBitmapButton, "Create and show a button.")
wxBitmapButton(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap, wxBitmapButton(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap,

4
wxPython/src/_checkbox.i
View File

@@ -47,8 +47,8 @@ enum wxCheckBoxState
class wxCheckBox : public wxControl class wxCheckBox : public wxControl
{ {
public: public:
%addtofunc wxCheckBox "self._setOORInfo(self)" %pythonAppend wxCheckBox "self._setOORInfo(self)"
%addtofunc wxCheckBox() "" %pythonAppend wxCheckBox() ""
wxCheckBox(wxWindow* parent, wxWindowID id, const wxString& label, wxCheckBox(wxWindow* parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,

4
wxPython/src/_choice.i
View File

@@ -24,8 +24,8 @@ MAKE_CONST_WXSTRING(ChoiceNameStr);
class wxChoice : public wxControlWithItems class wxChoice : public wxControlWithItems
{ {
public: public:
%addtofunc wxChoice "self._setOORInfo(self)" %pythonAppend wxChoice "self._setOORInfo(self)"
%addtofunc wxChoice() "" %pythonAppend wxChoice() ""
wxChoice(wxWindow *parent, wxWindowID id, wxChoice(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,

22
wxPython/src/_cmndlgs.i
View File

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

9
wxPython/src/_colour.i
View File

@@ -82,10 +82,11 @@ public:
} }
}; };
// %pythoncode { %pythoncode {
// Color = Colour Color = Colour
// NamedColor = NamedColour NamedColor = NamedColour
// } ColorRGB = ColourRGB
}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

4
wxPython/src/_combobox.i
View File

@@ -28,8 +28,8 @@ class wxComboBox : public wxControl, public wxItemContainer
#endif #endif
{ {
public: public:
%addtofunc wxComboBox "self._setOORInfo(self)" %pythonAppend wxComboBox "self._setOORInfo(self)"
%addtofunc wxComboBox() "" %pythonAppend wxComboBox() ""
wxComboBox(wxWindow* parent, wxWindowID id, wxComboBox(wxWindow* parent, wxWindowID id,
const wxString& value = wxPyEmptyString, const wxString& value = wxPyEmptyString,

4
wxPython/src/_control.i
View File

@@ -28,8 +28,8 @@ MAKE_CONST_WXSTRING(ControlNameStr);
class wxControl : public wxWindow class wxControl : public wxWindow
{ {
public: public:
%addtofunc wxControl "self._setOORInfo(self)" %pythonAppend wxControl "self._setOORInfo(self)"
%addtofunc wxControl() "" %pythonAppend wxControl() ""
wxControl(wxWindow *parent, wxControl(wxWindow *parent,
wxWindowID id, wxWindowID id,

2
wxPython/src/_cshelp.i
View File

@@ -75,7 +75,7 @@ public:
class wxContextHelpButton : public wxBitmapButton { class wxContextHelpButton : public wxBitmapButton {
public: public:
%addtofunc wxContextHelpButton "self._setOORInfo(self)" %pythonAppend wxContextHelpButton "self._setOORInfo(self)"
wxContextHelpButton(wxWindow* parent, wxWindowID id = wxID_CONTEXT_HELP, wxContextHelpButton(wxWindow* parent, wxWindowID id = wxID_CONTEXT_HELP,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,

6
wxPython/src/_dataobj.i
View File

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

4
wxPython/src/_dc.i
View File

@@ -558,9 +558,9 @@ public:
class wxBufferedDC : public wxMemoryDC class wxBufferedDC : public wxMemoryDC
{ {
public: 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"; "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"; "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. // Construct a wxBufferedDC using a user supplied buffer.

9
wxPython/src/_defs.i
View File

@@ -40,13 +40,14 @@ typedef unsigned char byte;
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Various SWIG macros and such // Various SWIG macros and such
#define %addtofunc %feature("addtofunc") #define %pythonAppend %feature("pythonappend")
#define %pythonPrepend %feature("pythonprepend")
#define %kwargs %feature("kwargs") #define %kwargs %feature("kwargs")
#define %nokwargs %feature("nokwargs") #define %nokwargs %feature("nokwargs")
#ifndef %shadow //#ifndef %shadow
#define %shadow %insert("shadow") //#define %shadow %insert("shadow")
#endif //#endif
#ifndef %pythoncode #ifndef %pythoncode
#define %pythoncode %insert("python") #define %pythoncode %insert("python")

8
wxPython/src/_dirctrl.i
View File

@@ -57,8 +57,8 @@ public:
class wxGenericDirCtrl: public wxControl class wxGenericDirCtrl: public wxControl
{ {
public: public:
%addtofunc wxGenericDirCtrl "self._setOORInfo(self)" %pythonAppend wxGenericDirCtrl "self._setOORInfo(self)"
%addtofunc wxGenericDirCtrl() "" %pythonAppend wxGenericDirCtrl() ""
wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = -1, wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = -1,
const wxString& dir = wxPyDirDialogDefaultFolderStr, const wxString& dir = wxPyDirDialogDefaultFolderStr,
@@ -137,8 +137,8 @@ public:
class wxDirFilterListCtrl: public wxChoice class wxDirFilterListCtrl: public wxChoice
{ {
public: public:
%addtofunc wxDirFilterListCtrl "self._setOORInfo(self)" %pythonAppend wxDirFilterListCtrl "self._setOORInfo(self)"
%addtofunc wxDirFilterListCtrl() "" %pythonAppend wxDirFilterListCtrl() ""
wxDirFilterListCtrl(wxGenericDirCtrl* parent, const wxWindowID id = -1, wxDirFilterListCtrl(wxGenericDirCtrl* parent, const wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,

6
wxPython/src/_dnd.i
View File

@@ -118,7 +118,7 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyDropTarget, wxDropTarget, OnDrop);
%name(DropTarget) class wxPyDropTarget // : public wxDropTarget %name(DropTarget) class wxPyDropTarget // : public wxDropTarget
{ {
public: public:
%addtofunc wxPyDropTarget %pythonAppend wxPyDropTarget
"self._setCallbackInfo(self, DropTarget)" "self._setCallbackInfo(self, DropTarget)"
%apply SWIGTYPE *DISOWN { wxDataObject *dataObject }; %apply SWIGTYPE *DISOWN { wxDataObject *dataObject };
@@ -180,7 +180,7 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyTextDropTarget, wxTextDropTarget, OnDrop);
%name(TextDropTarget) class wxPyTextDropTarget : public wxPyDropTarget { %name(TextDropTarget) class wxPyTextDropTarget : public wxPyDropTarget {
public: public:
%addtofunc wxPyTextDropTarget "self._setCallbackInfo(self, TextDropTarget)" %pythonAppend wxPyTextDropTarget "self._setCallbackInfo(self, TextDropTarget)"
wxPyTextDropTarget(); wxPyTextDropTarget();
void _setCallbackInfo(PyObject* self, PyObject* _class); void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -241,7 +241,7 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyFileDropTarget, wxFileDropTarget, OnDrop);
%name(FileDropTarget) class wxPyFileDropTarget : public wxPyDropTarget %name(FileDropTarget) class wxPyFileDropTarget : public wxPyDropTarget
{ {
public: public:
%addtofunc wxPyFileDropTarget "self._setCallbackInfo(self, FileDropTarget)" %pythonAppend wxPyFileDropTarget "self._setCallbackInfo(self, FileDropTarget)"
wxPyFileDropTarget(); wxPyFileDropTarget();
void _setCallbackInfo(PyObject* self, PyObject* _class); void _setCallbackInfo(PyObject* self, PyObject* _class);

4
wxPython/src/_event.i
View File

@@ -1211,7 +1211,7 @@ public:
class wxPyEvent : public wxEvent { class wxPyEvent : public wxEvent {
public: public:
%addtofunc wxPyEvent "self.SetSelf(self)" %pythonAppend wxPyEvent "self.SetSelf(self)"
wxPyEvent(int winid=0, wxEventType commandType = wxEVT_NULL ); wxPyEvent(int winid=0, wxEventType commandType = wxEVT_NULL );
~wxPyEvent(); ~wxPyEvent();
@@ -1223,7 +1223,7 @@ public:
class wxPyCommandEvent : public wxCommandEvent { class wxPyCommandEvent : public wxCommandEvent {
public: public:
%addtofunc wxPyCommandEvent "self.SetSelf(self)" %pythonAppend wxPyCommandEvent "self.SetSelf(self)"
wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0); wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0);
~wxPyCommandEvent(); ~wxPyCommandEvent();

2
wxPython/src/_filesys.i
View File

@@ -95,7 +95,7 @@ public:
%name(FileSystemHandler) class wxPyFileSystemHandler : public wxFileSystemHandler %name(FileSystemHandler) class wxPyFileSystemHandler : public wxFileSystemHandler
{ {
public: public:
%addtofunc wxPyFileSystemHandler "self._setCallbackInfo(self, FileSystemHandler)"; %pythonAppend wxPyFileSystemHandler "self._setCallbackInfo(self, FileSystemHandler)";
wxPyFileSystemHandler(); wxPyFileSystemHandler();

2
wxPython/src/_font.i
View File

@@ -523,7 +523,7 @@ IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEnc
%name(FontEnumerator) class wxPyFontEnumerator { %name(FontEnumerator) class wxPyFontEnumerator {
public: public:
%addtofunc wxPyFontEnumerator "self._setCallbackInfo(self, FontEnumerator, 0)" %pythonAppend wxPyFontEnumerator "self._setCallbackInfo(self, FontEnumerator, 0)"
wxPyFontEnumerator(); wxPyFontEnumerator();
~wxPyFontEnumerator(); ~wxPyFontEnumerator();

4
wxPython/src/_gauge.i
View File

@@ -31,8 +31,8 @@ enum {
class wxGauge : public wxControl { class wxGauge : public wxControl {
public: public:
%addtofunc wxGauge "self._setOORInfo(self)" %pythonAppend wxGauge "self._setOORInfo(self)"
%addtofunc wxGauge() "" %pythonAppend wxGauge() ""
wxGauge(wxWindow* parent, wxWindowID id, int range, wxGauge(wxWindow* parent, wxWindowID id, int range,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,

8
wxPython/src/_listbox.i
View File

@@ -29,8 +29,8 @@ MAKE_CONST_WXSTRING(ListBoxNameStr);
class wxListBox : public wxControlWithItems class wxListBox : public wxControlWithItems
{ {
public: public:
%addtofunc wxListBox "self._setOORInfo(self)" %pythonAppend wxListBox "self._setOORInfo(self)"
%addtofunc wxListBox() "" %pythonAppend wxListBox() ""
wxListBox(wxWindow* parent, wxWindowID id, wxListBox(wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -114,8 +114,8 @@ public:
class wxCheckListBox : public wxListBox class wxCheckListBox : public wxListBox
{ {
public: public:
%addtofunc wxCheckListBox "self._setOORInfo(self)" %pythonAppend wxCheckListBox "self._setOORInfo(self)"
%addtofunc wxCheckListBox() "" %pythonAppend wxCheckListBox() ""
wxCheckListBox(wxWindow *parent, wxWindowID id, wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,

12
wxPython/src/_listctrl.i
View File

@@ -401,8 +401,8 @@ IMP_PYCALLBACK_LISTATTR_LONG(wxPyListCtrl, wxListCtrl, OnGetItemAttr);
%name(ListCtrl)class wxPyListCtrl : public wxControl { %name(ListCtrl)class wxPyListCtrl : public wxControl {
public: public:
%addtofunc wxPyListCtrl "self._setOORInfo(self);self._setCallbackInfo(self, ListCtrl)" %pythonAppend wxPyListCtrl "self._setOORInfo(self);self._setCallbackInfo(self, ListCtrl)"
%addtofunc wxPyListCtrl() "" %pythonAppend wxPyListCtrl() ""
wxPyListCtrl(wxWindow* parent, wxWindowID id = -1, wxPyListCtrl(wxWindow* parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -427,7 +427,7 @@ public:
bool SetBackgroundColour(const wxColour& col); bool SetBackgroundColour(const wxColour& col);
// Gets information about this column // 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 { %extend {
wxListItem* GetColumn(int col) { wxListItem* GetColumn(int col) {
wxListItem item; wxListItem item;
@@ -470,7 +470,7 @@ public:
#endif #endif
// Gets information about the item // 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 { %extend {
wxListItem* GetItem(long itemId, int col=0) { wxListItem* GetItem(long itemId, int col=0) {
wxListItem* info = new wxListItem; wxListItem* info = new wxListItem;
@@ -776,8 +776,8 @@ public:
class wxListView : public wxPyListCtrl class wxListView : public wxPyListCtrl
{ {
public: public:
%addtofunc wxListView "self._setOORInfo(self)" %pythonAppend wxListView "self._setOORInfo(self)"
%addtofunc wxListView() "" %pythonAppend wxListView() ""
wxListView( wxWindow *parent, wxListView( wxWindow *parent,
wxWindowID id = -1, wxWindowID id = -1,

2
wxPython/src/_log.i
View File

@@ -281,7 +281,7 @@ public:
// Now tell SWIG about it // Now tell SWIG about it
class wxPyLog : public wxLog { class wxPyLog : public wxLog {
public: public:
%addtofunc wxPyLog "self._setCallbackInfo(self, PyLog)" %pythonAppend wxPyLog "self._setCallbackInfo(self, PyLog)"
wxPyLog(); wxPyLog();

12
wxPython/src/_mdi.i
View File

@@ -35,8 +35,8 @@
class wxMDIParentFrame : public wxFrame { class wxMDIParentFrame : public wxFrame {
public: public:
%addtofunc wxMDIParentFrame "self._setOORInfo(self)" %pythonAppend wxMDIParentFrame "self._setOORInfo(self)"
%addtofunc wxMDIParentFrame() "" %pythonAppend wxMDIParentFrame() ""
wxMDIParentFrame(wxWindow *parent, wxMDIParentFrame(wxWindow *parent,
const wxWindowID id, const wxWindowID id,
@@ -80,8 +80,8 @@ public:
class wxMDIChildFrame : public wxFrame { class wxMDIChildFrame : public wxFrame {
public: public:
%addtofunc wxMDIChildFrame "self._setOORInfo(self)" %pythonAppend wxMDIChildFrame "self._setOORInfo(self)"
%addtofunc wxMDIChildFrame() "" %pythonAppend wxMDIChildFrame() ""
wxMDIChildFrame(wxMDIParentFrame* parent, wxMDIChildFrame(wxMDIParentFrame* parent,
const wxWindowID id, const wxWindowID id,
@@ -111,8 +111,8 @@ public:
class wxMDIClientWindow : public wxWindow { class wxMDIClientWindow : public wxWindow {
public: public:
%addtofunc wxMDIClientWindow "self._setOORInfo(self)" %pythonAppend wxMDIClientWindow "self._setOORInfo(self)"
%addtofunc wxMDIClientWindow() "" %pythonAppend wxMDIClientWindow() ""
wxMDIClientWindow(wxMDIParentFrame* parent, long style = 0); wxMDIClientWindow(wxMDIParentFrame* parent, long style = 0);
%name(PreMDIClientWindow)wxMDIClientWindow(); %name(PreMDIClientWindow)wxMDIClientWindow();

4
wxPython/src/_menu.i
View File

@@ -20,7 +20,7 @@
class wxMenu : public wxEvtHandler class wxMenu : public wxEvtHandler
{ {
public: public:
%addtofunc wxMenu "self._setOORInfo(self)" %pythonAppend wxMenu "self._setOORInfo(self)"
wxMenu(const wxString& title = wxPyEmptyString, long style = 0); wxMenu(const wxString& title = wxPyEmptyString, long style = 0);
@@ -206,7 +206,7 @@ public:
class wxMenuBar : public wxWindow class wxMenuBar : public wxWindow
{ {
public: public:
%addtofunc wxMenuBar "self._setOORInfo(self)" %pythonAppend wxMenuBar "self._setOORInfo(self)"
wxMenuBar(long style = 0); wxMenuBar(long style = 0);

12
wxPython/src/_notebook.i
View File

@@ -159,8 +159,8 @@ enum {
class wxNotebook : public wxBookCtrl { class wxNotebook : public wxBookCtrl {
public: public:
%addtofunc wxNotebook "self._setOORInfo(self)" %pythonAppend wxNotebook "self._setOORInfo(self)"
%addtofunc wxNotebook() "" %pythonAppend wxNotebook() ""
wxNotebook(wxWindow *parent, wxNotebook(wxWindow *parent,
wxWindowID id, wxWindowID id,
@@ -283,8 +283,8 @@ enum
class wxListbook : public wxBookCtrl class wxListbook : public wxBookCtrl
{ {
public: public:
%addtofunc wxListbook "self._setOORInfo(self)" %pythonAppend wxListbook "self._setOORInfo(self)"
%addtofunc wxListbook() "" %pythonAppend wxListbook() ""
wxListbook(wxWindow *parent, wxListbook(wxWindow *parent,
wxWindowID id, wxWindowID id,
@@ -332,7 +332,7 @@ public:
class wxBookCtrlSizer: public wxSizer class wxBookCtrlSizer: public wxSizer
{ {
public: public:
%addtofunc wxBookCtrlSizer "self._setOORInfo(self)" %pythonAppend wxBookCtrlSizer "self._setOORInfo(self)"
wxBookCtrlSizer( wxBookCtrl *nb ); wxBookCtrlSizer( wxBookCtrl *nb );
@@ -344,7 +344,7 @@ public:
class wxNotebookSizer: public wxSizer { class wxNotebookSizer: public wxSizer {
public: public:
%addtofunc wxNotebookSizer "self._setOORInfo(self)" %pythonAppend wxNotebookSizer "self._setOORInfo(self)"
wxNotebookSizer( wxNotebook *nb ); wxNotebookSizer( wxNotebook *nb );

8
wxPython/src/_panel.i
View File

@@ -25,8 +25,8 @@
class wxPanel : public wxWindow class wxPanel : public wxWindow
{ {
public: public:
%addtofunc wxPanel "self._setOORInfo(self)" %pythonAppend wxPanel "self._setOORInfo(self)"
%addtofunc wxPanel() "" %pythonAppend wxPanel() ""
wxPanel(wxWindow* parent, wxPanel(wxWindow* parent,
const wxWindowID id=-1, const wxWindowID id=-1,
@@ -58,8 +58,8 @@ public:
class wxScrolledWindow : public wxPanel class wxScrolledWindow : public wxPanel
{ {
public: public:
%addtofunc wxScrolledWindow "self._setOORInfo(self)" %pythonAppend wxScrolledWindow "self._setOORInfo(self)"
%addtofunc wxScrolledWindow() "" %pythonAppend wxScrolledWindow() ""
wxScrolledWindow(wxWindow* parent, wxScrolledWindow(wxWindow* parent,
const wxWindowID id = -1, const wxWindowID id = -1,

8
wxPython/src/_popupwin.i
View File

@@ -28,8 +28,8 @@
// combobox popups and such. // combobox popups and such.
class wxPopupWindow : public wxWindow { class wxPopupWindow : public wxWindow {
public: public:
%addtofunc wxPopupWindow "self._setOORInfo(self)" %pythonAppend wxPopupWindow "self._setOORInfo(self)"
%addtofunc wxPopupWindow() "" %pythonAppend wxPopupWindow() ""
wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE); wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE);
%name(PrePopupWindow)wxPopupWindow(); %name(PrePopupWindow)wxPopupWindow();
@@ -79,8 +79,8 @@ IMP_PYCALLBACK_BOOL_(wxPyPopupTransientWindow, wxPopupTransientWindow, CanDismis
%name(PopupTransientWindow) class wxPyPopupTransientWindow : public wxPopupWindow %name(PopupTransientWindow) class wxPyPopupTransientWindow : public wxPopupWindow
{ {
public: public:
%addtofunc wxPyPopupTransientWindow "self._setOORInfo(self);self._setCallbackInfo(self, PopupTransientWindow)" %pythonAppend wxPyPopupTransientWindow "self._setOORInfo(self);self._setCallbackInfo(self, PopupTransientWindow)"
%addtofunc wxPyPopupTransientWindow() "" %pythonAppend wxPyPopupTransientWindow() ""
wxPyPopupTransientWindow(wxWindow *parent, int style = wxBORDER_NONE); wxPyPopupTransientWindow(wxWindow *parent, int style = wxBORDER_NONE);
%name(PrePopupTransientWindow)wxPyPopupTransientWindow(); %name(PrePopupTransientWindow)wxPyPopupTransientWindow();

18
wxPython/src/_printfw.i
View File

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

2
wxPython/src/_process.i
View File

@@ -89,7 +89,7 @@ public:
static wxPyProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC); 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); wxPyProcess(wxEvtHandler *parent = NULL, int id = -1);
void _setCallbackInfo(PyObject* self, PyObject* _class); void _setCallbackInfo(PyObject* self, PyObject* _class);

2
wxPython/src/_pycontrol.i
View File

@@ -95,7 +95,7 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyControl, wxControl, RemoveChild);
class wxPyControl : public wxControl class wxPyControl : public wxControl
{ {
public: 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, wxPyControl(wxWindow* parent, const wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,

4
wxPython/src/_pywindows.i
View File

@@ -125,7 +125,7 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyWindow, wxWindow, RemoveChild);
class wxPyWindow : public wxWindow class wxPyWindow : public wxWindow
{ {
public: 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, wxPyWindow(wxWindow* parent, const wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -250,7 +250,7 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyPanel, wxPanel, RemoveChild);
class wxPyPanel : public wxPanel class wxPyPanel : public wxPanel
{ {
public: 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, wxPyPanel(wxWindow* parent, const wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,

14
wxPython/src/_radio.i
View File

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

8
wxPython/src/_sashwin.i
View File

@@ -51,8 +51,8 @@ enum wxSashEdgePosition {
class wxSashWindow: public wxWindow class wxSashWindow: public wxWindow
{ {
public: public:
%addtofunc wxSashWindow "self._setOORInfo(self)" %pythonAppend wxSashWindow "self._setOORInfo(self)"
%addtofunc wxSashWindow() "" %pythonAppend wxSashWindow() ""
wxSashWindow(wxWindow* parent, wxWindowID id, wxSashWindow(wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -237,8 +237,8 @@ public:
class wxSashLayoutWindow: public wxSashWindow class wxSashLayoutWindow: public wxSashWindow
{ {
public: public:
%addtofunc wxSashLayoutWindow "self._setOORInfo(self)" %pythonAppend wxSashLayoutWindow "self._setOORInfo(self)"
%addtofunc wxSashLayoutWindow() "" %pythonAppend wxSashLayoutWindow() ""
wxSashLayoutWindow(wxWindow* parent, wxWindowID id, wxSashLayoutWindow(wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,

4
wxPython/src/_scrolbar.i
View File

@@ -22,8 +22,8 @@ MAKE_CONST_WXSTRING(ScrollBarNameStr);
class wxScrollBar : public wxControl { class wxScrollBar : public wxControl {
public: public:
%addtofunc wxScrollBar "self._setOORInfo(self)" %pythonAppend wxScrollBar "self._setOORInfo(self)"
%addtofunc wxScrollBar() "" %pythonAppend wxScrollBar() ""
wxScrollBar(wxWindow* parent, wxWindowID id = -1, wxScrollBar(wxWindow* parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,

10
wxPython/src/_sizers.i
View File

@@ -382,7 +382,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPySizer, wxSizer);
class wxPySizer : public wxSizer { class wxPySizer : public wxSizer {
public: public:
%addtofunc wxPySizer "self._setCallbackInfo(self, PySizer);self._setOORInfo(self)" %pythonAppend wxPySizer "self._setCallbackInfo(self, PySizer);self._setOORInfo(self)"
wxPySizer(); wxPySizer();
void _setCallbackInfo(PyObject* self, PyObject* _class); void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -394,7 +394,7 @@ public:
class wxBoxSizer : public wxSizer { class wxBoxSizer : public wxSizer {
public: public:
%addtofunc wxBoxSizer "self._setOORInfo(self)" %pythonAppend wxBoxSizer "self._setOORInfo(self)"
wxBoxSizer(int orient = wxHORIZONTAL); wxBoxSizer(int orient = wxHORIZONTAL);
@@ -409,7 +409,7 @@ public:
class wxStaticBoxSizer : public wxBoxSizer { class wxStaticBoxSizer : public wxBoxSizer {
public: public:
%addtofunc wxStaticBoxSizer "self._setOORInfo(self)" %pythonAppend wxStaticBoxSizer "self._setOORInfo(self)"
wxStaticBoxSizer(wxStaticBox *box, int orient = wxHORIZONTAL); wxStaticBoxSizer(wxStaticBox *box, int orient = wxHORIZONTAL);
@@ -424,7 +424,7 @@ public:
class wxGridSizer: public wxSizer class wxGridSizer: public wxSizer
{ {
public: public:
%addtofunc wxGridSizer "self._setOORInfo(self)" %pythonAppend wxGridSizer "self._setOORInfo(self)"
wxGridSizer( int rows=1, int cols=0, int vgap=0, int hgap=0 ); wxGridSizer( int rows=1, int cols=0, int vgap=0, int hgap=0 );
@@ -460,7 +460,7 @@ enum wxFlexSizerGrowMode
class wxFlexGridSizer: public wxGridSizer class wxFlexGridSizer: public wxGridSizer
{ {
public: public:
%addtofunc wxFlexGridSizer "self._setOORInfo(self)" %pythonAppend wxFlexGridSizer "self._setOORInfo(self)"
wxFlexGridSizer( int rows=1, int cols=0, int vgap=0, int hgap=0 ); wxFlexGridSizer( int rows=1, int cols=0, int vgap=0, int hgap=0 );

12
wxPython/src/_slider.i
View File

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

8
wxPython/src/_spin.i
View File

@@ -41,8 +41,8 @@ enum {
class wxSpinButton : public wxControl class wxSpinButton : public wxControl
{ {
public: public:
%addtofunc wxSpinButton "self._setOORInfo(self)" %pythonAppend wxSpinButton "self._setOORInfo(self)"
%addtofunc wxSpinButton() "" %pythonAppend wxSpinButton() ""
wxSpinButton(wxWindow* parent, wxWindowID id = -1, wxSpinButton(wxWindow* parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -80,8 +80,8 @@ public:
class wxSpinCtrl : public wxControl class wxSpinCtrl : public wxControl
{ {
public: public:
%addtofunc wxSpinCtrl "self._setOORInfo(self)" %pythonAppend wxSpinCtrl "self._setOORInfo(self)"
%addtofunc wxSpinCtrl() "" %pythonAppend wxSpinCtrl() ""
wxSpinCtrl(wxWindow *parent, wxSpinCtrl(wxWindow *parent,
wxWindowID id = -1, wxWindowID id = -1,

10
wxPython/src/_splitter.i
View File

@@ -53,18 +53,20 @@ enum
class wxSplitterWindow: public wxWindow class wxSplitterWindow: public wxWindow
{ {
public: public:
%addtofunc wxSplitterWindow "self._setOORInfo(self)" %pythonPrepend wxSplitterWindow "if kwargs.has_key('point'): kwargs['pos'] = kwargs['point']"
%addtofunc wxSplitterWindow() "" %pythonPrepend wxSplitterWindow() ""
%pythonAppend wxSplitterWindow "self._setOORInfo(self)"
%pythonAppend wxSplitterWindow() ""
wxSplitterWindow(wxWindow* parent, wxWindowID id, wxSplitterWindow(wxWindow* parent, wxWindowID id,
const wxPoint& point = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style=wxSP_3D, long style=wxSP_3D,
const wxString& name = wxPySplitterNameStr); const wxString& name = wxPySplitterNameStr);
%name(PreSplitterWindow)wxSplitterWindow(); %name(PreSplitterWindow)wxSplitterWindow();
bool Create(wxWindow* parent, wxWindowID id, bool Create(wxWindow* parent, wxWindowID id,
const wxPoint& point = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style=wxSP_3D, long style=wxSP_3D,
const wxString& name = wxPySplitterNameStr); const wxString& name = wxPySplitterNameStr);

16
wxPython/src/_statctrls.i
View File

@@ -25,8 +25,8 @@ MAKE_CONST_WXSTRING(StaticTextNameStr);
class wxStaticBox : public wxControl { class wxStaticBox : public wxControl {
public: public:
%addtofunc wxStaticBox "self._setOORInfo(self)" %pythonAppend wxStaticBox "self._setOORInfo(self)"
%addtofunc wxStaticBox() "" %pythonAppend wxStaticBox() ""
wxStaticBox(wxWindow* parent, wxWindowID id, const wxString& label, wxStaticBox(wxWindow* parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -49,8 +49,8 @@ public:
class wxStaticLine : public wxControl { class wxStaticLine : public wxControl {
public: public:
%addtofunc wxStaticLine "self._setOORInfo(self)" %pythonAppend wxStaticLine "self._setOORInfo(self)"
%addtofunc wxStaticLine() "" %pythonAppend wxStaticLine() ""
wxStaticLine( wxWindow *parent, wxWindowID id, wxStaticLine( wxWindow *parent, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
@@ -79,8 +79,8 @@ public:
class wxStaticText : public wxControl { class wxStaticText : public wxControl {
public: public:
%addtofunc wxStaticText "self._setOORInfo(self)" %pythonAppend wxStaticText "self._setOORInfo(self)"
%addtofunc wxStaticText() "" %pythonAppend wxStaticText() ""
wxStaticText(wxWindow* parent, wxWindowID id, const wxString& label, wxStaticText(wxWindow* parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -101,8 +101,8 @@ public:
class wxStaticBitmap : public wxControl { class wxStaticBitmap : public wxControl {
public: public:
%addtofunc wxStaticText "self._setOORInfo(self)" %pythonAppend wxStaticText "self._setOORInfo(self)"
%addtofunc wxStaticText() "" %pythonAppend wxStaticText() ""
wxStaticBitmap(wxWindow* parent, wxWindowID id, wxStaticBitmap(wxWindow* parent, wxWindowID id,
const wxBitmap& bitmap, const wxBitmap& bitmap,

4
wxPython/src/_statusbar.i
View File

@@ -26,8 +26,8 @@
class wxStatusBar : public wxWindow class wxStatusBar : public wxWindow
{ {
public: public:
%addtofunc wxStatusBar "self._setOORInfo(self)" %pythonAppend wxStatusBar "self._setOORInfo(self)"
%addtofunc wxStatusBar() "" %pythonAppend wxStatusBar() ""
wxStatusBar(wxWindow* parent, wxWindowID id = -1, wxStatusBar(wxWindow* parent, wxWindowID id = -1,
long style = wxST_SIZEGRIP, long style = wxST_SIZEGRIP,

117
wxPython/src/_stockobjs.i
View File

@@ -17,6 +17,63 @@
%newgroup %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 { class wxPenList : public wxObject {
public: public:
@@ -80,65 +137,10 @@ public:
%newgroup %newgroup
// %typemap(varout) wxFont* {
// // my typemap
// $result = SWIG_NewPointerObj((void *) $1, $1_descriptor, 0);
// }
// See also wxPy_ReinitStockObjects in helpers.cpp // See also wxPy_ReinitStockObjects in helpers.cpp
%immutable; %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; wxFontList* const wxTheFontList;
wxPenList* const wxThePenList; wxPenList* const wxThePenList;
wxBrushList* const wxTheBrushList; wxBrushList* const wxTheBrushList;
@@ -149,3 +151,8 @@ wxColourDatabase* const wxTheColourDatabase;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
%pythoncode { NullColor = NullColour }

7
wxPython/src/_textctrl.i
View File

@@ -102,7 +102,8 @@ public:
const wxColour& colBack = wxNullColour, const wxColour& colBack = wxNullColour,
const wxFont& font = wxNullFont, const wxFont& font = wxNullFont,
wxTextAttrAlignment alignment = wxTEXT_ALIGNMENT_DEFAULT); wxTextAttrAlignment alignment = wxTEXT_ALIGNMENT_DEFAULT);
~wxTextAttr();
// operations // operations
void Init(); void Init();
@@ -153,8 +154,8 @@ public:
class wxTextCtrl : public wxControl class wxTextCtrl : public wxControl
{ {
public: public:
%addtofunc wxTextCtrl "self._setOORInfo(self)" %pythonAppend wxTextCtrl "self._setOORInfo(self)"
%addtofunc wxTextCtrl() "" %pythonAppend wxTextCtrl() ""
wxTextCtrl(wxWindow* parent, wxWindowID id, wxTextCtrl(wxWindow* parent, wxWindowID id,
const wxString& value = wxPyEmptyString, const wxString& value = wxPyEmptyString,

4
wxPython/src/_tglbtn.i
View File

@@ -53,8 +53,8 @@ public:
class wxToggleButton : public wxControl class wxToggleButton : public wxControl
{ {
public: public:
%addtofunc wxToggleButton "self._setOORInfo(self)" %pythonAppend wxToggleButton "self._setOORInfo(self)"
%addtofunc wxToggleButton() "" %pythonAppend wxToggleButton() ""
wxToggleButton(wxWindow *parent, wxToggleButton(wxWindow *parent,
wxWindowID id, wxWindowID id,

2
wxPython/src/_timer.i
View File

@@ -40,7 +40,7 @@ IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify);
%name(Timer) class wxPyTimer : public wxEvtHandler %name(Timer) class wxPyTimer : public wxEvtHandler
{ {
public: 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 // if you don't call SetOwner() or provide an owner in the contstructor
// then you must override Notify() inorder to receive the timer // then you must override Notify() inorder to receive the timer

2
wxPython/src/_tipwin.i
View File

@@ -31,7 +31,7 @@ class wxTipWindow :
#endif #endif
{ {
public: public:
%addtofunc wxTipWindow "self._setOORInfo(self)" %pythonAppend wxTipWindow "self._setOORInfo(self)"
%extend { %extend {
wxTipWindow(wxWindow *parent, wxTipWindow(wxWindow *parent,

4
wxPython/src/_toolbar.i
View File

@@ -386,8 +386,8 @@ public:
class wxToolBar : public wxToolBarBase { class wxToolBar : public wxToolBarBase {
public: public:
%addtofunc wxToolBar "self._setOORInfo(self)" %pythonAppend wxToolBar "self._setOORInfo(self)"
%addtofunc wxToolBar() "" %pythonAppend wxToolBar() ""
wxToolBar(wxWindow *parent, wxToolBar(wxWindow *parent,
wxWindowID id, wxWindowID id,

16
wxPython/src/_toplvl.i
View File

@@ -109,8 +109,8 @@ public:
class wxFrame : public wxTopLevelWindow { class wxFrame : public wxTopLevelWindow {
public: public:
%addtofunc wxFrame "self._setOORInfo(self)" %pythonAppend wxFrame "self._setOORInfo(self)"
%addtofunc wxFrame() "" %pythonAppend wxFrame() ""
wxFrame(wxWindow* parent, const wxWindowID id, const wxString& title, wxFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -216,8 +216,8 @@ public:
class wxDialog : public wxTopLevelWindow { class wxDialog : public wxTopLevelWindow {
public: public:
%addtofunc wxDialog "self._setOORInfo(self)" %pythonAppend wxDialog "self._setOORInfo(self)"
%addtofunc wxDialog() "" %pythonAppend wxDialog() ""
wxDialog(wxWindow* parent, wxDialog(wxWindow* parent,
const wxWindowID id, const wxWindowID id,
@@ -280,8 +280,8 @@ public:
class wxMiniFrame : public wxFrame { class wxMiniFrame : public wxFrame {
public: public:
%addtofunc wxMiniFrame "self._setOORInfo(self)" %pythonAppend wxMiniFrame "self._setOORInfo(self)"
%addtofunc wxMiniFrame() "" %pythonAppend wxMiniFrame() ""
wxMiniFrame(wxWindow* parent, const wxWindowID id, const wxString& title, wxMiniFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -315,7 +315,7 @@ enum {
class wxSplashScreenWindow: public wxWindow class wxSplashScreenWindow: public wxWindow
{ {
public: public:
%addtofunc wxSplashScreenWindow "self._setOORInfo(self)" %pythonAppend wxSplashScreenWindow "self._setOORInfo(self)"
wxSplashScreenWindow(const wxBitmap& bitmap, wxSplashScreenWindow(const wxBitmap& bitmap,
wxWindow* parent, wxWindowID id, wxWindow* parent, wxWindowID id,
@@ -330,7 +330,7 @@ public:
class wxSplashScreen : public wxFrame { class wxSplashScreen : public wxFrame {
public: public:
%addtofunc wxSplashScreen "self._setOORInfo(self)" %pythonAppend wxSplashScreen "self._setOORInfo(self)"
wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds,
wxWindow* parent, wxWindowID id, wxWindow* parent, wxWindowID id,

4
wxPython/src/_treectrl.i
View File

@@ -318,8 +318,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl);
%name(TreeCtrl)class wxPyTreeCtrl : public wxControl { %name(TreeCtrl)class wxPyTreeCtrl : public wxControl {
public: public:
%addtofunc wxPyTreeCtrl "self._setOORInfo(self);self._setCallbackInfo(self, TreeCtrl)" %pythonAppend wxPyTreeCtrl "self._setOORInfo(self);self._setCallbackInfo(self, TreeCtrl)"
%addtofunc wxPyTreeCtrl() "" %pythonAppend wxPyTreeCtrl() ""
wxPyTreeCtrl(wxWindow *parent, wxWindowID id = -1, wxPyTreeCtrl(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,

4
wxPython/src/_validator.i
View File

@@ -32,7 +32,7 @@
class wxValidator : public wxEvtHandler class wxValidator : public wxEvtHandler
{ {
public: public:
%addtofunc wxValidator "self._setOORInfo(self)" %pythonAppend wxValidator "self._setOORInfo(self)"
wxValidator(); wxValidator();
//~wxValidator(); //~wxValidator();
@@ -73,7 +73,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPyValidator, wxValidator);
class wxPyValidator : public wxValidator { class wxPyValidator : public wxValidator {
public: public:
%addtofunc wxPyValidator " %pythonAppend wxPyValidator "
self._setCallbackInfo(self, PyValidator, 1) self._setCallbackInfo(self, PyValidator, 1)
self._setOORInfo(self)" self._setOORInfo(self)"
wxPyValidator(); wxPyValidator();

12
wxPython/src/_vscroll.i
View File

@@ -128,8 +128,8 @@ IMP_PYCALLBACK_COORD_const (wxPyVScrolledWindow, wxVScrolledWindow, Est
%name(VScrolledWindow) class wxPyVScrolledWindow : public wxPanel %name(VScrolledWindow) class wxPyVScrolledWindow : public wxPanel
{ {
public: public:
%addtofunc wxPyVScrolledWindow "self._setOORInfo(self); self._setCallbackInfo(self, VScrolledWindow)" %pythonAppend wxPyVScrolledWindow "self._setOORInfo(self); self._setCallbackInfo(self, VScrolledWindow)"
%addtofunc wxPyVScrolledWindow() "" %pythonAppend wxPyVScrolledWindow() ""
wxPyVScrolledWindow(wxWindow *parent, wxPyVScrolledWindow(wxWindow *parent,
@@ -285,8 +285,8 @@ IMP_PYCALLBACK__DCRECTSIZET_const (wxPyVListBox, wxVListBox, OnDrawBackground
%name(VListBox) class wxPyVListBox : public wxPyVScrolledWindow %name(VListBox) class wxPyVListBox : public wxPyVScrolledWindow
{ {
public: public:
%addtofunc wxPyVListBox "self._setOORInfo(self);self._setCallbackInfo(self, VListBox)" %pythonAppend wxPyVListBox "self._setOORInfo(self);self._setCallbackInfo(self, VListBox)"
%addtofunc wxPyVListBox() "" %pythonAppend wxPyVListBox() ""
wxPyVListBox(wxWindow *parent, wxPyVListBox(wxWindow *parent,
@@ -481,8 +481,8 @@ IMP_PYCALLBACK_STRING_SIZET (wxPyHtmlListBox, wxHtmlListBox, OnGetItemMarkup
%name(HtmlListBox) class wxPyHtmlListBox : public wxPyVListBox %name(HtmlListBox) class wxPyHtmlListBox : public wxPyVListBox
{ {
public: public:
%addtofunc wxPyHtmlListBox "self._setOORInfo(self);self._setCallbackInfo(self, HtmlListBox)" %pythonAppend wxPyHtmlListBox "self._setOORInfo(self);self._setCallbackInfo(self, HtmlListBox)"
%addtofunc wxPyHtmlListBox() "" %pythonAppend wxPyHtmlListBox() ""
// normal constructor which calls Create() internally // normal constructor which calls Create() internally

4
wxPython/src/_window.i
View File

@@ -26,8 +26,8 @@ MAKE_CONST_WXSTRING(PanelNameStr);
class wxWindow : public wxEvtHandler class wxWindow : public wxEvtHandler
{ {
public: public:
%addtofunc wxWindow "self._setOORInfo(self)" %pythonAppend wxWindow "self._setOORInfo(self)"
%addtofunc wxWindow() "" %pythonAppend wxWindow() ""
wxWindow(wxWindow* parent, const wxWindowID id, wxWindow(wxWindow* parent, const wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,

4
wxPython/src/calendar.i
View File

@@ -143,8 +143,8 @@ MAKE_CONST_WXSTRING(CalendarNameStr);
class wxCalendarCtrl : public wxControl class wxCalendarCtrl : public wxControl
{ {
public: public:
%addtofunc wxCalendarCtrl "self._setOORInfo(self)" %pythonAppend wxCalendarCtrl "self._setOORInfo(self)"
%addtofunc wxCalendarCtrl() "" %pythonAppend wxCalendarCtrl() ""
wxCalendarCtrl(wxWindow *parent, wxCalendarCtrl(wxWindow *parent,
wxWindowID id, wxWindowID id,

44
wxPython/src/grid.i
View File

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

14
wxPython/src/html.i
View File

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

12
wxPython/src/wizard.i
View File

@@ -196,8 +196,8 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyWizardPage, wxWizardPage, RemoveChild);
class wxPyWizardPage : public wxWizardPage { class wxPyWizardPage : public wxWizardPage {
public: public:
%addtofunc wxPyWizardPage "self._setCallbackInfo(self, PyWizardPage);self._setOORInfo(self)" %pythonAppend wxPyWizardPage "self._setCallbackInfo(self, PyWizardPage);self._setOORInfo(self)"
%addtofunc wxPyWizardPage() "" %pythonAppend wxPyWizardPage() ""
// ctor accepts an optional bitmap which will be used for this page instead // 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 // of the default one for this wizard (should be of the same size). Notice
@@ -274,8 +274,8 @@ class wxWizardPageSimple : public wxWizardPage
{ {
public: public:
%addtofunc wxWizardPageSimple "self._setOORInfo(self)" %pythonAppend wxWizardPageSimple "self._setOORInfo(self)"
%addtofunc wxWizardPageSimple() "" %pythonAppend wxWizardPageSimple() ""
// ctor takes the previous and next pages // ctor takes the previous and next pages
wxWizardPageSimple(wxWizard *parent, wxWizardPageSimple(wxWizard *parent,
@@ -305,8 +305,8 @@ public:
class wxWizard : public wxDialog class wxWizard : public wxDialog
{ {
public: public:
%addtofunc wxWizard "self._setOORInfo(self)" %pythonAppend wxWizard "self._setOORInfo(self)"
%addtofunc wxWizard() "" %pythonAppend wxWizard() ""
// ctor // ctor
wxWizard(wxWindow *parent, wxWizard(wxWindow *parent,