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

Renamed m_clientData member variable to avoid clash with variable with same

Browse Source 
name in wxEvtHandler which wxSimpleHtmlListBox derives from.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2006-10-29 23:57:13 +00:00
parent 2e96098220
commit 9d8f813841
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/htmllbox.h
View File

@@ -290,14 +290,14 @@ protected:
virtual int DoInsert(const wxString& item, unsigned int pos);
virtual void DoSetItemClientData(unsigned int n, void *clientData)
{ m_clientData[n] = clientData; }
{ m_HTMLclientData[n] = clientData; }
virtual void *DoGetItemClientData(unsigned int n) const
{ return m_clientData[n]; }
{ return m_HTMLclientData[n]; }
virtual void DoSetItemClientObject(unsigned int n, wxClientData *clientData)
{ m_clientData[n] = (void *)clientData; }
{ m_HTMLclientData[n] = (void *)clientData; }
virtual wxClientData *DoGetItemClientObject(unsigned int n) const
{ return (wxClientData *)m_clientData[n]; }
{ return (wxClientData *)m_HTMLclientData[n]; }
// calls wxHtmlListBox::SetItemCount() and RefreshAll()
void UpdateCount();
@@ -313,7 +313,10 @@ protected:
{ return m_items[n]; }
wxArrayString m_items;
wxArrayPtrVoid m_clientData;
wxArrayPtrVoid m_HTMLclientData;
// Note: For the benefit of old compilers (like gcc-2.8) this should
// not be named m_clientdata as that clashes with the name of an
// anonymous struct member in wxEvtHandler, which we derive from.
DECLARE_NO_COPY_CLASS(wxSimpleHtmlListBox)
};