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 int DoInsert(const wxString& item, unsigned int pos);
virtual void DoSetItemClientData(unsigned int n, void *clientData) virtual void DoSetItemClientData(unsigned int n, void *clientData)
{ m_clientData[n] = clientData; } { m_HTMLclientData[n] = clientData; }
virtual void *DoGetItemClientData(unsigned int n) const virtual void *DoGetItemClientData(unsigned int n) const
{ return m_clientData[n]; } { return m_HTMLclientData[n]; }
virtual void DoSetItemClientObject(unsigned int n, wxClientData *clientData) 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 virtual wxClientData *DoGetItemClientObject(unsigned int n) const
{ return (wxClientData *)m_clientData[n]; } { return (wxClientData *)m_HTMLclientData[n]; }
// calls wxHtmlListBox::SetItemCount() and RefreshAll() // calls wxHtmlListBox::SetItemCount() and RefreshAll()
void UpdateCount(); void UpdateCount();
@@ -313,7 +313,10 @@ protected:
{ return m_items[n]; } { return m_items[n]; }
wxArrayString m_items; 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) DECLARE_NO_COPY_CLASS(wxSimpleHtmlListBox)
}; };

16
src/generic/htmllbox.cpp
View File

@@ -593,7 +593,7 @@ bool wxSimpleHtmlListBox::Create(wxWindow *parent, wxWindowID id,
wxSimpleHtmlListBox::~wxSimpleHtmlListBox() wxSimpleHtmlListBox::~wxSimpleHtmlListBox()
{ {
wxASSERT(m_items.GetCount() == m_clientData.GetCount()); wxASSERT(m_items.GetCount() == m_HTMLclientData.GetCount());
if (HasClientObjectData()) if (HasClientObjectData())
{ {
// clear the array of client data objects // clear the array of client data objects
@@ -602,20 +602,20 @@ wxSimpleHtmlListBox::~wxSimpleHtmlListBox()
} }
m_items.Clear(); m_items.Clear();
m_clientData.Clear(); m_HTMLclientData.Clear();
} }
void wxSimpleHtmlListBox::Clear() void wxSimpleHtmlListBox::Clear()
{ {
m_items.Clear(); m_items.Clear();
m_clientData.Clear(); m_HTMLclientData.Clear();
UpdateCount(); UpdateCount();
} }
void wxSimpleHtmlListBox::Delete(unsigned int n) void wxSimpleHtmlListBox::Delete(unsigned int n)
{ {
m_items.RemoveAt(n); m_items.RemoveAt(n);
m_clientData.RemoveAt(n); m_HTMLclientData.RemoveAt(n);
UpdateCount(); UpdateCount();
} }
@@ -629,14 +629,14 @@ void wxSimpleHtmlListBox::Append(const wxArrayString& strings)
// append all given items at once // append all given items at once
WX_APPEND_ARRAY(m_items, strings); WX_APPEND_ARRAY(m_items, strings);
m_clientData.Add(NULL, strings.GetCount()); m_HTMLclientData.Add(NULL, strings.GetCount());
UpdateCount(); UpdateCount();
} }
int wxSimpleHtmlListBox::DoAppend(const wxString& item) int wxSimpleHtmlListBox::DoAppend(const wxString& item)
{ {
m_items.Add(item); m_items.Add(item);
m_clientData.Add(NULL); m_HTMLclientData.Add(NULL);
UpdateCount(); UpdateCount();
return GetCount()-1; return GetCount()-1;
} }
@@ -644,7 +644,7 @@ int wxSimpleHtmlListBox::DoAppend(const wxString& item)
int wxSimpleHtmlListBox::DoInsert(const wxString& item, unsigned int pos) int wxSimpleHtmlListBox::DoInsert(const wxString& item, unsigned int pos)
{ {
m_items.Insert(item, pos); m_items.Insert(item, pos);
m_clientData.Insert(NULL, pos); m_HTMLclientData.Insert(NULL, pos);
UpdateCount(); UpdateCount();
return pos; return pos;
} }
@@ -668,7 +668,7 @@ wxString wxSimpleHtmlListBox::GetString(unsigned int n) const
void wxSimpleHtmlListBox::UpdateCount() void wxSimpleHtmlListBox::UpdateCount()
{ {
wxASSERT(m_items.GetCount() == m_clientData.GetCount()); wxASSERT(m_items.GetCount() == m_HTMLclientData.GetCount());
wxHtmlListBox::SetItemCount(m_items.GetCount()); wxHtmlListBox::SetItemCount(m_items.GetCount());
// very small optimization: if you need to add lot of items to // very small optimization: if you need to add lot of items to