setting clipping correctly

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

diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm
index e17fc1cfc2e18f940ed3d09bd7b53fe5a114cfbf..c24e9b9439dca8fa95d598e7d960fbcfcf8331d5 100644 (file)
--- a/src/cocoa/listbox.mm
+++ b/src/cocoa/listbox.mm
@@ -1,22 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/listbox.mm
+// Name:        src/cocoa/listbox.mm

 // Purpose:     wxListBox
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18
 // Purpose:     wxListBox
 // 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:    wxWidgets licence
+// Licence:     wxWidgets licence

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

+#include "wx/listbox.h"
+

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

-    #include "wx/listbox.h"

 #endif //WX_PRECOMP
 
 #include "wx/cocoa/string.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/string.h"


@@ -56,26 +57,26 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
             const wxString& name)
 {
 /*
             const wxString& name)
 {
 /*

-wxLB_SINGLE 
-Single-selection list. 
+wxLB_SINGLE
+Single-selection list.

 
 

-wxLB_MULTIPLE 
-Multiple-selection list: the user can toggle multiple items on and off. 
+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_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_HSCROLL
+Create horizontal scrollbar if contents are too wide (Windows only).

 
 

-wxLB_ALWAYS_SB 
-Always show a vertical scrollbar. 
+wxLB_ALWAYS_SB
+Always show a vertical scrollbar.

 
 

-wxLB_NEEDED_SB 
-Only create a vertical scrollbar if needed. 
+wxLB_NEEDED_SB
+Only create a vertical scrollbar if needed.

 
 

-wxLB_SORT 
-The listbox contents are sorted in alphabetical order. 
+wxLB_SORT
+The listbox contents are sorted in alphabetical order.

 */
     wxAutoNSAutoreleasePool pool;
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
 */
     wxAutoNSAutoreleasePool pool;
     if(!CreateControl(parent,winid,pos,size,style,validator,name))


@@ -113,9 +114,9 @@ The listbox contents are sorted in alphabetical order.
     // 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
     // Set up extended/multiple selection flags

-    if ((style & wxLB_EXTENDED) || (style & wxLB_MULTIPLE)) 
+    if ((style & wxLB_EXTENDED) || (style & wxLB_MULTIPLE))

         //diff is that mult requires shift down for multi selection
         [GetNSTableView() setAllowsMultipleSelection:true];
 
         //diff is that mult requires shift down for multi selection
         [GetNSTableView() setAllowsMultipleSelection:true];
 


@@ -168,7 +169,7 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const
     return [GetNSTableView() numberOfSelectedRows];
 }
 
     return [GetNSTableView() numberOfSelectedRows];
 }
 

-void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)

 {
     wxAutoNSAutoreleasePool pool;
 
 {
     wxAutoNSAutoreleasePool pool;
 


@@ -184,12 +185,12 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
 {
     wxAutoNSAutoreleasePool pool;
 void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
 {
     wxAutoNSAutoreleasePool pool;

-    
+

     // Remove everything
     [m_cocoaItems removeAllObjects];
     m_itemClientData.Clear();
     // Provide the data
     // 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]);
     {
         [m_cocoaItems addObject: wxNSStringWithWxString(items[i])];
         m_itemClientData.Add(clientData[i]);


@@ -216,34 +217,35 @@ void wxListBox::Clear()
     [GetNSTableView() reloadData];
 }
 
     [GetNSTableView() reloadData];
 }
 

-void wxListBox::Delete(int n)
+void wxListBox::Delete(unsigned int n)

 {
     [m_cocoaItems removeObjectAtIndex:n];
     m_itemClientData.RemoveAt(n);
 {
     [m_cocoaItems removeObjectAtIndex:n];
     m_itemClientData.RemoveAt(n);

-    [GetNSTableView() reloadData];    
+    [GetNSTableView() reloadData];

 }
 
     // accessing strings
 }
 
     // accessing strings

-int wxListBox::GetCount() const
+unsigned int wxListBox::GetCount() const

 {
 {

-    return [m_cocoaItems count];
+    return (unsigned int)[m_cocoaItems count];

 }
 
 }
 

-wxString wxListBox::GetString(int n) const
+wxString wxListBox::GetString(unsigned int n) const

 {
     return wxStringWithNSString([m_cocoaItems objectAtIndex:n]);
 }
 
 {
     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];
 {
     wxAutoNSAutoreleasePool pool;
     [m_cocoaItems removeObjectAtIndex:n];
     [m_cocoaItems insertObject: wxNSStringWithWxString(s) atIndex: n];

-    [GetNSTableView() reloadData];    
+    [GetNSTableView() reloadData];

 }
 
 }
 

-int wxListBox::FindString(const wxString& s) const
+int wxListBox::FindString(const wxString& s, bool bCase) const

 {
 {

+    // FIXME: use wxItemContainerImmutable::FindString for bCase parameter

     wxAutoNSAutoreleasePool pool;
     return [m_cocoaItems indexOfObject:wxNSStringWithWxString(s)];
 }
     wxAutoNSAutoreleasePool pool;
     return [m_cocoaItems indexOfObject:wxNSStringWithWxString(s)];
 }


@@ -257,28 +259,28 @@ int wxListBox::GetSelection() const
 int wxListBox::DoAppend(const wxString& item)
 {
     wxAutoNSAutoreleasePool pool;
 int wxListBox::DoAppend(const wxString& item)
 {
     wxAutoNSAutoreleasePool pool;

-    [m_cocoaItems addObject:wxNSStringWithWxString(item)];    
-    [GetNSTableView() reloadData];    
+    [m_cocoaItems addObject:wxNSStringWithWxString(item)];
+    [GetNSTableView() reloadData];

     m_itemClientData.Add(NULL);
     return [m_cocoaItems count];
 }
 
     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;
 }
 
 {
     m_itemClientData[n] = clientData;
 }
 

-void* wxListBox::DoGetItemClientData(int n) const
+void* wxListBox::DoGetItemClientData(unsigned int n) const

 {
     return m_itemClientData[n];
 }
 
 {
     return m_itemClientData[n];
 }
 

-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)

 {
     m_itemClientData[n] = (void*) clientData;
 }
 
 {
     m_itemClientData[n] = (void*) clientData;
 }
 

-wxClientData* wxListBox::DoGetItemClientObject(int n) const
+wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const

 {
     return (wxClientData*) m_itemClientData[n];
 }
 {
     return (wxClientData*) m_itemClientData[n];
 }