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

Use treebase.h for enum duplicated in port/treectrl.h.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-05-23 10:28:28 +00:00
parent af778d749d
commit e2effeb988
8 changed files with 53 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/wx/gtk/treectrl.h
View File

@@ -70,15 +70,6 @@ static const int wxTREE_HITTEST_ONITEM = wxTREE_HITTEST_ONITEMICON |
// NB: all the following flags are for compatbility only and will be removed in // NB: all the following flags are for compatbility only and will be removed in
// next versions // next versions
// flags for deprecated `Expand(int action)'
enum
{
wxTREE_EXPAND_EXPAND,
wxTREE_EXPAND_COLLAPSE,
wxTREE_EXPAND_COLLAPSE_RESET,
wxTREE_EXPAND_TOGGLE
};
// flags for deprecated InsertItem() variant // flags for deprecated InsertItem() variant
#define wxTREE_INSERT_FIRST 0xFFFF0001 #define wxTREE_INSERT_FIRST 0xFFFF0001
#define wxTREE_INSERT_LAST 0xFFFF0002 #define wxTREE_INSERT_LAST 0xFFFF0002
@@ -145,7 +136,7 @@ public:
// -------- // --------
wxTreeCtrl() { Init(); } wxTreeCtrl() { Init(); }
wxTreeCtrl(wxWindow *parent, wxWindowID id = -1, wxTreeCtrl(wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
@@ -156,7 +147,7 @@ public:
virtual ~wxTreeCtrl(); virtual ~wxTreeCtrl();
bool Create(wxWindow *parent, wxWindowID id = -1, bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
@@ -235,14 +226,14 @@ public:
// number of children // number of children
// ------------------ // ------------------
// if 'recursively' is FALSE, only immediate children count, otherwise // if 'recursively' is false, only immediate children count, otherwise
// the returned number is the number of all items in this branch // the returned number is the number of all items in this branch
size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = TRUE); size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = true);
// navigation // navigation
// ---------- // ----------
// wxTreeItemId.IsOk() will return FALSE if there is no such item // wxTreeItemId.IsOk() will return false if there is no such item
// get the root tree item // get the root tree item
wxTreeItemId GetRootItem() const; wxTreeItemId GetRootItem() const;
@@ -342,7 +333,7 @@ public:
// edited simultaneously) // edited simultaneously)
wxTextCtrl* GetEditControl() const; wxTextCtrl* GetEditControl() const;
// end editing and accept or discard the changes to item label // end editing and accept or discard the changes to item label
void EndEditLabel(const wxTreeItemId& item, bool discardChanges = FALSE); void EndEditLabel(const wxTreeItemId& item, bool discardChanges = false);
// sort the children of this item using the specified callback function // sort the children of this item using the specified callback function
// (it should return -1, 0 or +1 as usual), if it's not specified // (it should return -1, 0 or +1 as usual), if it's not specified

21
include/wx/gtk1/treectrl.h
View File

@@ -70,15 +70,6 @@ static const int wxTREE_HITTEST_ONITEM = wxTREE_HITTEST_ONITEMICON |
// NB: all the following flags are for compatbility only and will be removed in // NB: all the following flags are for compatbility only and will be removed in
// next versions // next versions
// flags for deprecated `Expand(int action)'
enum
{
wxTREE_EXPAND_EXPAND,
wxTREE_EXPAND_COLLAPSE,
wxTREE_EXPAND_COLLAPSE_RESET,
wxTREE_EXPAND_TOGGLE
};
// flags for deprecated InsertItem() variant // flags for deprecated InsertItem() variant
#define wxTREE_INSERT_FIRST 0xFFFF0001 #define wxTREE_INSERT_FIRST 0xFFFF0001
#define wxTREE_INSERT_LAST 0xFFFF0002 #define wxTREE_INSERT_LAST 0xFFFF0002
@@ -145,7 +136,7 @@ public:
// -------- // --------
wxTreeCtrl() { Init(); } wxTreeCtrl() { Init(); }
wxTreeCtrl(wxWindow *parent, wxWindowID id = -1, wxTreeCtrl(wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
@@ -156,7 +147,7 @@ public:
virtual ~wxTreeCtrl(); virtual ~wxTreeCtrl();
bool Create(wxWindow *parent, wxWindowID id = -1, bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
@@ -235,14 +226,14 @@ public:
// number of children // number of children
// ------------------ // ------------------
// if 'recursively' is FALSE, only immediate children count, otherwise // if 'recursively' is false, only immediate children count, otherwise
// the returned number is the number of all items in this branch // the returned number is the number of all items in this branch
size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = TRUE); size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = true);
// navigation // navigation
// ---------- // ----------
// wxTreeItemId.IsOk() will return FALSE if there is no such item // wxTreeItemId.IsOk() will return false if there is no such item
// get the root tree item // get the root tree item
wxTreeItemId GetRootItem() const; wxTreeItemId GetRootItem() const;
@@ -342,7 +333,7 @@ public:
// edited simultaneously) // edited simultaneously)
wxTextCtrl* GetEditControl() const; wxTextCtrl* GetEditControl() const;
// end editing and accept or discard the changes to item label // end editing and accept or discard the changes to item label
void EndEditLabel(const wxTreeItemId& item, bool discardChanges = FALSE); void EndEditLabel(const wxTreeItemId& item, bool discardChanges = false);
// sort the children of this item using the specified callback function // sort the children of this item using the specified callback function
// (it should return -1, 0 or +1 as usual), if it's not specified // (it should return -1, 0 or +1 as usual), if it's not specified

36
include/wx/mac/carbon/treectrl.h
View File

@@ -64,14 +64,6 @@ enum {
wxTREE_NEXT_ROOT // Retrieves the first child item of the root item of which the specified item is a part. wxTREE_NEXT_ROOT // Retrieves the first child item of the root item of which the specified item is a part.
}; };
// Flags for ExpandItem
enum {
wxTREE_EXPAND_EXPAND,
wxTREE_EXPAND_COLLAPSE,
wxTREE_EXPAND_COLLAPSE_RESET,
wxTREE_EXPAND_TOGGLE
};
// Flags for InsertItem // Flags for InsertItem
enum { enum {
wxTREE_INSERT_LAST = -1, wxTREE_INSERT_LAST = -1,
@@ -123,11 +115,11 @@ public:
/* /*
* Public interface * Public interface
*/ */
// creation // creation
// -------- // --------
wxTreeCtrl(); wxTreeCtrl();
inline wxTreeCtrl(wxWindow *parent, wxWindowID id = -1, inline wxTreeCtrl(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
@@ -138,14 +130,14 @@ public:
Create(parent, id, pos, size, style, validator, name); Create(parent, id, pos, size, style, validator, name);
} }
~wxTreeCtrl(); ~wxTreeCtrl();
bool Create(wxWindow *parent, wxWindowID id = -1, bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT, long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "wxTreeCtrl"); const wxString& name = "wxTreeCtrl");
// accessors // accessors
// --------- // ---------
// //
@@ -183,17 +175,17 @@ public:
long GetItemData(long item) const; long GetItemData(long item) const;
bool SetItemData(long item, long data); bool SetItemData(long item, long data);
// convenience function // convenience function
bool IsItemExpanded(long item) bool IsItemExpanded(long item)
{ {
return (GetItemState(item, wxTREE_STATE_EXPANDED) & return (GetItemState(item, wxTREE_STATE_EXPANDED) &
wxTREE_STATE_EXPANDED) != 0; wxTREE_STATE_EXPANDED) != 0;
} }
// bounding rect // bounding rect
bool GetItemRect(long item, wxRect& rect, bool textOnly = FALSE) const; bool GetItemRect(long item, wxRect& rect, bool textOnly = false) const;
// //
wxTextCtrl* GetEditControl() const; wxTextCtrl* GetEditControl() const;
// operations // operations
// ---------- // ----------
// adding/deleting items // adding/deleting items
@@ -203,7 +195,7 @@ public:
// If image > -1 and selImage == -1, the same image is used for // If image > -1 and selImage == -1, the same image is used for
// both selected and unselected items. // both selected and unselected items.
long InsertItem(long parent, const wxString& label, long InsertItem(long parent, const wxString& label,
int image = -1, int selImage = -1, int image = -1, int selImage = -1,
long insertAfter = wxTREE_INSERT_LAST); long insertAfter = wxTREE_INSERT_LAST);
// changing item state // changing item state
@@ -212,8 +204,8 @@ public:
bool ToggleItem(long item) { return ExpandItem(item, wxTREE_EXPAND_TOGGLE); } bool ToggleItem(long item) { return ExpandItem(item, wxTREE_EXPAND_TOGGLE); }
// common interface for {Expand|Collapse|Toggle}Item // common interface for {Expand|Collapse|Toggle}Item
bool ExpandItem(long item, int action); bool ExpandItem(long item, int action);
// //
bool SelectItem(long item); bool SelectItem(long item);
bool ScrollTo(long item); bool ScrollTo(long item);
bool DeleteAllItems(); bool DeleteAllItems();
@@ -228,7 +220,7 @@ public:
// wxImageList *CreateDragImage(long item); // wxImageList *CreateDragImage(long item);
bool SortChildren(long item); bool SortChildren(long item);
bool EnsureVisible(long item); bool EnsureVisible(long item);
void Command(wxCommandEvent& event) { ProcessCommand(event); }; void Command(wxCommandEvent& event) { ProcessCommand(event); };
protected: protected:

40
include/wx/mac/classic/treectrl.h
View File

@@ -64,14 +64,6 @@ enum {
wxTREE_NEXT_ROOT // Retrieves the first child item of the root item of which the specified item is a part. wxTREE_NEXT_ROOT // Retrieves the first child item of the root item of which the specified item is a part.
}; };
// Flags for ExpandItem
enum {
wxTREE_EXPAND_EXPAND,
wxTREE_EXPAND_COLLAPSE,
wxTREE_EXPAND_COLLAPSE_RESET,
wxTREE_EXPAND_TOGGLE
};
// Flags for InsertItem // Flags for InsertItem
enum { enum {
wxTREE_INSERT_LAST = -1, wxTREE_INSERT_LAST = -1,
@@ -123,12 +115,12 @@ public:
/* /*
* Public interface * Public interface
*/ */
// creation // creation
// -------- // --------
wxTreeCtrl(); wxTreeCtrl();
inline wxTreeCtrl(wxWindow *parent, wxWindowID id = -1, inline wxTreeCtrl(wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT, long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT,
@@ -138,14 +130,14 @@ public:
Create(parent, id, pos, size, style, validator, name); Create(parent, id, pos, size, style, validator, name);
} }
~wxTreeCtrl(); ~wxTreeCtrl();
bool Create(wxWindow *parent, wxWindowID id = -1, bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT, long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "wxTreeCtrl"); const wxString& name = "wxTreeCtrl");
// accessors // accessors
// --------- // ---------
// //
@@ -183,17 +175,17 @@ public:
long GetItemData(long item) const; long GetItemData(long item) const;
bool SetItemData(long item, long data); bool SetItemData(long item, long data);
// convenience function // convenience function
bool IsItemExpanded(long item) bool IsItemExpanded(long item)
{ {
return (GetItemState(item, wxTREE_STATE_EXPANDED) & return (GetItemState(item, wxTREE_STATE_EXPANDED) &
wxTREE_STATE_EXPANDED) != 0; wxTREE_STATE_EXPANDED) != 0;
} }
// bounding rect // bounding rect
bool GetItemRect(long item, wxRect& rect, bool textOnly = FALSE) const; bool GetItemRect(long item, wxRect& rect, bool textOnly = false) const;
// //
wxTextCtrl* GetEditControl() const; wxTextCtrl* GetEditControl() const;
// operations // operations
// ---------- // ----------
// adding/deleting items // adding/deleting items
@@ -203,7 +195,7 @@ public:
// If image > -1 and selImage == -1, the same image is used for // If image > -1 and selImage == -1, the same image is used for
// both selected and unselected items. // both selected and unselected items.
long InsertItem(long parent, const wxString& label, long InsertItem(long parent, const wxString& label,
int image = -1, int selImage = -1, int image = -1, int selImage = -1,
long insertAfter = wxTREE_INSERT_LAST); long insertAfter = wxTREE_INSERT_LAST);
// changing item state // changing item state
@@ -212,8 +204,8 @@ public:
bool ToggleItem(long item) { return ExpandItem(item, wxTREE_EXPAND_TOGGLE); } bool ToggleItem(long item) { return ExpandItem(item, wxTREE_EXPAND_TOGGLE); }
// common interface for {Expand|Collapse|Toggle}Item // common interface for {Expand|Collapse|Toggle}Item
bool ExpandItem(long item, int action); bool ExpandItem(long item, int action);
// //
bool SelectItem(long item); bool SelectItem(long item);
bool ScrollTo(long item); bool ScrollTo(long item);
bool DeleteAllItems(); bool DeleteAllItems();
@@ -228,7 +220,7 @@ public:
// wxImageList *CreateDragImage(long item); // wxImageList *CreateDragImage(long item);
bool SortChildren(long item); bool SortChildren(long item);
bool EnsureVisible(long item); bool EnsureVisible(long item);
void Command(wxCommandEvent& event) { ProcessCommand(event); }; void Command(wxCommandEvent& event) { ProcessCommand(event); };
protected: protected:

9
include/wx/msw/treectrl.h
View File

@@ -41,15 +41,6 @@ struct WXDLLEXPORT wxTreeViewItem;
// NB: all the following flags are for compatbility only and will be removed in the // NB: all the following flags are for compatbility only and will be removed in the
// next versions // next versions
// flags for deprecated `Expand(int action)'
enum
{
wxTREE_EXPAND_EXPAND,
wxTREE_EXPAND_COLLAPSE,
wxTREE_EXPAND_COLLAPSE_RESET,
wxTREE_EXPAND_TOGGLE
};
// flags for deprecated InsertItem() variant (their values are the same as of // flags for deprecated InsertItem() variant (their values are the same as of
// TVI_FIRST and TVI_LAST) // TVI_FIRST and TVI_LAST)
#define wxTREE_INSERT_FIRST 0xFFFF0001 #define wxTREE_INSERT_FIRST 0xFFFF0001

13
include/wx/os2/treectrl.h
View File

@@ -40,15 +40,6 @@ struct WXDLLEXPORT wxTreeViewItem;
// they're equivalent // they're equivalent
class wxTreeItemData; class wxTreeItemData;
// flags for deprecated `Expand(int action)'
enum
{
wxTREE_EXPAND_EXPAND,
wxTREE_EXPAND_COLLAPSE,
wxTREE_EXPAND_COLLAPSE_RESET,
wxTREE_EXPAND_TOGGLE
};
// flags for deprecated InsertItem() variant // flags for deprecated InsertItem() variant
#define wxTREE_INSERT_FIRST 0xFFFF0001 #define wxTREE_INSERT_FIRST 0xFFFF0001
#define wxTREE_INSERT_LAST 0xFFFF0002 #define wxTREE_INSERT_LAST 0xFFFF0002
@@ -67,7 +58,7 @@ public:
wxTreeCtrl() { Init(); } wxTreeCtrl() { Init(); }
wxTreeCtrl( wxWindow* pParent wxTreeCtrl( wxWindow* pParent
,wxWindowID vId = -1 ,wxWindowID vId = wxID_ANY
,const wxPoint& rPos = wxDefaultPosition ,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize ,const wxSize& rSize = wxDefaultSize
,long lStyle = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT ,long lStyle = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT
@@ -87,7 +78,7 @@ public:
virtual ~wxTreeCtrl(); virtual ~wxTreeCtrl();
bool Create( wxWindow* pParent bool Create( wxWindow* pParent
,wxWindowID vId = -1 ,wxWindowID vId = wxID_ANY
,const wxPoint& rPos = wxDefaultPosition ,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize ,const wxSize& rSize = wxDefaultSize
,long lStyle = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT ,long lStyle = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT

9
include/wx/palmos/treectrl.h
View File

@@ -35,15 +35,6 @@ struct WXDLLEXPORT wxTreeViewItem;
// NB: all the following flags are for compatbility only and will be removed in the // NB: all the following flags are for compatbility only and will be removed in the
// next versions // next versions
// flags for deprecated `Expand(int action)'
enum
{
wxTREE_EXPAND_EXPAND,
wxTREE_EXPAND_COLLAPSE,
wxTREE_EXPAND_COLLAPSE_RESET,
wxTREE_EXPAND_TOGGLE
};
// flags for deprecated InsertItem() variant (their values are the same as of // flags for deprecated InsertItem() variant (their values are the same as of
// TVI_FIRST and TVI_LAST) // TVI_FIRST and TVI_LAST)
#define wxTREE_INSERT_FIRST 0xFFFF0001 #define wxTREE_INSERT_FIRST 0xFFFF0001

9
include/wx/treebase.h
View File

@@ -28,6 +28,15 @@
#include "wx/event.h" #include "wx/event.h"
#include "wx/dynarray.h" #include "wx/dynarray.h"
// flags for deprecated `Expand(int action)', will be removed in next versions
enum
{
wxTREE_EXPAND_EXPAND,
wxTREE_EXPAND_COLLAPSE,
wxTREE_EXPAND_COLLAPSE_RESET,
wxTREE_EXPAND_TOGGLE
};
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxTreeItemId identifies an element of the tree. In this implementation, it's // wxTreeItemId identifies an element of the tree. In this implementation, it's
// just a trivial wrapper around Win32 HTREEITEM or a pointer to some private // just a trivial wrapper around Win32 HTREEITEM or a pointer to some private