X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ebb7cade2df5aeb8531950d2a79cd57a336bcec..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/htmllbox.h?ds=sidebyside diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h index 9e5a4b44b7..89c06d29dc 100644 --- a/include/wx/htmllbox.h +++ b/include/wx/htmllbox.h @@ -20,13 +20,13 @@ #include "wx/filesys.h" #endif // wxUSE_FILESYSTEM -class WXDLLIMPEXP_HTML wxHtmlCell; -class WXDLLIMPEXP_HTML wxHtmlWinParser; -class WXDLLIMPEXP_HTML wxHtmlListBoxCache; -class WXDLLIMPEXP_HTML wxHtmlListBoxStyle; +class WXDLLIMPEXP_FWD_HTML wxHtmlCell; +class WXDLLIMPEXP_FWD_HTML wxHtmlWinParser; +class WXDLLIMPEXP_FWD_HTML wxHtmlListBoxCache; +class WXDLLIMPEXP_FWD_HTML wxHtmlListBoxStyle; -extern WXDLLEXPORT_DATA(const wxChar) wxHtmlListBoxNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxSimpleHtmlListBoxNameStr[]; +extern WXDLLIMPEXP_DATA_HTML(const wxChar) wxHtmlListBoxNameStr[]; +extern WXDLLIMPEXP_DATA_HTML(const wxChar) wxSimpleHtmlListBoxNameStr[]; // ---------------------------------------------------------------------------- // wxHtmlListBox @@ -69,12 +69,11 @@ public: virtual ~wxHtmlListBox(); // override some base class virtuals - virtual void RefreshLine(size_t line); - virtual void RefreshLines(size_t from, size_t to); + virtual void RefreshRow(size_t line); + virtual void RefreshRows(size_t from, size_t to); 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 @@ -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. - 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); @@ -242,13 +240,13 @@ public: long style = wxHLB_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxSimpleHtmlListBoxNameStr); - + virtual ~wxSimpleHtmlListBox(); // these must be overloaded otherwise the compiler will complain // about wxItemContainerImmutable::[G|S]etSelection being pure virtuals... void SetSelection(int n) - { return wxVListBox::SetSelection(n); } + { wxVListBox::SetSelection(n); } int GetSelection() const { return wxVListBox::GetSelection(); } @@ -270,35 +268,19 @@ public: virtual void SetString(unsigned int n, const wxString& s); - virtual void Clear(); - virtual void Delete(unsigned int n); - - // override default unoptimized wxItemContainer::Append() function - void Append(const wxArrayString& strings); - - // since we override one Append() overload, we need to overload all others too - int Append(const wxString& item) - { return wxItemContainer::Append(item); } - int Append(const wxString& item, void *clientData) - { return wxItemContainer::Append(item, clientData); } - int Append(const wxString& item, wxClientData *clientData) - { return wxItemContainer::Append(item, clientData); } - + virtual void DoClear(); + virtual void DoDeleteOneItem(unsigned int n); protected: - - virtual int DoAppend(const wxString& item); - virtual int DoInsert(const wxString& item, unsigned int pos); + virtual int DoInsertItems(const wxArrayStringsAdapter & items, + unsigned int pos, + void **clientData, wxClientDataType type); 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]; } - virtual void DoSetItemClientObject(unsigned int n, wxClientData *clientData) - { m_clientData[n] = (void *)clientData; } - virtual wxClientData *DoGetItemClientObject(unsigned int n) const - { return (wxClientData *)m_clientData[n]; } + { return m_HTMLclientData[n]; } // calls wxHtmlListBox::SetItemCount() and RefreshAll() void UpdateCount(); @@ -306,15 +288,19 @@ protected: // overload these functions just to change their visibility: users of // wxSimpleHtmlListBox shouldn't be allowed to call them directly! virtual void SetItemCount(size_t count) - { return wxHtmlListBox::SetItemCount(count); } - virtual void SetLineCount(size_t count) - { return wxHtmlListBox::SetLineCount(count); } + { wxHtmlListBox::SetItemCount(count); } + virtual void SetRowCount(size_t count) + { wxHtmlListBox::SetRowCount(count); } 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) };