don't define WINVER as 0x0400 in configure, it's defined in the headers as 0x0600...

[wxWidgets.git] / include / wx / htmllbox.h

diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h
index 6f225f8ec0fe4fda4a2f3dae28af33c0531464a4..2f0675fa627f2f05a2a70848cf03a82994456b67 100644 (file)
--- a/include/wx/htmllbox.h
+++ b/include/wx/htmllbox.h
@@ -114,8 +114,7 @@ protected:
 
     // This method may be overriden to handle clicking on a link in
     // the listbox. By default, clicking links is ignored.
-    virtual void OnLinkClicked(size_t WXUNUSED(n),
-                               const wxHtmlLinkInfo& WXUNUSED(link)) { }
+    virtual void OnLinkClicked(size_t n, const wxHtmlLinkInfo& link);
 
     // event handlers
     void OnSize(wxSizeEvent& event);
@@ -291,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();
@@ -314,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)
 };