Updated to new PyCrust

[wxWidgets.git] / src / mac / carbon / listbox.cpp

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 780e28bc7ede7989d76df389dcdf7c0316c201e3..cb3a39dbd99f3a5c085d5148b0e3acd8cd7e2206 100644 (file)
--- 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
 
 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 ;
 
 extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
 const short kwxMacListWithVerticalScrollbar = 128 ;


@@ -195,7 +195,7 @@ void wxListBox::Delete(int N)
 
 #if wxUSE_OWNER_DRAWN
     delete m_aItems[N];
 
 #if wxUSE_OWNER_DRAWN
     delete m_aItems[N];

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

 #else // !wxUSE_OWNER_DRAWN
     if ( HasClientObjectData() )
     {
 #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 ( 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 )
            {
                s.MakeLower() ;
                    for ( int i = 0 ; i < m_noItems ; ++i )