The great wxVScrolledWindow refactoring: allow using it both horizontal and

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

diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h
index 6f225f8ec0fe4fda4a2f3dae28af33c0531464a4..132416819d7d37f92947cdd628fe489547751b3e 100644 (file)
--- a/include/wx/htmllbox.h
+++ b/include/wx/htmllbox.h
@@ -74,7 +74,6 @@ public:
     virtual void RefreshAll();
     virtual void SetItemCount(size_t count);
 
     virtual void RefreshAll();
     virtual void SetItemCount(size_t count);
 

-

 #if wxUSE_FILESYSTEM
     // retrieve the file system used by the wxHtmlWinParser: if you use
     // relative paths in your HTML, you should use its ChangePathTo() method
 #if wxUSE_FILESYSTEM
     // retrieve the file system used by the wxHtmlWinParser: if you use
     // relative paths in your HTML, you should use its ChangePathTo() method


@@ -114,8 +113,7 @@ protected:
 
     // This method may be overriden to handle clicking on a link in
     // the listbox. By default, clicking links is ignored.
 
     // 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);
 
     // event handlers
     void OnSize(wxSizeEvent& event);


@@ -291,14 +289,14 @@ protected:
     virtual int DoInsert(const wxString& item, unsigned int pos);
 
     virtual void DoSetItemClientData(unsigned int n, void *clientData)
     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
 
     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()
     void UpdateCount();
 
     // calls wxHtmlListBox::SetItemCount() and RefreshAll()
     void UpdateCount();


@@ -307,14 +305,18 @@ protected:
     // wxSimpleHtmlListBox shouldn't be allowed to call them directly!
     virtual void SetItemCount(size_t count)
         { wxHtmlListBox::SetItemCount(count); }
     // wxSimpleHtmlListBox shouldn't be allowed to call them directly!
     virtual void SetItemCount(size_t count)
         { wxHtmlListBox::SetItemCount(count); }

-    virtual void SetLineCount(size_t count)
-        { wxHtmlListBox::SetLineCount(count); }
+    virtual void SetRowCount(size_t count)
+        { wxHtmlListBox::SetRowCount(count); }

 
     virtual wxString OnGetItem(size_t n) const
         { return m_items[n]; }
 
 
     virtual wxString OnGetItem(size_t n) const
         { return m_items[n]; }
 

-    wxArrayString m_items;
-    wxArrayPtrVoid m_clientData;
+    wxArrayString   m_items;
+    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)
 };