wxEVT_MOVING = 442, not 4442, in event compatibility mode

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

diff --git a/include/wx/cocoa/listbox.h b/include/wx/cocoa/listbox.h
index 5d2dec15ba4bb39a75db010cf416d34794ac74dc..5bd2427989c70edf0c79d7b375bd33c4cc0b65ac 100644 (file)
--- a/include/wx/cocoa/listbox.h
+++ b/include/wx/cocoa/listbox.h
@@ -39,6 +39,16 @@ public:
     {
         Create(parent, winid,  pos, size, n, choices, style, validator, name);
     }
     {
         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,
 
     bool Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos = wxDefaultPosition,


@@ -47,6 +57,13 @@ public:
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr);
             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();
 
 // ------------------------------------------------------------------------
     virtual ~wxListBox();
 
 // ------------------------------------------------------------------------


@@ -57,7 +74,7 @@ protected:
     virtual struct objc_object* CocoaDataSource_objectForTableColumn(
         WX_NSTableColumn tableColumn, int rowIndex);
     WX_NSMutableArray m_cocoaItems;
     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
     struct objc_object *m_cocoaDataSource;
 // ------------------------------------------------------------------------
 // Implementation