Add comments explaining the workaround for mingw 3.2.3

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

diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm
index 2f35c368cdcc831ac45f13649dae8cd77731b637..e17fc1cfc2e18f940ed3d09bd7b53fe5a114cfbf 100644 (file)
--- a/src/cocoa/listbox.mm
+++ b/src/cocoa/listbox.mm
@@ -6,10 +6,13 @@
 // Created:     2003/03/18
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/03/18
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott

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

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#if wxUSE_LISTBOX
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"


@@ -30,6 +33,20 @@ BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxListBox,NSTableView,NSControl,NSView)
 
 END_EVENT_TABLE()
 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,
             const wxSize& size,
 bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos,
             const wxSize& size,


@@ -38,6 +55,28 @@ 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;
     wxAutoNSAutoreleasePool pool;
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;


@@ -49,9 +88,9 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
         [m_cocoaItems addObject: wxNSStringWithWxString(choices[i])];
     }
     // Remove everything
         [m_cocoaItems addObject: wxNSStringWithWxString(choices[i])];
     }
     // Remove everything

-    m_clientData.Clear();
+    m_itemClientData.Clear();

     // Initialize n elements to NULL
     // Initialize n elements to NULL

-    m_clientData.SetCount(n,NULL);
+    m_itemClientData.SetCount(n,NULL);

 
     SetNSTableView([[NSTableView alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
 
     SetNSTableView([[NSTableView alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];


@@ -74,6 +113,13 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
     // NSScrollView seems to be the only reasonable solution.
     CocoaCreateNSScrollView();
     SetInitialFrameRect(pos,size);
     // 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;
 }
 
     return true;
 }


@@ -103,7 +149,7 @@ bool wxListBox::IsSelected(int n) const
     return [GetNSTableView() isRowSelected: n];
 }
 
     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];
 {
     if(select)
         [GetNSTableView() selectRow: n byExtendingSelection:NO];


@@ -124,31 +170,40 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const
 
 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];
     for(int i=int(items.GetCount())-1; i >= 0; i--)
     {
         [m_cocoaItems insertObject: wxNSStringWithWxString(items[i])
             atIndex: pos];

-        m_clientData.Insert(NULL,pos);
+        m_itemClientData.Insert(NULL,pos);

     }
     [GetNSTableView() reloadData];
 }
 
 void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
 {
     }
     [GetNSTableView() reloadData];
 }
 
 void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
 {

+    wxAutoNSAutoreleasePool pool;
+    

     // Remove everything
     [m_cocoaItems removeAllObjects];
     // Remove everything
     [m_cocoaItems removeAllObjects];

-    m_clientData.Clear();
+    m_itemClientData.Clear();

     // Provide the data
     for(size_t i=0; i < items.GetCount(); i++)
     {
         [m_cocoaItems addObject: wxNSStringWithWxString(items[i])];
     // Provide the data
     for(size_t i=0; i < items.GetCount(); i++)
     {
         [m_cocoaItems addObject: wxNSStringWithWxString(items[i])];

-        m_clientData.Add(clientData[i]);
+        m_itemClientData.Add(clientData[i]);

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

 }
 
 
 }
 
 


@@ -156,62 +211,76 @@ 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) const
 {

-    return 0;
+    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