Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s/m_clientData/m_itemClientData/ so it doesn't conflict with wxEvtHandler union

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-04-13 14:16:48 +00:00
parent 654b2a1d16
commit c0ccf6a9a3
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/cocoa/listbox.h
View File

@@ -74,7 +74,7 @@ protected:
virtual struct objc_object* CocoaDataSource_objectForTableColumn( virtual struct objc_object* CocoaDataSource_objectForTableColumn(
WX_NSTableColumn tableColumn, int rowIndex); WX_NSTableColumn tableColumn, int rowIndex);
WX_NSMutableArray m_cocoaItems; WX_NSMutableArray m_cocoaItems;
wxArrayPtrVoid m_clientData; wxArrayPtrVoid m_itemClientData;
struct objc_object *m_cocoaDataSource; struct objc_object *m_cocoaDataSource;
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Implementation // Implementation

10
src/cocoa/listbox.mm
View File

@@ -63,9 +63,9 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
[m_cocoaItems addObject: wxNSStringWithWxString(choices[i])]; [m_cocoaItems addObject: wxNSStringWithWxString(choices[i])];
} }
// Remove everything // Remove everything
m_clientData.Clear(); m_itemClientData.Clear();
// Initialize n elements to NULL // Initialize n elements to NULL
m_clientData.SetCount(n,NULL); m_itemClientData.SetCount(n,NULL);
SetNSTableView([[NSTableView alloc] initWithFrame: MakeDefaultNSRect(size)]); SetNSTableView([[NSTableView alloc] initWithFrame: MakeDefaultNSRect(size)]);
[m_cocoaNSView release]; [m_cocoaNSView release];
@@ -142,7 +142,7 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
{ {
[m_cocoaItems insertObject: wxNSStringWithWxString(items[i]) [m_cocoaItems insertObject: wxNSStringWithWxString(items[i])
atIndex: pos]; atIndex: pos];
m_clientData.Insert(NULL,pos); m_itemClientData.Insert(NULL,pos);
} }
[GetNSTableView() reloadData]; [GetNSTableView() reloadData];
} }
@@ -151,12 +151,12 @@ void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
{ {
// Remove everything // Remove everything
[m_cocoaItems removeAllObjects]; [m_cocoaItems removeAllObjects];
m_clientData.Clear(); m_itemClientData.Clear();
// Provide the data // Provide the data
for(size_t i=0; i < items.GetCount(); i++) for(size_t i=0; i < items.GetCount(); i++)
{ {
[m_cocoaItems addObject: wxNSStringWithWxString(items[i])]; [m_cocoaItems addObject: wxNSStringWithWxString(items[i])];
m_clientData.Add(clientData[i]); m_itemClientData.Add(clientData[i]);
} }
[GetNSTableView() reloadData]; [GetNSTableView() reloadData];
} }