removed wxUSE_MENU_CALLBACK references: the code inside the #if couldn't compile...

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

diff --git a/include/wx/cocoa/listbox.h b/include/wx/cocoa/listbox.h
index 5dbce397790888354d92b920a23b826fc80bbe0e..6ada4abc57225398d14c897fec7c660efb74a072 100644 (file)
--- a/include/wx/cocoa/listbox.h
+++ b/include/wx/cocoa/listbox.h
@@ -6,18 +6,20 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:    wxWindows license
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_LISTBOX_H__
 #define __WX_COCOA_LISTBOX_H__
 
-//#include "wx/cocoa/NSTableView.h"
+#include "wx/cocoa/NSTableView.h"
+
+#include "wx/dynarray.h"
 
 // ========================================================================
 // wxListBox
 // ========================================================================
-class WXDLLEXPORT wxListBox: public wxListBoxBase //, protected wxCocoaNSTableView
+class WXDLLEXPORT wxListBox: public wxListBoxBase, protected wxCocoaNSTableView
 {
     DECLARE_DYNAMIC_CLASS(wxListBox)
     DECLARE_EVENT_TABLE()
@@ -26,7 +28,7 @@ class WXDLLEXPORT wxListBox: public wxListBoxBase //, protected wxCocoaNSTableVi
 // initialization
 // ------------------------------------------------------------------------
 public:
-    wxListBox() { }
+    wxListBox() { m_cocoaItems = NULL; m_cocoaDataSource = NULL; }
     wxListBox(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
@@ -37,6 +39,16 @@ public:
     {
         Create(parent, winid,  pos, size, n, choices, style, validator, name);
     }
+    wxListBox(wxWindow *parent, wxWindowID winid,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxListBoxNameStr)
+    {
+        Create(parent, winid,  pos, size, choices, style, validator, name);
+    }
 
     bool Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos = wxDefaultPosition,
@@ -45,24 +57,37 @@ public:
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr);
+    bool Create(wxWindow *parent, wxWindowID winid,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxListBoxNameStr);
     virtual ~wxListBox();
 
 // ------------------------------------------------------------------------
 // Cocoa callbacks
 // ------------------------------------------------------------------------
 protected:
+    virtual int CocoaDataSource_numberOfRows();
+    virtual struct objc_object* CocoaDataSource_objectForTableColumn(
+        WX_NSTableColumn tableColumn, int rowIndex);
+    WX_NSMutableArray m_cocoaItems;
+    wxArrayPtrVoid m_itemClientData;
+    struct objc_object *m_cocoaDataSource;
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 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:
@@ -75,7 +100,6 @@ public:
     virtual void SetString(int n, const wxString& s);
     virtual int FindString(const wxString& s) const;
     // selection
-    virtual void Select(int n);
     virtual int GetSelection() const;
 protected:
     virtual int DoAppend(const wxString& item);