X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/60149370ac34d59e136a3aab6b00388d8306ae8d..176e7e8321b9678afc493b51a62525af8ad52469:/src/mac/carbon/listbox.cpp

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 780e28bc7e..502394e18a 100644
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -32,7 +32,7 @@ BEGIN_EVENT_TABLE(wxListBox, wxControl)
 END_EVENT_TABLE()
 #endif
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
 extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
 const short kwxMacListWithVerticalScrollbar = 128 ;
@@ -99,10 +99,10 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 #else
     long	result ;
 
-    m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false ,
+    m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false ,
 				  kwxMacListWithVerticalScrollbar , 0 , 0, 
 				  kControlListBoxProc , (long) this ) ;
-    UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
+    ::GetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
 		       sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
 
     HLock( (Handle) m_macList ) ;
@@ -195,7 +195,7 @@ void wxListBox::Delete(int N)
 
 #if wxUSE_OWNER_DRAWN
     delete m_aItems[N];
-    m_aItems.Remove(N);
+    m_aItems.RemoveAt(N);
 #else // !wxUSE_OWNER_DRAWN
     if ( HasClientObjectData() )
     {
@@ -308,7 +308,7 @@ int wxListBox::FindString(const wxString& st) const
 	    	if ( EqualString( s1 , s2 , false , false ) )
 	    		return i ;
 	    }
-	    if ( s.Left(1) = "*" && s.Length() > 1 )
+	    if ( s.Left(1) == "*" && s.Length() > 1 )
 	    {
 	    	s.MakeLower() ;
 		    for ( int i = 0 ; i < m_noItems ; ++i )
@@ -664,7 +664,7 @@ void wxListBox::MacHandleControlClick( ControlHandle control , SInt16 controlpar
 	Boolean wasDoubleClick = false ;
 	long	result ;
 
-	UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
+	::GetControlData( m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
 	if ( !wasDoubleClick )
 	{
 		MacDoClick() ;