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

34
wxPython/src/_menu.i
View File

@@ -50,20 +50,20 @@ public:
const wxString& text,
const wxString& help = wxPyEmptyString);
// append a submenu
%name(AppendMenu) wxMenuItem* Append(int id,
const wxString& text,
wxMenu *submenu,
const wxString& help = wxPyEmptyString);
%Rename(AppendMenu, wxMenuItem*, Append(int id,
const wxString& text,
wxMenu *submenu,
const wxString& help = wxPyEmptyString));
// the most generic form of Append() - append anything
%name(AppendItem) wxMenuItem* Append(wxMenuItem *item);
%Rename(AppendItem, wxMenuItem*, Append(wxMenuItem *item));
// insert a break in the menu (only works when appending the items, not
// inserting them)
virtual void Break();
// insert an item before given position
%name(InsertItem) wxMenuItem* Insert(size_t pos, wxMenuItem *item);
%Rename(InsertItem, wxMenuItem*, Insert(size_t pos, wxMenuItem *item));
// insert an item before given position
wxMenuItem* Insert(size_t pos,
@@ -88,14 +88,14 @@ public:
const wxString& help = wxPyEmptyString);
// insert a submenu
%name(InsertMenu) wxMenuItem* Insert(size_t pos,
%Rename(InsertMenu, wxMenuItem*, Insert(size_t pos,
int id,
const wxString& text,
wxMenu *submenu,
const wxString& help = wxPyEmptyString);
const wxString& help = wxPyEmptyString));
// prepend an item to the menu
%name(PrependItem) wxMenuItem* Prepend(wxMenuItem *item);
%Rename(PrependItem, wxMenuItem*, Prepend(wxMenuItem *item));
// prepend any item to the menu
wxMenuItem* Prepend(int id,
@@ -117,26 +117,26 @@ public:
const wxString& help = wxPyEmptyString);
// prepend a submenu
%name(PrependMenu) wxMenuItem* Prepend(int id,
%Rename(PrependMenu, wxMenuItem*, Prepend(int id,
const wxString& text,
wxMenu *submenu,
const wxString& help = wxPyEmptyString);
const wxString& help = wxPyEmptyString));
// detach an item from the menu, but don't delete it so that it can be
// added back later (but if it's not, the caller is responsible for
// deleting it!)
wxMenuItem *Remove(int id);
%name(RemoveItem) wxMenuItem *Remove(wxMenuItem *item);
%Rename(RemoveItem, wxMenuItem*, Remove(wxMenuItem *item));
// delete an item from the menu (submenus are not destroyed by this
// function, see Destroy)
bool Delete(int id);
%name(DeleteItem) bool Delete(wxMenuItem *item);
%Rename(DeleteItem, bool, Delete(wxMenuItem *item));
// delete the item from menu and destroy it (if it's a submenu)
%extend { void Destroy() { delete self; } }
%name(DestroyId) bool Destroy(int id);
%name(DestroyItem) bool Destroy(wxMenuItem *item);
%Rename(DestroyId, bool, Destroy(int id));
%Rename(DestroyItem, bool, Destroy(wxMenuItem *item));
// get the items
@@ -150,7 +150,7 @@ public:
// search
int FindItem(const wxString& item) const;
%name(FindItemById) wxMenuItem* FindItem(int id /*, wxMenu **menu = NULL*/) const;
%Rename(FindItemById, wxMenuItem*, FindItem(int id /*, wxMenu **menu = NULL*/) const);
// find by position
wxMenuItem* FindItemByPosition(size_t position) const;
@@ -263,7 +263,7 @@ public:
// find item by id (in any menu), returns NULL if not found
//
// if menu is !NULL, it will be filled with wxMenu this item belongs to
%name(FindItemById) virtual wxMenuItem* FindItem(int id /*, wxMenu **menu = NULL*/) const;
%Rename(FindItemById, virtual wxMenuItem*, FindItem(int id /*, wxMenu **menu = NULL*/) const);
// find menu by its caption, return wxNOT_FOUND on failure
int FindMenu(const wxString& title) const;