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

Fix use of deprecated wxList/Node methods.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-19 22:10:19 +00:00
parent 1807c27dbc
commit ee6eb8d8ca
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/wincmn.cpp
View File

@@ -2230,7 +2230,7 @@ wxAccStatus wxWindowAccessible::GetLocation(wxRect& rect, int elementId)
{ {
if (elementId <= (int) GetWindow()->GetChildren().GetCount()) if (elementId <= (int) GetWindow()->GetChildren().GetCount())
{ {
win = (wxWindow*) GetWindow()->GetChildren().Nth(elementId-1)->GetData(); win = GetWindow()->GetChildren().Item(elementId-1)->GetData();
} }
else else
return wxACC_FAIL; return wxACC_FAIL;
@@ -2278,7 +2278,8 @@ wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId,
case wxNAVDIR_DOWN: case wxNAVDIR_DOWN:
case wxNAVDIR_NEXT: case wxNAVDIR_NEXT:
{ {
wxWindowList::compatibility_iterator node = NULL; wxWindowList::compatibility_iterator node =
wxWindowList::compatibility_iterator();
if (fromId == 0) if (fromId == 0)
{ {
// Can't navigate to sibling of this window // Can't navigate to sibling of this window
@@ -2296,7 +2297,7 @@ wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId,
if (node && node->GetNext()) if (node && node->GetNext())
{ {
wxWindow* nextWindow = (wxWindow*) node->GetNext()->Data(); wxWindow* nextWindow = node->GetNext()->GetData();
*toObject = nextWindow->GetOrCreateAccessible(); *toObject = nextWindow->GetOrCreateAccessible();
return wxACC_OK; return wxACC_OK;
} }
@@ -2307,7 +2308,8 @@ wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId,
case wxNAVDIR_UP: case wxNAVDIR_UP:
case wxNAVDIR_PREVIOUS: case wxNAVDIR_PREVIOUS:
{ {
wxWindowList::compatibility_iterator node = NULL; wxWindowList::compatibility_iterator node =
wxWindowList::compatibility_iterator();
if (fromId == 0) if (fromId == 0)
{ {
// Can't navigate to sibling of this window // Can't navigate to sibling of this window
@@ -2325,7 +2327,7 @@ wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId,
if (node && node->GetPrevious()) if (node && node->GetPrevious())
{ {
wxWindow* previousWindow = (wxWindow*) node->GetPrevious()->Data(); wxWindow* previousWindow = node->GetPrevious()->GetData();
*toObject = previousWindow->GetOrCreateAccessible(); *toObject = previousWindow->GetOrCreateAccessible();
return wxACC_OK; return wxACC_OK;
} }
@@ -2398,7 +2400,7 @@ wxAccStatus wxWindowAccessible::GetChild(int childId, wxAccessible** child)
if (childId > (int) GetWindow()->GetChildren().GetCount()) if (childId > (int) GetWindow()->GetChildren().GetCount())
return wxACC_FAIL; return wxACC_FAIL;
wxWindow* childWindow = (wxWindow*) GetWindow()->GetChildren().Nth(childId-1)->GetData(); wxWindow* childWindow = GetWindow()->GetChildren().Item(childId-1)->GetData();
*child = childWindow->GetOrCreateAccessible(); *child = childWindow->GetOrCreateAccessible();
if (*child) if (*child)
return wxACC_OK; return wxACC_OK;