diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp index 67aee1e928..0559853584 100644 --- 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 ) ; - m_datas.Remove( n ) ; + m_datas.RemoveAt( n ) ; SetControlMaximum( m_macControl , GetCount()) ; } diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp index 05cc0e249a..4624d820db 100644 --- 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 ) ; - m_dataArray.Remove( N ) ; + m_dataArray.RemoveAt( N ) ; m_noItems --; MacDelete( N ) ; diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp index 3e6277ac5b..d1d5a84771 100644 --- 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 - m_accels.Remove(n); + m_accels.RemoveAt(n); } if ( IsAttached() ) @@ -269,7 +269,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) { 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 diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp index 9d0b2c4593..ec38c6230c 100644 --- a/src/mac/carbon/notebmac.cpp +++ b/src/mac/carbon/notebmac.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- #ifdef __GNUG__ -#pragma implementation "notebook.h" + #pragma implementation "notebook.h" #endif #include @@ -202,7 +202,7 @@ wxNotebookPage* wxNotebook::DoRemovePage(int nPage) { wxCHECK( IS_VALID_PAGE(nPage), NULL ); wxNotebookPage* page = m_pages[nPage] ; - m_pages.Remove(nPage); + m_pages.RemoveAt(nPage); MacSetupTabs(); diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp index 67aee1e928..0559853584 100644 --- 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 ) ; - m_datas.Remove( n ) ; + m_datas.RemoveAt( n ) ; SetControlMaximum( m_macControl , GetCount()) ; } diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp index 05cc0e249a..4624d820db 100644 --- 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 ) ; - m_dataArray.Remove( N ) ; + m_dataArray.RemoveAt( N ) ; m_noItems --; MacDelete( N ) ; diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp index 3e6277ac5b..d1d5a84771 100644 --- 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 - m_accels.Remove(n); + m_accels.RemoveAt(n); } if ( IsAttached() ) @@ -269,7 +269,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) { 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 diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp index 9d0b2c4593..ec38c6230c 100644 --- a/src/mac/notebmac.cpp +++ b/src/mac/notebmac.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- #ifdef __GNUG__ -#pragma implementation "notebook.h" + #pragma implementation "notebook.h" #endif #include @@ -202,7 +202,7 @@ wxNotebookPage* wxNotebook::DoRemovePage(int nPage) { wxCHECK( IS_VALID_PAGE(nPage), NULL ); wxNotebookPage* page = m_pages[nPage] ; - m_pages.Remove(nPage); + m_pages.RemoveAt(nPage); MacSetupTabs();