Fixes for WinCE build caused by my last commit.

[wxWidgets.git] / include / wx / cocoa / listbox.h

diff --git a/include/wx/cocoa/listbox.h b/include/wx/cocoa/listbox.h
index 94f6ea0897c1ff9c1bbf514d17890133a218047a..9d5f21d6f35ac4b8cdcf65b5ed27d7d32d3220e0 100644 (file)
--- a/include/wx/cocoa/listbox.h
+++ b/include/wx/cocoa/listbox.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:    wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_LISTBOX_H__
@@ -28,7 +28,7 @@ class WXDLLEXPORT wxListBox: public wxListBoxBase, protected wxCocoaNSTableView
 // initialization
 // ------------------------------------------------------------------------
 public:
-    wxListBox() { m_cocoaItems = NULL; }
+    wxListBox() { m_cocoaItems = NULL; m_cocoaDataSource = NULL; }
     wxListBox(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
@@ -74,7 +74,7 @@ protected:
     virtual struct objc_object* CocoaDataSource_objectForTableColumn(
         WX_NSTableColumn tableColumn, int rowIndex);
     WX_NSMutableArray m_cocoaItems;
-    wxArrayPtrVoid m_clientData;
+    wxArrayPtrVoid m_itemClientData;
     struct objc_object *m_cocoaDataSource;
 // ------------------------------------------------------------------------
 // Implementation
@@ -82,12 +82,12 @@ protected:
 public:
 // pure virtuals from wxListBoxBase
     virtual bool IsSelected(int n) const;
-    virtual void SetSelection(int n, bool select = TRUE);
     virtual int GetSelections(wxArrayInt& aSelections) const;
 protected:
     virtual void DoInsertItems(const wxArrayString& items, int pos);
     virtual void DoSetItems(const wxArrayString& items, void **clientData);
     virtual void DoSetFirstItem(int n);
+    virtual void DoSetSelection(int n, bool select);
 
 // pure virtuals from wxItemContainer
 public:
@@ -98,9 +98,8 @@ public:
     virtual int GetCount() const;
     virtual wxString GetString(int n) const;
     virtual void SetString(int n, const wxString& s);
-    virtual int FindString(const wxString& s) const;
+    virtual int FindString(const wxString& s, bool bCase = false) const;
     // selection
-    virtual void Select(int n);
     virtual int GetSelection() const;
 protected:
     virtual int DoAppend(const wxString& item);