From 70e5dd6b562a6449cb30f6c35a8df4b32d928b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Tue, 4 Jul 2000 09:14:58 +0000
Subject: [PATCH] oops, previous commit was incomplete, fixed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/listctrl.cpp | 63 +++++++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index cd90667174..63e50fb380 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -2064,7 +2064,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         case WXK_DOWN:
         {
             int index = m_lines.Index(*m_current);
-            if (index != wxNOT_FOUND && (size_t)index < m_lines.GetCount()-2)
+            if (index != wxNOT_FOUND && (size_t)index < m_lines.GetCount()-1)
                 OnArrowChar( &m_lines[index+1], event.ShiftDown() );
             break;
         }
@@ -2080,50 +2080,59 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
                 OnArrowChar( &m_lines[0], event.ShiftDown() );
             break;
         }
-/*        case WXK_PRIOR: FIXME - finish porting
+        case WXK_PRIOR:
         {
             int steps = 0;
+            int index = m_lines.Index(*m_current);
             if (m_mode & wxLC_REPORT)
             {
                 steps = m_visibleLines-1;
             }
             else
             {
-                int pos = 0;
-                wxNode *node = m_lines.First();
-                for (;;) { if (m_current == (wxListLineData*)node->Data()) break; pos++; node = node->Next(); }
-                steps = pos % m_visibleLines;
+                steps = index % m_visibleLines;
+            }
+            if (index != wxNOT_FOUND)
+            {
+                index -= steps;
+                if (index < 0) index = 0;          
+                OnArrowChar( &m_lines[index], event.ShiftDown() );
             }
-            wxNode *node = m_lines.Member( m_current );
-            for (int i = 0; i < steps; i++) if (node->Previous()) node = node->Previous();
-            if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
             break;
         }
         case WXK_NEXT:
         {
             int steps = 0;
+            int index = m_lines.Index(*m_current);
             if (m_mode & wxLC_REPORT)
             {
                 steps = m_visibleLines-1;
             }
             else
             {
-                int pos = 0; wxNode *node = m_lines.First();
-                for (;;) { if (m_current == (wxListLineData*)node->Data()) break; pos++; node = node->Next(); }
-                steps = m_visibleLines-(pos % m_visibleLines)-1;
+                steps = m_visibleLines-(index % m_visibleLines)-1;
+            }
+
+            if (index != wxNOT_FOUND)
+            {
+                index += steps;
+                if ((size_t)index >= m_lines.GetCount()) 
+                    index = m_lines.GetCount()-1;
+                OnArrowChar( &m_lines[index], event.ShiftDown() );
             }
-            wxNode *node = m_lines.Member( m_current );
-            for (int i = 0; i < steps; i++) if (node->Next()) node = node->Next();
-            if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
             break;
         }
         case WXK_LEFT:
         {
             if (!(m_mode & wxLC_REPORT))
             {
-                wxNode *node = m_lines.Member( m_current );
-                for (int i = 0; i <m_visibleLines; i++) if (node->Previous()) node = node->Previous();
-                if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
+                int index = m_lines.Index(*m_current);
+                if (index != wxNOT_FOUND)
+                {
+                    index -= m_visibleLines;
+                    if (index < 0) index = 0;
+                    OnArrowChar( &m_lines[index], event.ShiftDown() );
+                }
             }
             break;
         }
@@ -2131,9 +2140,14 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         {
             if (!(m_mode & wxLC_REPORT))
             {
-                wxNode *node = m_lines.Member( m_current );
-                for (int i = 0; i <m_visibleLines; i++) if (node->Next()) node = node->Next();
-                if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
+                int index = m_lines.Index(*m_current);
+                if (index != wxNOT_FOUND)
+                {
+                    index += m_visibleLines;
+                    if ((size_t)index >= m_lines.GetCount()) 
+                        index = m_lines.GetCount()-1;
+                    OnArrowChar( &m_lines[index], event.ShiftDown() );
+                }
             }
             break;
         }
@@ -2160,8 +2174,9 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
             {
                 wxListLineData *oldCurrent = m_current;
                 m_current->ReverseHilight();
-                wxNode *node = m_lines.Member( m_current )->Next();
-                if (node) m_current = (wxListLineData*)node->Data();
+                int index = m_lines.Index( *m_current ) + 1;
+                if ( (size_t)index < m_lines.GetCount() )
+                    m_current = &m_lines[index];
                 RefreshLine( oldCurrent );
                 RefreshLine( m_current );
                 UnfocusLine( oldCurrent );
@@ -2179,7 +2194,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
             m_current->GetItem( 0, le.m_item );
             GetParent()->GetEventHandler()->ProcessEvent( le );
             break;
-        }*/
+        }
         default:
         {
             event.Skip();