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

renamed m_clientData to fix compilation problems

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/wxUNIVERSAL@8263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-09-05 19:17:17 +00:00
parent 8d400a3a23
commit f85b3ee981
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,7 +173,7 @@ protected:
wxArrayInt m_selections; wxArrayInt m_selections;
// and this one the client data (either void or wxClientData) // and this one the client data (either void or wxClientData)
wxArrayPtrVoid m_clientData; wxArrayPtrVoid m_itemsClientData;
// the current item // the current item
int m_current; int m_current;

26
src/univ/listbox.cpp
View File

@@ -121,7 +121,7 @@ wxListBox::~wxListBox()
int wxListBox::DoAppend(const wxString& item) int wxListBox::DoAppend(const wxString& item)
{ {
size_t index = m_strings.Add(item); size_t index = m_strings.Add(item);
m_clientData.Insert(NULL, index); m_itemsClientData.Insert(NULL, index);
m_updateScrollbarY = TRUE; m_updateScrollbarY = TRUE;
@@ -153,7 +153,7 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
for ( size_t n = 0; n < count; n++ ) for ( size_t n = 0; n < count; n++ )
{ {
m_strings.Insert(items[n], pos + n); m_strings.Insert(items[n], pos + n);
m_clientData.Insert(NULL, pos + n); m_itemsClientData.Insert(NULL, pos + n);
} }
// the number of items has changed // the number of items has changed
@@ -177,11 +177,11 @@ void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
return; return;
m_strings.Alloc(count); m_strings.Alloc(count);
m_clientData.Alloc(count); m_itemsClientData.Alloc(count);
for ( size_t n = 0; n < count; n++ ) for ( size_t n = 0; n < count; n++ )
{ {
size_t index = m_strings.Add(items[n]); size_t index = m_strings.Add(items[n]);
m_clientData.Insert(clientData ? clientData[n] : NULL, index); m_itemsClientData.Insert(clientData ? clientData[n] : NULL, index);
} }
m_updateScrollbarY = TRUE; m_updateScrollbarY = TRUE;
@@ -234,14 +234,14 @@ void wxListBox::DoClear()
if ( HasClientObjectData() ) if ( HasClientObjectData() )
{ {
size_t count = m_clientData.GetCount(); size_t count = m_itemsClientData.GetCount();
for ( size_t n = 0; n < count; n++ ) for ( size_t n = 0; n < count; n++ )
{ {
delete m_clientData[n]; delete m_itemsClientData[n];
} }
} }
m_clientData.Clear(); m_itemsClientData.Clear();
} }
void wxListBox::Clear() void wxListBox::Clear()
@@ -261,10 +261,10 @@ void wxListBox::Delete(int n)
if ( HasClientObjectData() ) if ( HasClientObjectData() )
{ {
delete m_clientData[n]; delete m_itemsClientData[n];
} }
m_clientData.RemoveAt(n); m_itemsClientData.RemoveAt(n);
m_updateScrollbarY = TRUE; m_updateScrollbarY = TRUE;
@@ -277,22 +277,22 @@ void wxListBox::Delete(int n)
void wxListBox::DoSetItemClientData(int n, void* clientData) void wxListBox::DoSetItemClientData(int n, void* clientData)
{ {
m_clientData[n] = clientData; m_itemsClientData[n] = clientData;
} }
void *wxListBox::DoGetItemClientData(int n) const void *wxListBox::DoGetItemClientData(int n) const
{ {
return m_clientData[n]; return m_itemsClientData[n];
} }
void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData) void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
{ {
m_clientData[n] = clientData; m_itemsClientData[n] = clientData;
} }
wxClientData* wxListBox::DoGetItemClientObject(int n) const wxClientData* wxListBox::DoGetItemClientObject(int n) const
{ {
return (wxClientData *)m_clientData[n]; return (wxClientData *)m_itemsClientData[n];
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------