From c0ccf6a9a3219183990148ef0fca7c774cf79f1b Mon Sep 17 00:00:00 2001
From: David Elliott <dfe@tgwbd.org>
Date: Tue, 13 Apr 2004 14:16:48 +0000
Subject: [PATCH] s/m_clientData/m_itemClientData/ so it doesn't conflict with
 wxEvtHandler union

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/cocoa/listbox.h |  2 +-
 src/cocoa/listbox.mm       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/wx/cocoa/listbox.h b/include/wx/cocoa/listbox.h
index 94f6ea0897..5bd2427989 100644
--- a/include/wx/cocoa/listbox.h
+++ b/include/wx/cocoa/listbox.h
@@ -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
diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm
index a379cdd02e..ff2428eb64 100644
--- a/src/cocoa/listbox.mm
+++ b/src/cocoa/listbox.mm
@@ -63,9 +63,9 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
         [m_cocoaItems addObject: wxNSStringWithWxString(choices[i])];
     }
     // Remove everything
-    m_clientData.Clear();
+    m_itemClientData.Clear();
     // Initialize n elements to NULL
-    m_clientData.SetCount(n,NULL);
+    m_itemClientData.SetCount(n,NULL);
 
     SetNSTableView([[NSTableView alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
@@ -142,7 +142,7 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
     {
         [m_cocoaItems insertObject: wxNSStringWithWxString(items[i])
             atIndex: pos];
-        m_clientData.Insert(NULL,pos);
+        m_itemClientData.Insert(NULL,pos);
     }
     [GetNSTableView() reloadData];
 }
@@ -151,12 +151,12 @@ void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
 {
     // Remove everything
     [m_cocoaItems removeAllObjects];
-    m_clientData.Clear();
+    m_itemClientData.Clear();
     // Provide the data
     for(size_t i=0; i < items.GetCount(); i++)
     {
         [m_cocoaItems addObject: wxNSStringWithWxString(items[i])];
-        m_clientData.Add(clientData[i]);
+        m_itemClientData.Add(clientData[i]);
     }
     [GetNSTableView() reloadData];
 }
-- 
2.45.2