size_t is always unsigned....

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

diff --git a/include/wx/cocoa/listbox.h b/include/wx/cocoa/listbox.h
index 5dbce397790888354d92b920a23b826fc80bbe0e..5d2dec15ba4bb39a75db010cf416d34794ac74dc 100644 (file)
--- a/include/wx/cocoa/listbox.h
+++ b/include/wx/cocoa/listbox.h
@@ -12,12 +12,14 @@
 #ifndef __WX_COCOA_LISTBOX_H__
 #define __WX_COCOA_LISTBOX_H__
 
 #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
 // ========================================================================
 
 // ========================================================================
 // wxListBox
 // ========================================================================

-class WXDLLEXPORT wxListBox: public wxListBoxBase //, protected wxCocoaNSTableView
+class WXDLLEXPORT wxListBox: public wxListBoxBase, protected wxCocoaNSTableView

 {
     DECLARE_DYNAMIC_CLASS(wxListBox)
     DECLARE_EVENT_TABLE()
 {
     DECLARE_DYNAMIC_CLASS(wxListBox)
     DECLARE_EVENT_TABLE()


@@ -26,7 +28,7 @@ class WXDLLEXPORT wxListBox: public wxListBoxBase //, protected wxCocoaNSTableVi
 // initialization
 // ------------------------------------------------------------------------
 public:
 // initialization
 // ------------------------------------------------------------------------
 public:

-    wxListBox() { }
+    wxListBox() { m_cocoaItems = 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,


@@ -51,6 +53,12 @@ public:
 // Cocoa callbacks
 // ------------------------------------------------------------------------
 protected:
 // Cocoa callbacks
 // ------------------------------------------------------------------------
 protected:

+    virtual int CocoaDataSource_numberOfRows();
+    virtual struct objc_object* CocoaDataSource_objectForTableColumn(
+        WX_NSTableColumn tableColumn, int rowIndex);
+    WX_NSMutableArray m_cocoaItems;
+    wxArrayPtrVoid m_clientData;
+    struct objc_object *m_cocoaDataSource;

 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------