use RemoveAt instead of Remove

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 67aee1e9283c6ce7150168c3bc4c39dc471a520c..0559853584c689fc3381eff7121132f3fd216b37 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -92,7 +92,7 @@ void wxChoice::Delete(int n)
 
     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
     m_strings.Remove( n ) ;
 
     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
     m_strings.Remove( n ) ;

-    m_datas.Remove( n ) ;
+    m_datas.RemoveAt( n ) ;

        SetControlMaximum( m_macControl , GetCount()) ;
 }
 
        SetControlMaximum( m_macControl , GetCount()) ;
 }
 

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 05cc0e249a6927baa3f82ebd2461c8aa253ea602..4624d820db78118eedba18893cf8806bef05d971 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -166,7 +166,7 @@ void wxListBox::Delete(int N)
     }
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
        m_stringArray.Remove( N ) ;
     }
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
        m_stringArray.Remove( N ) ;

-       m_dataArray.Remove( N ) ;
+       m_dataArray.RemoveAt( N ) ;

        m_noItems --;
        
        MacDelete( N ) ;
        m_noItems --;
        
        MacDelete( N ) ;

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index 3e6277ac5b38967c371269ee66a201d8fb37ed7d..d1d5a8477190f5060b1a025fefb1b0ddb236774a 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -140,7 +140,7 @@ void wxMenu::UpdateAccel(wxMenuItem *item)
         if ( accel )
             m_accels[n] = accel;
         else
         if ( accel )
             m_accels[n] = accel;
         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
 #endif // wxUSE_ACCEL
     }
     //else: this item doesn't have an accel, nothing to do
 #endif // wxUSE_ACCEL

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 9d0b2c4593ac775fe13c9b03577f2de74319bc1d..ec38c6230c31b0f30ed72405dd06d987b6400843 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 #ifdef __GNUG__
 // headers
 // ----------------------------------------------------------------------------
 #ifdef __GNUG__

-#pragma implementation "notebook.h"
+  #pragma implementation "notebook.h"

 #endif
 
 #include  <wx/string.h>
 #endif
 
 #include  <wx/string.h>


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

-    m_pages.Remove(nPage);
+    m_pages.RemoveAt(nPage);

 
     MacSetupTabs();
 
 
     MacSetupTabs();
 

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index 67aee1e9283c6ce7150168c3bc4c39dc471a520c..0559853584c689fc3381eff7121132f3fd216b37 100644 (file)
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -92,7 +92,7 @@ void wxChoice::Delete(int n)
 
     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
     m_strings.Remove( n ) ;
 
     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
     m_strings.Remove( n ) ;

-    m_datas.Remove( n ) ;
+    m_datas.RemoveAt( n ) ;

        SetControlMaximum( m_macControl , GetCount()) ;
 }
 
        SetControlMaximum( m_macControl , GetCount()) ;
 }
 

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index 05cc0e249a6927baa3f82ebd2461c8aa253ea602..4624d820db78118eedba18893cf8806bef05d971 100644 (file)
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -166,7 +166,7 @@ void wxListBox::Delete(int N)
     }
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
        m_stringArray.Remove( N ) ;
     }
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
        m_stringArray.Remove( N ) ;

-       m_dataArray.Remove( N ) ;
+       m_dataArray.RemoveAt( N ) ;

        m_noItems --;
        
        MacDelete( N ) ;
        m_noItems --;
        
        MacDelete( N ) ;

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index 3e6277ac5b38967c371269ee66a201d8fb37ed7d..d1d5a8477190f5060b1a025fefb1b0ddb236774a 100644 (file)
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -140,7 +140,7 @@ void wxMenu::UpdateAccel(wxMenuItem *item)
         if ( accel )
             m_accels[n] = accel;
         else
         if ( accel )
             m_accels[n] = accel;
         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
 #endif // wxUSE_ACCEL
     }
     //else: this item doesn't have an accel, nothing to do
 #endif // wxUSE_ACCEL

diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp
index 9d0b2c4593ac775fe13c9b03577f2de74319bc1d..ec38c6230c31b0f30ed72405dd06d987b6400843 100644 (file)
--- a/src/mac/notebmac.cpp
+++ b/src/mac/notebmac.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 #ifdef __GNUG__
 // headers
 // ----------------------------------------------------------------------------
 #ifdef __GNUG__

-#pragma implementation "notebook.h"
+  #pragma implementation "notebook.h"

 #endif
 
 #include  <wx/string.h>
 #endif
 
 #include  <wx/string.h>


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

-    m_pages.Remove(nPage);
+    m_pages.RemoveAt(nPage);

 
     MacSetupTabs();
 
 
     MacSetupTabs();