Another merge of 2.6 changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-01-17 05:42:30 +00:00
parent f3ebbc0ac8
commit 4617be085f
21 changed files with 241 additions and 43 deletions

View File

@@ -368,7 +368,7 @@ EVT_LIST_ITEM_FOCUSED = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
%{ // C++ Version of a Python aware class
class wxPyListCtrl : public wxListCtrl {
DECLARE_ABSTRACT_CLASS(wxPyListCtrl);
DECLARE_ABSTRACT_CLASS(wxPyListCtrl)
public:
wxPyListCtrl() : wxListCtrl() {}
wxPyListCtrl(wxWindow* parent, wxWindowID id,
@@ -661,13 +661,16 @@ details in the second return value (see wx.LIST_HITTEST flags.)", "");
long InsertItem(wxListItem& info);
// Insert a string item
%Rename(InsertStringItem, long, InsertItem(long index, const wxString& label));
%Rename(InsertStringItem,
long, InsertItem(long index, const wxString& label, int imageIndex=-1));
// Insert an image item
%Rename(InsertImageItem, long, InsertItem(long index, int imageIndex));
%Rename(InsertImageItem,
long, InsertItem(long index, int imageIndex));
// Insert an image/string item
%Rename(InsertImageStringItem, long, InsertItem(long index, const wxString& label, int imageIndex));
%Rename(InsertImageStringItem,
long, InsertItem(long index, const wxString& label, int imageIndex));
// For list view mode (only), inserts a column.
%Rename(InsertColumnItem, long, InsertColumn(long col, wxListItem& info));