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

Added wxTreeCtrl::GetItemParent to deprecate GetParent.

Browse Source 
Moved GetParent into WX_COMPAT_2_2 and exposed base GetParent in
that case too.

Replaced all lib/sample uses of wxTC::GetParent with GetItemParent.

Updated docs to suit.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2002-12-29 07:48:21 +00:00
parent 5cc29dd12d
commit ad99843335
19 changed files with 62 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/utils/convertrc/wxr2xml.h
View File

@@ -8,6 +8,9 @@
#include <wx/ffile.h>
#include "wx/resource.h"
#if !wxUSE_WX_RESOURCES
#error "convertc requires wxUSE_WX_RESOURCES"
#endif // wxUSE_WX_RESOURCES
class wxr2xml : public wxObject
{

14
contrib/utils/wxrcedit/editor.cpp
View File

@@ -488,14 +488,14 @@ void EditorFrame::OnTreeSel(wxTreeEvent& event)
if (node)
PropertiesFrame::Get()->ShowProps(node);
if (m_TreeCtrl->GetParent(event.GetItem()) == m_TreeCtrl->GetRootItem())
if (m_TreeCtrl->GetItemParent(event.GetItem()) == m_TreeCtrl->GetRootItem())
{
wxTreeItemId it = event.GetOldItem();
if (it.IsOk() && m_TreeCtrl->GetRootItem() != it)
{
while (m_TreeCtrl->GetParent(it) != m_TreeCtrl->GetRootItem())
it = m_TreeCtrl->GetParent(it);
while (m_TreeCtrl->GetItemParent(it) != m_TreeCtrl->GetRootItem())
it = m_TreeCtrl->GetItemParent(it);
m_TreeCtrl->Collapse(it);
}
RecursivelyExpand(m_TreeCtrl, event.GetItem());
@@ -563,7 +563,7 @@ void EditorFrame::OnToolbar(wxCommandEvent& event)
void EditorFrame::DeleteSelectedNode()
{
XmlTreeData *dt = (XmlTreeData*)
(m_TreeCtrl->GetItemData(m_TreeCtrl->GetParent(m_TreeCtrl->GetSelection())));
(m_TreeCtrl->GetItemData(m_TreeCtrl->GetItemParent(m_TreeCtrl->GetSelection())));
wxXmlNode *n = (dt) ? dt->Node : NULL;
m_SelectedNode->GetParent()->RemoveChild(m_SelectedNode);
@@ -579,7 +579,7 @@ void EditorFrame::OnNewNode(wxCommandEvent& event)
{
XmlTreeData *pardt =
(XmlTreeData*)(m_TreeCtrl->GetItemData(
m_TreeCtrl->GetParent(m_TreeCtrl->GetSelection())));
m_TreeCtrl->GetItemParent(m_TreeCtrl->GetSelection())));
if (pardt && pardt->Node && pardt->Node != m_Resource->GetRoot())
{
@@ -683,7 +683,7 @@ void EditorFrame::OnRightClickTree(wxPoint pos)
XmlTreeData *pardt =
(XmlTreeData*)(m_TreeCtrl->GetItemData(
m_TreeCtrl->GetParent(m_TreeCtrl->GetSelection())));
m_TreeCtrl->GetItemParent(m_TreeCtrl->GetSelection())));
if (pardt && pardt->Node && pardt->Node != m_Resource->GetRoot())
{
wxXmlNode *nd = pardt->Node;
@@ -748,7 +748,7 @@ void EditorFrame::OnClipboardAction(wxCommandEvent& event)
{
XmlTreeData *pardt =
(XmlTreeData*)(m_TreeCtrl->GetItemData(
m_TreeCtrl->GetParent(m_TreeCtrl->GetSelection())));
m_TreeCtrl->GetItemParent(m_TreeCtrl->GetSelection())));
if (pardt && pardt->Node && pardt->Node != m_Resource->GetRoot())
{

6
contrib/utils/wxrcedit/pe_basic.cpp
View File

@@ -172,7 +172,7 @@ class PropEditCtrlCoordXY : public PropEditCtrlInt
wxString prev = XmlReadValue(GetNode(), m_PropInfo->Name);
if (prev[prev.Len()-1] == _T('d')) s << _T('d');
XmlWriteValue(GetNode(), m_PropInfo->Name, s);
m_TreeCtrl->SetItemBold(m_TreeCtrl->GetParent(m_TreeItem), TRUE);
m_TreeCtrl->SetItemBold(m_TreeCtrl->GetItemParent(m_TreeItem), TRUE);
}
virtual wxString GetValueAsText(wxTreeItemId ti)
@@ -228,7 +228,7 @@ class PropEditCtrlCoordDlg : public PropEditCtrlBool
wxString s = XmlReadValue(GetNode(), m_PropInfo->Name).BeforeFirst(_T('d'));
if (m_Choice->GetSelection() == 1) s << _T('d');
XmlWriteValue(GetNode(), m_PropInfo->Name, s);
m_TreeCtrl->SetItemBold(m_TreeCtrl->GetParent(m_TreeItem), TRUE);
m_TreeCtrl->SetItemBold(m_TreeCtrl->GetItemParent(m_TreeItem), TRUE);
}
virtual wxString GetValueAsText(wxTreeItemId ti)
@@ -309,7 +309,7 @@ class PropEditCtrlDimX : public PropEditCtrlInt
s = m_c;
if (dlg) s << _T('d');
XmlWriteValue(GetNode(), m_PropInfo->Name, s);
m_TreeCtrl->SetItemBold(m_TreeCtrl->GetParent(m_TreeItem), TRUE);
m_TreeCtrl->SetItemBold(m_TreeCtrl->GetItemParent(m_TreeItem), TRUE);
}
virtual wxString GetValueAsText(wxTreeItemId ti)