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

remove WXWIN_COMPATIBILITY_2_6, add WXWIN_COMPATIBILITY_3_0

Browse Source 
closes #15792

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-01-04 20:07:33 +00:00
parent 61728d5d54
commit 967a94c91a
140 changed files with 291 additions and 1561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/wx/osx/treectrl.h
View File

@@ -59,15 +59,6 @@ enum {
wxTREE_NEXT_ROOT // Retrieves the first child item of the root item of which the specified item is a part.
};
#if WXWIN_COMPATIBILITY_2_6
// Flags for InsertItem
enum {
wxTREE_INSERT_LAST = -1,
wxTREE_INSERT_FIRST = -2,
wxTREE_INSERT_SORT = -3
};
#endif
class WXDLLIMPEXP_CORE wxTreeItem: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxTreeItem)
@@ -189,20 +180,6 @@ public:
// adding/deleting items
bool DeleteItem(long item);
#if WXWIN_COMPATIBILITY_2_6
wxDEPRECATED( long InsertItem(long parent, wxTreeItem& info,
long insertAfter = wxTREE_INSERT_LAST) );
// If image > -1 and selImage == -1, the same image is used for
// both selected and unselected items.
wxDEPRECATED( long InsertItem(long parent, const wxString& label,
int image = -1, int selImage = -1,
long insertAfter = wxTREE_INSERT_LAST) );
// use Expand, Collapse, CollapseAndReset or Toggle
wxDEPRECATED( bool ExpandItem(long item, int action) );
wxDEPRECATED( void SetImageList(wxImageList *imageList, int which = wxIMAGE_LIST_NORMAL) );
#endif // WXWIN_COMPATIBILITY_2_6
// changing item state
bool ExpandItem(long item) { return ExpandItem(item, wxTREE_EXPAND_EXPAND); }
bool CollapseItem(long item) { return ExpandItem(item, wxTREE_EXPAND_COLLAPSE); }