added dependency handling to Makefiles

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

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index 1ed703e186506a9856d770a9922b075181c25dc3..4e737dc2f64ddce2994df3a26e5a367528421688 100644 (file)
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -20,7 +20,7 @@
 #include "wx/log.h"
 
 #include "wx/utils.h"
 #include "wx/log.h"
 
 #include "wx/utils.h"

-#ifdef __UNIX__
+#ifdef __DARWIN__

   #include "ldef/extldef.h"
 #else
   #include "extldef.h"
   #include "ldef/extldef.h"
 #else
   #include "extldef.h"


@@ -67,7 +67,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 

-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , kwxMacListWithVerticalScrollbar , 0 , 0, 
+       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , kwxMacListWithVerticalScrollbar , 0 , 0, 

                kControlListBoxProc , (long) this ) ;
        
        long    result ;
                kControlListBoxProc , (long) this ) ;
        
        long    result ;


@@ -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 ) ;