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

8
wxPython/src/_toolbar.i
View File

@@ -303,8 +303,8 @@ public:
shortHelp, longHelp, clientData)
}
%name(AddToolItem) wxToolBarToolBase *AddTool (wxToolBarToolBase *tool);
%name(InsertToolItem) wxToolBarToolBase *InsertTool (size_t pos, wxToolBarToolBase *tool);
%Rename(AddToolItem, wxToolBarToolBase*, AddTool (wxToolBarToolBase *tool));
%Rename(InsertToolItem, wxToolBarToolBase*, InsertTool (size_t pos, wxToolBarToolBase *tool));
wxToolBarToolBase *AddControl(wxControl *control);
wxToolBarToolBase *InsertControl(size_t pos, wxControl *control);
@@ -353,7 +353,7 @@ public:
void SetToolLongHelp(int id, const wxString& helpString);
wxString GetToolLongHelp(int id);
%name(SetMarginsXY) void SetMargins(int x, int y);
%Rename(SetMarginsXY, void, SetMargins(int x, int y));
void SetMargins(const wxSize& size);
void SetToolPacking(int packing);
void SetToolSeparation(int separation);
@@ -399,7 +399,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = wxNO_BORDER | wxTB_HORIZONTAL,
const wxString& name = wxPyToolBarNameStr);
%name(PreToolBar)wxToolBar();
%RenameCtor(PreToolBar, wxToolBar());
// Turn it back on again
%typemap(out) wxToolBar* { $result = wxPyMake_wxObject($1, $owner); }