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

Updated to SWIG 1.3.24 (plus a patch that corrects a bug and adds back

Browse Source 
some things that were changed/removed from my patch I submitted to
them.)

Since it is now possible easily and simply share the SWIG type tables
across modules I reverted to always using the stock SWIG runtime
instead of my slightly hacked up version of it exported via the
wxPython C API.

The %name directive is now deprecated so replaced most uses of it with
a custom %Rename macro that uses %rename internally.  These will
evetually need to be replaced with a DocDecl macro when docstrings are
added.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-12-23 20:44:09 +00:00
parent 47261ba05f
commit 1b8c7ba607
76 changed files with 482 additions and 1650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,7 +150,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
const wxString& name = wxPyDynamicSashNameStr);
%name(PreDynamicSashWindow)wxDynamicSashWindow();
%RenameCtor(PreDynamicSashWindow, wxDynamicSashWindow());
bool Create(wxWindow *parent, wxWindowID id=-1,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
@@ -305,7 +305,8 @@ public:
MustHaveApp(wxPyTreeCompanionWindow);
%name(TreeCompanionWindow) class wxPyTreeCompanionWindow: public wxWindow
%rename(TreeCompanionWindow) wxPyTreeCompanionWindow;
class wxPyTreeCompanionWindow: public wxWindow
{
public:
%pythonAppend wxPyTreeCompanionWindow "self._setOORInfo(self);self._setCallbackInfo(self, TreeCompanionWindow)"
@@ -398,7 +399,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxLED_ALIGN_LEFT | wxLED_DRAW_FADED);
%name(PreLEDNumberCtrl) wxLEDNumberCtrl();
%RenameCtor(PreLEDNumberCtrl, wxLEDNumberCtrl());
bool Create(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
@@ -521,7 +522,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyTreeListCtrl, wxTreeListCtrl)
MustHaveApp(wxPyTreeListCtrl);
%name(TreeListCtrl) class wxPyTreeListCtrl : public wxControl
%rename(TreeListCtrl) wxPyTreeListCtrl;
class wxPyTreeListCtrl : public wxControl
{
public:
%pythonAppend wxPyTreeListCtrl "self._setOORInfo(self);self._setCallbackInfo(self, TreeListCtrl)"
@@ -533,7 +535,7 @@ public:
long style = wxTR_DEFAULT_STYLE,
const wxValidator &validator = wxDefaultValidator,
const wxString& name = wxPyTreeListCtrlNameStr );
%name(PreTreeListCtrl)wxPyTreeListCtrl();
%RenameCtor(PreTreeListCtrl, wxPyTreeListCtrl());
bool Create(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
@@ -590,11 +592,11 @@ public:
// void AddColumn(const wxString& text,
// size_t width,
// wxTreeListColumnAlign alignment = wxTL_ALIGN_LEFT);
%name(AddColumnInfo) void AddColumn(const wxTreeListColumnInfo& col);
%Rename(AddColumnInfo, void, AddColumn(const wxTreeListColumnInfo& col));
// inserts a column before the given one
void InsertColumn(size_t before, const wxString& text);
%name(InsertColumnInfo) void InsertColumn(size_t before, const wxTreeListColumnInfo& col);
%Rename(InsertColumnInfo, void, InsertColumn(size_t before, const wxTreeListColumnInfo& col));
// deletes the given column - does not delete the corresponding column
// of each item
@@ -861,12 +863,12 @@ public:
wxPyTreeItemData *data = NULL);
// insert a new item before the one with the given index
%name(InsertItemBefore)
wxTreeItemId InsertItem(const wxTreeItemId& parent,
%Rename(InsertItemBefore,
wxTreeItemId, InsertItem(const wxTreeItemId& parent,
size_t index,
const wxString& text,
int image = -1, int selectedImage = -1,
wxPyTreeItemData *data = NULL);
wxPyTreeItemData *data = NULL));
// insert a new item in as the last child of the parent
wxTreeItemId AppendItem(const wxTreeItemId& parent,

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

@@ -134,7 +134,7 @@ public:
const wxPalette& palette = wxNullPalette);
%pythonAppend wxGLCanvas "val._setOORInfo(val)"
%name(GLCanvasWithContext)
%RenameCtor(GLCanvasWithContext,
wxGLCanvas( wxWindow *parent,
const wxGLContext *shared = NULL,
wxWindowID id = -1,
@@ -143,7 +143,7 @@ public:
long style = 0,
const wxString& name = wxPyGLCanvasNameStr,
int *attribList = NULL,
const wxPalette& palette = wxNullPalette );
const wxPalette& palette = wxNullPalette ));
void SetCurrent();

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

@@ -107,7 +107,7 @@ public:
bool GoForward();
bool GoHome();
bool GoSearch();
%name(RefreshPage)bool Refresh(wxIEHtmlRefreshLevel level);
%Rename(RefreshPage, bool, Refresh(wxIEHtmlRefreshLevel level));
bool Stop();
};

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

@@ -412,9 +412,9 @@ public:
}
}
%name(AddSimpleConstraint)wxOGLConstraint* AddConstraint(int type,
%Rename(AddSimpleConstraint, wxOGLConstraint*, AddConstraint(int type,
wxPyShape *constraining,
wxPyShape *constrained);
wxPyShape *constrained));
void CalculateSize();
bool ContainsDivision(wxPyDivisionShape *division);

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

@@ -163,13 +163,13 @@ public:
bool ClearArrow(const wxString& name);
void ClearArrowsAtPosition(int position = -1);
void DrawArrow(wxDC& dc, wxArrowHead *arrow, double xOffset, bool proportionalOffset);
%name(DeleteArrowHeadId)bool DeleteArrowHead(long arrowId);
%Rename(DeleteArrowHeadId, bool, DeleteArrowHead(long arrowId));
bool DeleteArrowHead(int position, const wxString& name);
bool DeleteLineControlPoint();
void DrawArrows(wxDC& dc);
void DrawRegion(wxDC& dc, wxShapeRegion *region, double x, double y);
void EraseRegion(wxDC& dc, wxShapeRegion *region, double x, double y);
%name(FindArrowHeadId)wxArrowHead * FindArrowHead(long arrowId);
%Rename(FindArrowHeadId, wxArrowHead *, FindArrowHead(long arrowId));
wxArrowHead * FindArrowHead(int position, const wxString& name);
void FindLineEndPoints(double *OUTPUT, double *OUTPUT,
double *OUTPUT, double *OUTPUT);