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 8b94556762213ab903ad9a7834799765b8a0a3b2..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
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16

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

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

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_LISTBOX_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_LISTBOX_H__


@@ -28,7 +28,7 @@ class WXDLLEXPORT wxListBox: public wxListBoxBase, protected wxCocoaNSTableView
 // initialization
 // ------------------------------------------------------------------------
 public:
 // 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,
     wxListBox(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,


@@ -82,12 +82,12 @@ protected:
 public:
 // pure virtuals from wxListBoxBase
     virtual bool IsSelected(int n) const;
 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 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:
 
 // 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 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
     // selection

-    virtual void Select(int n);

     virtual int GetSelection() const;
 protected:
     virtual int DoAppend(const wxString& item);
     virtual int GetSelection() const;
 protected:
     virtual int DoAppend(const wxString& item);