Renamed m_clientData member variable to avoid clash with variable with same

        name in wxEvtHandler which wxSimpleHtmlListBox derives from.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h
index 16dab9008f095d2b34b5b69256a23532c369a35d..2f0675fa627f2f05a2a70848cf03a82994456b67 100644 (file)
--- a/include/wx/htmllbox.h
+++ b/include/wx/htmllbox.h
@@ -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)
 };

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