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

fixes for deprecated warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-20 14:01:00 +00:00
parent 284fa852b4
commit 2d75caaa6d
5 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/generic/dirctrlg.cpp
View File

@@ -651,7 +651,7 @@ void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId)
return;
data->m_isExpanded = FALSE;
long cookie;
wxTreeItemIdValue cookie;
/* Workaround because DeleteChildren has disapeared (why?) and
* CollapseAndReset doesn't work as advertised (deletes parent too) */
child = m_treeCtrl->GetFirstChild(parentId, cookie);
@@ -828,7 +828,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
path2.MakeLower();
#endif
long cookie;
wxTreeItemIdValue cookie;
wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie);
while (childId.IsOk())
{
@@ -890,7 +890,7 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
if ((GetWindowStyle() & wxDIRCTRL_SELECT_FIRST) && data->m_isDir)
{
// Find the first file in this directory
long cookie;
wxTreeItemIdValue cookie;
wxTreeItemId childId = m_treeCtrl->GetFirstChild(lastId, cookie);
bool selectedChild = FALSE;
while (childId.IsOk())

10
src/generic/treectlg.cpp
View File

@@ -1615,7 +1615,7 @@ void wxGenericTreeCtrl::ExpandAll(const wxTreeItemId& item)
return;
}
long cookie;
wxTreeItemIdValue cookie;
wxTreeItemId child = GetFirstChild(item, cookie);
while ( child.IsOk() )
{
@@ -2696,7 +2696,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
}
if (prev)
{
long cookie = 0;
wxTreeItemIdValue cookie;
wxTreeItemId current = m_key_current;
// TODO: Huh? If we get here, we'd better be the first child of our parent. How else could it be?
if (current == GetFirstChild( prev, cookie ))
@@ -2751,7 +2751,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
{
if (IsExpanded(m_key_current) && HasChildren(m_key_current))
{
long cookie = 0;
wxTreeItemIdValue cookie;
wxTreeItemId child = GetFirstChild( m_key_current, cookie );
SelectItem( child, unselect_others, extended_select );
m_key_current=(wxGenericTreeItem*) child.m_pItem;
@@ -2811,8 +2811,8 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
if ( HasFlag(wxTR_HIDE_ROOT) )
{
long dummy;
prev = GetFirstChild(prev, dummy);
wxTreeItemIdValue cookie;
prev = GetFirstChild(prev, cookie);
if (!prev)
break;
}