setting clipping correctly

[wxWidgets.git] / src / cocoa / listbox.mm

diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm
index ff2428eb6419fd6da9dacc1cfa8c42c5592e0e2c..c24e9b9439dca8fa95d598e7d960fbcfcf8331d5 100644 (file)
--- a/src/cocoa/listbox.mm
+++ b/src/cocoa/listbox.mm
@@ -1,19 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/listbox.mm
+// Name:        src/cocoa/listbox.mm
 // Purpose:     wxListBox
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18
-// RCS-ID:      $Id: 
+// Id:          $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:    wxWindows license
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
+#if wxUSE_LISTBOX
+
+#include "wx/listbox.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
-    #include "wx/listbox.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/string.h"
@@ -52,6 +56,28 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
             const wxValidator& validator,
             const wxString& name)
 {
+/*
+wxLB_SINGLE
+Single-selection list.
+
+wxLB_MULTIPLE
+Multiple-selection list: the user can toggle multiple items on and off.
+
+wxLB_EXTENDED
+Extended-selection list: the user can select multiple items using the SHIFT key and the mouse or special key combinations.
+
+wxLB_HSCROLL
+Create horizontal scrollbar if contents are too wide (Windows only).
+
+wxLB_ALWAYS_SB
+Always show a vertical scrollbar.
+
+wxLB_NEEDED_SB
+Only create a vertical scrollbar if needed.
+
+wxLB_SORT
+The listbox contents are sorted in alphabetical order.
+*/
     wxAutoNSAutoreleasePool pool;
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
@@ -89,6 +115,13 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
     CocoaCreateNSScrollView();
     SetInitialFrameRect(pos,size);
 
+    // Set up extended/multiple selection flags
+    if ((style & wxLB_EXTENDED) || (style & wxLB_MULTIPLE))
+        //diff is that mult requires shift down for multi selection
+        [GetNSTableView() setAllowsMultipleSelection:true];
+
+    [GetNSTableView() setAllowsColumnSelection:false];
+
     return true;
 }
 
@@ -117,7 +150,7 @@ bool wxListBox::IsSelected(int n) const
     return [GetNSTableView() isRowSelected: n];
 }
 
-void wxListBox::SetSelection(int n, bool select)
+void wxListBox::DoSetSelection(int n, bool select)
 {
     if(select)
         [GetNSTableView() selectRow: n byExtendingSelection:NO];
@@ -136,8 +169,10 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const
     return [GetNSTableView() numberOfSelectedRows];
 }
 
-void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
 {
+    wxAutoNSAutoreleasePool pool;
+
     for(int i=int(items.GetCount())-1; i >= 0; i--)
     {
         [m_cocoaItems insertObject: wxNSStringWithWxString(items[i])
@@ -149,11 +184,13 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 
 void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
 {
+    wxAutoNSAutoreleasePool pool;
+
     // Remove everything
     [m_cocoaItems removeAllObjects];
     m_itemClientData.Clear();
     // Provide the data
-    for(size_t i=0; i < items.GetCount(); i++)
+    for(unsigned int i=0; i < items.GetCount(); i++)
     {
         [m_cocoaItems addObject: wxNSStringWithWxString(items[i])];
         m_itemClientData.Add(clientData[i]);
@@ -163,6 +200,11 @@ void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
 
 void wxListBox::DoSetFirstItem(int n)
 {
+    [m_cocoaItems exchangeObjectAtIndex:0 withObjectAtIndex:n];
+    void* pOld = m_itemClientData[n];
+    m_itemClientData[n] = m_itemClientData[0];
+    m_itemClientData[0] = pOld;
+    [GetNSTableView() reloadData];
 }
 
 
@@ -170,62 +212,77 @@ void wxListBox::DoSetFirstItem(int n)
     // deleting items
 void wxListBox::Clear()
 {
+    [m_cocoaItems removeAllObjects];
+    m_itemClientData.Clear();
+    [GetNSTableView() reloadData];
 }
 
-void wxListBox::Delete(int n)
+void wxListBox::Delete(unsigned int n)
 {
+    [m_cocoaItems removeObjectAtIndex:n];
+    m_itemClientData.RemoveAt(n);
+    [GetNSTableView() reloadData];
 }
 
     // accessing strings
-int wxListBox::GetCount() const
+unsigned int wxListBox::GetCount() const
 {
-    return 0;
+    return (unsigned int)[m_cocoaItems count];
 }
 
-wxString wxListBox::GetString(int n) const
+wxString wxListBox::GetString(unsigned int n) const
 {
-    return wxEmptyString;
+    return wxStringWithNSString([m_cocoaItems objectAtIndex:n]);
 }
 
-void wxListBox::SetString(int n, const wxString& s)
+void wxListBox::SetString(unsigned int n, const wxString& s)
 {
+    wxAutoNSAutoreleasePool pool;
+    [m_cocoaItems removeObjectAtIndex:n];
+    [m_cocoaItems insertObject: wxNSStringWithWxString(s) atIndex: n];
+    [GetNSTableView() reloadData];
 }
 
-int wxListBox::FindString(const wxString& s) const
+int wxListBox::FindString(const wxString& s, bool bCase) const
 {
-    return 0;
+    // FIXME: use wxItemContainerImmutable::FindString for bCase parameter
+    wxAutoNSAutoreleasePool pool;
+    return [m_cocoaItems indexOfObject:wxNSStringWithWxString(s)];
 }
 
     // selection
-void wxListBox::Select(int n)
-{
-}
-
 int wxListBox::GetSelection() const
 {
-    return 0;
+    return [GetNSTableView() selectedRow];
 }
 
 int wxListBox::DoAppend(const wxString& item)
 {
-    return 0;
+    wxAutoNSAutoreleasePool pool;
+    [m_cocoaItems addObject:wxNSStringWithWxString(item)];
+    [GetNSTableView() reloadData];
+    m_itemClientData.Add(NULL);
+    return [m_cocoaItems count];
 }
 
-void wxListBox::DoSetItemClientData(int n, void* clientData)
+void wxListBox::DoSetItemClientData(unsigned int n, void* clientData)
 {
+    m_itemClientData[n] = clientData;
 }
 
-void* wxListBox::DoGetItemClientData(int n) const
+void* wxListBox::DoGetItemClientData(unsigned int n) const
 {
-    return NULL;
+    return m_itemClientData[n];
 }
 
-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
 {
+    m_itemClientData[n] = (void*) clientData;
 }
 
-wxClientData* wxListBox::DoGetItemClientObject(int n) const
+wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const
 {
-    return NULL;
+    return (wxClientData*) m_itemClientData[n];
 }
 
+#endif