Allow wx parents a chance to handle events fired by non-wx children. (i.e. wxActiveX...

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

diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm
index 41bd84681bdcf21770e7af98935a26fe2f266f04..01cba46d60c5f1b85b411915ac68e64d9236e34c 100644 (file)
--- a/src/cocoa/listbox.mm
+++ b/src/cocoa/listbox.mm
@@ -4,19 +4,48 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18

-// RCS-ID:      $Id: 
+// Id:          $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows license
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/app.h"
-#include "wx/listbox.h"
-#include "wx/log.h"
+#include "wx/wxprec.h"
+
+#if wxUSE_LISTBOX
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/listbox.h"
+#endif //WX_PRECOMP
+
+#include "wx/cocoa/string.h"
+#include "wx/cocoa/autorelease.h"
+#include "wx/cocoa/NSTableDataSource.h"
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSEnumerator.h>
+#import <AppKit/NSTableView.h>
+#import <AppKit/NSTableColumn.h>

 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
 END_EVENT_TABLE()

-// WX_IMPLEMENT_COCOA_OWNER(wxListBox,NSButton,NSControl,NSView)
+WX_IMPLEMENT_COCOA_OWNER(wxListBox,NSTableView,NSControl,NSView)
+
+bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style,
+            const wxValidator& validator,
+            const wxString& name)
+{
+    wxCArrayString chs(choices);
+
+    return Create(parent, winid, pos, size, chs.GetCount(), chs.GetStrings(),
+                  style, validator, name);
+}

 
 bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos,
 
 bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos,


@@ -26,44 +55,155 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
             const wxValidator& validator,
             const wxString& name)
 {
             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;
 
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
 

+    // Provide the data
+    m_cocoaItems = [[NSMutableArray arrayWithCapacity:n] retain];
+    for(int i=0; i < n; i++)
+    {
+        [m_cocoaItems addObject: wxNSStringWithWxString(choices[i])];
+    }
+    // Remove everything
+    m_itemClientData.Clear();
+    // Initialize n elements to NULL
+    m_itemClientData.SetCount(n,NULL);
+
+    SetNSTableView([[NSTableView alloc] initWithFrame: MakeDefaultNSRect(size)]);
+    [m_cocoaNSView release];
+    [GetNSTableView() setHeaderView: nil];
+
+    // Set up the data source
+    m_cocoaDataSource = [[wxCocoaNSTableDataSource alloc] init];
+    [GetNSTableView() setDataSource:m_cocoaDataSource];
+
+    // Add the single column
+    NSTableColumn *tableColumn = [[NSTableColumn alloc] initWithIdentifier:nil];
+    [GetNSTableView() addTableColumn: tableColumn];
+    [tableColumn release];
+
+    [GetNSTableView() sizeToFit];
+    // Finish

     if(m_parent)
         m_parent->CocoaAddChild(this);
     if(m_parent)
         m_parent->CocoaAddChild(this);

+    // NSTableView does WEIRD things with sizes.  Wrapping it in an
+    // NSScrollView seems to be the only reasonable solution.
+    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;
 }
 
 wxListBox::~wxListBox()
 {
     return true;
 }
 
 wxListBox::~wxListBox()
 {

-    CocoaRemoveFromParent();
+    [GetNSTableView() setDataSource: nil];
+    [m_cocoaDataSource release];
+    [m_cocoaItems release];
+    DisassociateNSTableView(GetNSTableView());
+}
+
+int wxListBox::CocoaDataSource_numberOfRows()
+{
+    return [m_cocoaItems count];
+}
+
+struct objc_object* wxListBox::CocoaDataSource_objectForTableColumn(
+        WX_NSTableColumn tableColumn, int rowIndex)
+{
+    return [m_cocoaItems objectAtIndex:rowIndex];

 }
 
 // pure virtuals from wxListBoxBase
 bool wxListBox::IsSelected(int n) const
 {
 }
 
 // pure virtuals from wxListBoxBase
 bool wxListBox::IsSelected(int n) const
 {

-    return false;
+    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];
+    else
+        [GetNSTableView() deselectRow: n];

 }
 
 int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {
 }
 
 int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {

-    return 0;
+    aSelections.Clear();
+    NSEnumerator *enumerator = [GetNSTableView() selectedRowEnumerator];
+    while(NSNumber *num = [enumerator nextObject])
+    {
+        aSelections.Add([num intValue]);
+    }
+    return [GetNSTableView() numberOfSelectedRows];

 }
 
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 {
 }
 
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 {

+    wxAutoNSAutoreleasePool pool;
+
+    for(int i=int(items.GetCount())-1; i >= 0; i--)
+    {
+        [m_cocoaItems insertObject: wxNSStringWithWxString(items[i])
+            atIndex: pos];
+        m_itemClientData.Insert(NULL,pos);
+    }
+    [GetNSTableView() reloadData];

 }
 
 void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
 {
 }
 
 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++)
+    {
+        [m_cocoaItems addObject: wxNSStringWithWxString(items[i])];
+        m_itemClientData.Add(clientData[i]);
+    }
+    [GetNSTableView() reloadData];

 }
 
 void wxListBox::DoSetFirstItem(int n)
 {
 }
 
 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];

 }
 
 
 }
 
 


@@ -71,62 +211,77 @@ void wxListBox::DoSetFirstItem(int n)
     // deleting items
 void wxListBox::Clear()
 {
     // deleting items
 void wxListBox::Clear()
 {

+    [m_cocoaItems removeAllObjects];
+    m_itemClientData.Clear();
+    [GetNSTableView() reloadData];

 }
 
 void wxListBox::Delete(int n)
 {
 }
 
 void wxListBox::Delete(int n)
 {

+    [m_cocoaItems removeObjectAtIndex:n];
+    m_itemClientData.RemoveAt(n);
+    [GetNSTableView() reloadData];

 }
 
     // accessing strings
 int wxListBox::GetCount() const
 {
 }
 
     // accessing strings
 int wxListBox::GetCount() const
 {

-    return 0;
+    return [m_cocoaItems count];

 }
 
 wxString wxListBox::GetString(int n) const
 {
 }
 
 wxString wxListBox::GetString(int n) const
 {

-    return wxEmptyString;
+    return wxStringWithNSString([m_cocoaItems objectAtIndex:n]);

 }
 
 void wxListBox::SetString(int n, const wxString& s)
 {
 }
 
 void wxListBox::SetString(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
 }
 
     // selection

-void wxListBox::Select(int n)
-{
-}
-

 int wxListBox::GetSelection() const
 {
 int wxListBox::GetSelection() const
 {

-    return 0;
+    return [GetNSTableView() selectedRow];

 }
 
 int wxListBox::DoAppend(const wxString& item)
 {
 }
 
 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(int n, void* clientData)
 {

+    m_itemClientData[n] = clientData;

 }
 
 void* wxListBox::DoGetItemClientData(int n) const
 {
 }
 
 void* wxListBox::DoGetItemClientData(int n) const
 {

-    return NULL;
+    return m_itemClientData[n];

 }
 
 void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
 {
 }
 
 void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
 {

+    m_itemClientData[n] = (void*) clientData;

 }
 
 wxClientData* wxListBox::DoGetItemClientObject(int n) const
 {
 }
 
 wxClientData* wxListBox::DoGetItemClientObject(int n) const
 {

-    return NULL;
+    return (wxClientData*) m_itemClientData[n];

 }
 
 }
 

+#endif