changed Remove to RemoveAt

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 86d75eb0da14405232ad9e54bc81eb293ff67f50..fdd9b43da6c49ac2135d59a0441b2b6d265cc6be 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -105,7 +105,7 @@ void wxChoice::Delete(int n)
         delete GetClientObject(n);
     }
     ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;
         delete GetClientObject(n);
     }
     ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;

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

     m_datas.RemoveAt( n ) ;
     SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
 }
     m_datas.RemoveAt( n ) ;
     SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
 }

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index 70ea0b4fba74f944185fc5b29c7e0db842666542..83d1d2420a8fb755cbdd46668faa76683b7f5b63 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -755,7 +755,7 @@ wxMenu *wxMenuBar::Remove(size_t pos)
         Refresh();
     }
 
         Refresh();
     }
 

-    m_titles.Remove(pos);
+    m_titles.RemoveAt(pos);

 
     return menu;
 }
 
     return menu;
 }

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index 86d75eb0da14405232ad9e54bc81eb293ff67f50..fdd9b43da6c49ac2135d59a0441b2b6d265cc6be 100644 (file)
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -105,7 +105,7 @@ void wxChoice::Delete(int n)
         delete GetClientObject(n);
     }
     ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;
         delete GetClientObject(n);
     }
     ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;

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

     m_datas.RemoveAt( n ) ;
     SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
 }
     m_datas.RemoveAt( n ) ;
     SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
 }

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index 70ea0b4fba74f944185fc5b29c7e0db842666542..83d1d2420a8fb755cbdd46668faa76683b7f5b63 100644 (file)
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -755,7 +755,7 @@ wxMenu *wxMenuBar::Remove(size_t pos)
         Refresh();
     }
 
         Refresh();
     }
 

-    m_titles.Remove(pos);
+    m_titles.RemoveAt(pos);

 
     return menu;
 }
 
     return menu;
 }