fix for focus handling when deleting the items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -196,7 +196,6 @@ protected:
 | 
				
			|||||||
    virtual wxListItemAttr *OnGetItemAttr(long item) const;
 | 
					    virtual wxListItemAttr *OnGetItemAttr(long item) const;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // it calls our OnGetXXX() functions
 | 
					    // it calls our OnGetXXX() functions
 | 
				
			||||||
 | 
					 | 
				
			||||||
    friend class WXDLLEXPORT wxListMainWindow;
 | 
					    friend class WXDLLEXPORT wxListMainWindow;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
private:
 | 
					private:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3813,10 +3813,16 @@ void wxListMainWindow::DeleteItem( long lindex )
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    size_t index = (size_t)lindex;
 | 
					    size_t index = (size_t)lindex;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // select the next item when the selected one is deleted
 | 
					    // we don't need to adjust the index for the previous items
 | 
				
			||||||
    if ( m_current >= index )
 | 
					    if ( HasCurrent() && m_current >= index )
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        m_current--;
 | 
					        // if the current item is being deleted, we want the next one to
 | 
				
			||||||
 | 
					        // become selected - unless there is no next one - so don't adjust
 | 
				
			||||||
 | 
					        // m_current in this case
 | 
				
			||||||
 | 
					        if ( m_current != index || m_current == count - 1 )
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            m_current--;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if ( InReportView() )
 | 
					    if ( InReportView() )
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user