fatal bug in wxSplitPath fixed

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

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index ae89e0bcab84e46b6af8bed6c3e8c37e3edbc1af..c518ad035ccb495731dd670ffaf0ce91a5874f3e 100644 (file)
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -68,8 +68,8 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
        UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
 
        NewExtLDEFInfo( m_macList , MacDrawStringCell , (long) this ) ;
-       (**m_macList).selFlags = lOnlyOne ;
-       if ( style  & wxLB_MULTIPLE )
+       (**m_macList).selFlags = 0 ;
+       if ( style & wxLB_MULTIPLE )
        {
                (**m_macList).selFlags += lNoExtend ;
        }
@@ -77,6 +77,10 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
        {
                (**m_macList).selFlags += lExtendDrag ;
        }
+       else
+       {
+               (**m_macList).selFlags = lOnlyOne ;
+       }
        Point pt = (**m_macList).cellSize ;
        pt.v = 14 ;
        LCellSize( pt , m_macList ) ;
@@ -151,6 +155,7 @@ void wxListBox::Delete(int N)
     }
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
        m_stringArray.Remove( N ) ;
+       m_dataArray.Remove( N ) ;
        m_noItems --;
        
        MacDelete( N ) ;
@@ -185,7 +190,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
             wxASSERT_MSG(clientData[i] == NULL,
                          wxT("Can't use client data with owner-drawn listboxes"));
 #else // !wxUSE_OWNER_DRAWN
-               Append( choices[i] , clientData[0] ) ;
+               Append( choices[i] , clientData[i] ) ;
  #endif
        }
        else
@@ -298,7 +303,16 @@ void wxListBox::DoSetItemClientData(int N, void *Client_data)
         wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
     }
 #endif // wxUSE_OWNER_DRAWN
-    m_dataArray[N] = (char*) Client_data ;
+       wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ;
+       
+       if ( m_dataArray.GetCount() > N )
+       {
+       m_dataArray[N] = (char*) Client_data ;
+       }
+    else
+    {
+       m_dataArray.Add( (char*) Client_data ) ;
+    }
 }
 
 void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
@@ -369,7 +383,7 @@ void wxListBox::SetString(int N, const wxString& s)
        MacSet( N , s ) ;
 }
 
-wxSize wxListBox::DoGetBestSize()
+wxSize wxListBox::DoGetBestSize() const
 {
     return wxSize(100, 100);
 }