X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b39c3fa09a936e6a3f386a67c0fc7cfd84df0168..41e155b43e45b056738bfd7e25c8c7fe261243f3:/wxPython/src/_toolbar.i diff --git a/wxPython/src/_toolbar.i b/wxPython/src/_toolbar.i index f3d0bb52f2..bb0a76de5d 100644 --- a/wxPython/src/_toolbar.i +++ b/wxPython/src/_toolbar.i @@ -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); }