X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/034957673ccd2006aee3937c5b86245e51d4bf62..9f4ed8613c2853dbf8b190b41dbdafa960b33a85:/src/generic/htmllbox.cpp diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp index dff147a45c..4bbcf8399b 100644 --- a/src/generic/htmllbox.cpp +++ b/src/generic/htmllbox.cpp @@ -144,6 +144,8 @@ public: private: const wxHtmlListBox& m_hlbox; + + DECLARE_NO_COPY_CLASS(wxHtmlListBoxStyle) }; @@ -159,6 +161,9 @@ END_EVENT_TABLE() // implementation // ============================================================================ +IMPLEMENT_ABSTRACT_CLASS(wxHtmlListBox, wxVListBox) + + // ---------------------------------------------------------------------------- // wxHtmlListBox creation // ---------------------------------------------------------------------------- @@ -297,7 +302,7 @@ void wxHtmlListBox::OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const // note that we can't stop drawing exactly at the window boundary as then // even the visible cells part could be not drawn, so always draw the // entire cell - cell->Draw(dc, rect.x, rect.y, 0, INT_MAX, htmlRendInfo); + cell->Draw(dc, rect.x+2, rect.y+2, 0, INT_MAX, htmlRendInfo); } wxCoord wxHtmlListBox::OnMeasureItem(size_t n) const @@ -307,6 +312,6 @@ wxCoord wxHtmlListBox::OnMeasureItem(size_t n) const wxHtmlCell *cell = m_cache->Get(n); wxCHECK_MSG( cell, 0, _T("this cell should be cached!") ); - return cell->GetHeight() + cell->GetDescent(); + return cell->GetHeight() + cell->GetDescent() + 4; }