Fix use of deprecated wxList/Node methods.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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