use RemoveAt instead of Remove

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-07-08 13:47:31 +00:00
parent 31523f511c
commit 3ef585df0c
8 changed files with 12 additions and 12 deletions

View File

@@ -92,7 +92,7 @@ void wxChoice::Delete(int n)
::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ; ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
m_strings.Remove( n ) ; m_strings.Remove( n ) ;
m_datas.Remove( n ) ; m_datas.RemoveAt( n ) ;
SetControlMaximum( m_macControl , GetCount()) ; SetControlMaximum( m_macControl , GetCount()) ;
} }

View File

@@ -166,7 +166,7 @@ void wxListBox::Delete(int N)
} }
#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
m_stringArray.Remove( N ) ; m_stringArray.Remove( N ) ;
m_dataArray.Remove( N ) ; m_dataArray.RemoveAt( N ) ;
m_noItems --; m_noItems --;
MacDelete( N ) ; MacDelete( N ) ;

View File

@@ -140,7 +140,7 @@ void wxMenu::UpdateAccel(wxMenuItem *item)
if ( accel ) if ( accel )
m_accels[n] = accel; m_accels[n] = accel;
else else
m_accels.Remove(n); m_accels.RemoveAt(n);
} }
if ( IsAttached() ) if ( IsAttached() )
@@ -269,7 +269,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
{ {
delete m_accels[n]; delete m_accels[n];
m_accels.Remove(n); m_accels.RemoveAt(n);
} }
//else: this item doesn't have an accel, nothing to do //else: this item doesn't have an accel, nothing to do
#endif // wxUSE_ACCEL #endif // wxUSE_ACCEL

View File

@@ -202,7 +202,7 @@ wxNotebookPage* wxNotebook::DoRemovePage(int nPage)
{ {
wxCHECK( IS_VALID_PAGE(nPage), NULL ); wxCHECK( IS_VALID_PAGE(nPage), NULL );
wxNotebookPage* page = m_pages[nPage] ; wxNotebookPage* page = m_pages[nPage] ;
m_pages.Remove(nPage); m_pages.RemoveAt(nPage);
MacSetupTabs(); MacSetupTabs();

View File

@@ -92,7 +92,7 @@ void wxChoice::Delete(int n)
::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ; ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
m_strings.Remove( n ) ; m_strings.Remove( n ) ;
m_datas.Remove( n ) ; m_datas.RemoveAt( n ) ;
SetControlMaximum( m_macControl , GetCount()) ; SetControlMaximum( m_macControl , GetCount()) ;
} }

View File

@@ -166,7 +166,7 @@ void wxListBox::Delete(int N)
} }
#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
m_stringArray.Remove( N ) ; m_stringArray.Remove( N ) ;
m_dataArray.Remove( N ) ; m_dataArray.RemoveAt( N ) ;
m_noItems --; m_noItems --;
MacDelete( N ) ; MacDelete( N ) ;

View File

@@ -140,7 +140,7 @@ void wxMenu::UpdateAccel(wxMenuItem *item)
if ( accel ) if ( accel )
m_accels[n] = accel; m_accels[n] = accel;
else else
m_accels.Remove(n); m_accels.RemoveAt(n);
} }
if ( IsAttached() ) if ( IsAttached() )
@@ -269,7 +269,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
{ {
delete m_accels[n]; delete m_accels[n];
m_accels.Remove(n); m_accels.RemoveAt(n);
} }
//else: this item doesn't have an accel, nothing to do //else: this item doesn't have an accel, nothing to do
#endif // wxUSE_ACCEL #endif // wxUSE_ACCEL

View File

@@ -202,7 +202,7 @@ wxNotebookPage* wxNotebook::DoRemovePage(int nPage)
{ {
wxCHECK( IS_VALID_PAGE(nPage), NULL ); wxCHECK( IS_VALID_PAGE(nPage), NULL );
wxNotebookPage* page = m_pages[nPage] ; wxNotebookPage* page = m_pages[nPage] ;
m_pages.Remove(nPage); m_pages.RemoveAt(nPage);
MacSetupTabs(); MacSetupTabs();