AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no message

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (UG) 1998-10-25 07:37:45 +00:00
parent 0b4f9ee3d0
commit 42c5812dbf
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
samples/regtest/regtest.cpp
View File

@ -29,6 +29,7 @@
#include "wx/log.h"
#include "wx/treectrl.h"
#include "wx/msw/registry.h"
#include "wx/msw/imaglist.h"
// ----------------------------------------------------------------------------
// application type
@ -58,8 +59,7 @@ public:
};
// array of children of the node
struct TreeNode;
WX_DEFINE_ARRAY(TreeNode *, TreeChildren);
//class TreeNode;
// ----------------------------------------------------------------------------
// our control
@ -96,8 +96,10 @@ public:
private:
// structure describing a registry key/value
struct TreeNode
class TreeNode : public wxTreeItemData
{
WX_DEFINE_ARRAY(TreeNode *, TreeChildren);
public:
RegTreeCtrl *m_pTree; // must be !NULL
TreeNode *m_pParent; // NULL only for the root node
long m_id; // the id of the tree control item
@ -138,7 +140,7 @@ private:
wxImageList *m_imageList;
TreeNode *GetNode(const wxTreeEvent& event)
{ return (TreeNode *)GetItemData(event.m_item.m_itemId); }
{ return (TreeNode *)GetItemData((WXHTREEITEM)event.GetItem()); }
public:
// create a new node and insert it to the tree
@ -389,7 +391,7 @@ RegImageList::RegImageList() : wxImageList(16, 16, TRUE)
// should be in sync with enum RegImageList::RegIcon
static const char *aszIcons[] = { "key1","key2","key3","value1","value2" };
wxString str = "icon_";
for ( uint n = 0; n < WXSIZEOF(aszIcons); n++ ) {
for ( unsigned int n = 0; n < WXSIZEOF(aszIcons); n++ ) {
Add(wxIcon(str + aszIcons[n], wxBITMAP_TYPE_ICO_RESOURCE));
}
}
@ -418,9 +420,7 @@ RegTreeCtrl::TreeNode *RegTreeCtrl::InsertNewTreeNode(TreeNode *pParent,
wxASSERT_MSG( pNewNode->m_id, "can't create tree control item!");
// save the pointer in the item
if ( !SetItemData(pNewNode->m_id, (long)pNewNode) ) {
wxFAIL_MSG("can't store item's data in tree control!");
}
SetItemData(pNewNode->m_id, pNewNode);
// add it to the list of parent's children
if ( pParent != NULL ) {
@ -461,7 +461,7 @@ RegTreeCtrl::~RegTreeCtrl()
void RegTreeCtrl::AddStdKeys()
{
for ( uint ui = 0; ui < wxRegKey::nStdKeys; ui++ ) {
for ( unsigned int ui = 0; ui < wxRegKey::nStdKeys; ui++ ) {
InsertNewTreeNode(m_pRoot, wxRegKey::GetStdKeyName(ui));
}
}
@ -541,7 +541,7 @@ void RegTreeCtrl::OnSelChanged(wxTreeEvent& event)
void RegTreeCtrl::OnItemExpanding(wxTreeEvent& event)
{
TreeNode *pNode = GetNode(event);
bool bExpanding = event.m_code == wxTREE_EXPAND_EXPAND;
bool bExpanding = event.GetCode() == wxTREE_EXPAND_EXPAND;
// expansion might take some time
wxSetCursor(*wxHOURGLASS_CURSOR);
@ -563,7 +563,7 @@ void RegTreeCtrl::OnItemExpanding(wxTreeEvent& event)
if ( !pNode->IsRoot() ) {
int idIcon = bExpanding ? RegImageList::OpenedKey
: RegImageList::ClosedKey;
SetItemImage(pNode->Id(), idIcon, idIcon);
SetItemImage(pNode->Id(), idIcon);
}
}
@ -578,7 +578,7 @@ bool RegTreeCtrl::TreeNode::OnExpand()
{
// remove dummy item
if ( m_lDummy != 0 ) {
m_pTree->DeleteItem(m_lDummy);
m_pTree->Delete(m_lDummy);
m_lDummy = 0;
}
else {
@ -691,11 +691,11 @@ void RegTreeCtrl::TreeNode::AddDummy()
void RegTreeCtrl::TreeNode::DestroyChildren()
{
// destroy all children
uint nCount = m_aChildren.Count();
for ( uint n = 0; n < nCount; n++ ) {
long lId = m_aChildren[n]->Id();
unsigned int nCount = m_aChildren.Count();
for ( unsigned int n = 0; n < nCount; n++ ) {
long lId = m_aChildren[n]->Id();
delete m_aChildren[n];
m_pTree->DeleteItem(lId);
m_pTree->Delete(lId);
}
m_aChildren.Empty();

8
src/msw/treectrl.cpp
View File

@ -545,7 +545,8 @@ wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parent,
void wxTreeCtrl::Delete(const wxTreeItemId& item)
{
wxTreeItemData *data = GetItemData(item);
delete data; // may be NULL, ok
if(data!=NULL)
delete data; // may be NULL, ok
if ( !TreeView_DeleteItem(wxhWnd, (HTREEITEM)(WXHTREEITEM)item) )
{
@ -612,6 +613,11 @@ void wxTreeCtrl::Toggle(const wxTreeItemId& item)
DoExpand(item, TVE_TOGGLE);
}
void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
{
DoExpand(item, action);
}
void wxTreeCtrl::Unselect()
{
SelectItem(wxTreeItemId((WXHTREEITEM) 0));