X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ebb7cade2df5aeb8531950d2a79cd57a336bcec..ea412ac4eb9f19e3c28dfa32aa9099a81ac7c74c:/src/generic/htmllbox.cpp diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp index 7e4f8d73e4..c684838d5a 100644 --- a/src/generic/htmllbox.cpp +++ b/src/generic/htmllbox.cpp @@ -46,8 +46,8 @@ FORCE_WXHTML_MODULES() // small border always added to the cells: static const wxCoord CELL_BORDER = 2; -const wxChar wxHtmlListBoxNameStr[] = wxT("htmlListBox"); -const wxChar wxSimpleHtmlListBoxNameStr[] = wxT("simpleHtmlListBox"); +const char wxHtmlListBoxNameStr[] = "htmlListBox"; +const char wxSimpleHtmlListBoxNameStr[] = "simpleHtmlListBox"; // ============================================================================ // private classes @@ -165,18 +165,33 @@ public: virtual wxColour GetSelectedTextColour(const wxColour& colFg) { - return m_hlbox.GetSelectedTextColour(colFg); + // by default wxHtmlListBox doesn't implement GetSelectedTextColour() + // and returns wxNullColour from it, so use the default HTML colour for + // selection + wxColour col = m_hlbox.GetSelectedTextColour(colFg); + if ( !col.IsOk() ) + { + col = wxDefaultHtmlRenderingStyle::GetSelectedTextColour(colFg); + } + + return col; } virtual wxColour GetSelectedTextBgColour(const wxColour& colBg) { - return m_hlbox.GetSelectedTextBgColour(colBg); + wxColour col = m_hlbox.GetSelectedTextBgColour(colBg); + if ( !col.IsOk() ) + { + col = wxDefaultHtmlRenderingStyle::GetSelectedTextBgColour(colBg); + } + + return col; } private: const wxHtmlListBox& m_hlbox; - DECLARE_NO_COPY_CLASS(wxHtmlListBoxStyle) + wxDECLARE_NO_COPY_CLASS(wxHtmlListBoxStyle); }; // ---------------------------------------------------------------------------- @@ -254,10 +269,10 @@ wxHtmlListBox::~wxHtmlListBox() // wxHtmlListBox appearance // ---------------------------------------------------------------------------- -wxColour wxHtmlListBox::GetSelectedTextColour(const wxColour& colFg) const +wxColour +wxHtmlListBox::GetSelectedTextColour(const wxColour& WXUNUSED(colFg)) const { - return m_htmlRendStyle-> - wxDefaultHtmlRenderingStyle::GetSelectedTextColour(colFg); + return wxNullColour; } wxColour @@ -293,18 +308,21 @@ void wxHtmlListBox::CacheItem(size_t n) const self->m_htmlParser = new wxHtmlWinParser(self); m_htmlParser->SetDC(new wxClientDC(self)); m_htmlParser->SetFS(&self->m_filesystem); - +#if !wxUSE_UNICODE + if (GetFont().Ok()) + m_htmlParser->SetInputEncoding(GetFont().GetEncoding()); +#endif // use system's default GUI font by default: m_htmlParser->SetStandardFonts(); } wxHtmlContainerCell *cell = (wxHtmlContainerCell *)m_htmlParser-> Parse(OnGetItemMarkup(n)); - wxCHECK_RET( cell, _T("wxHtmlParser::Parse() returned NULL?") ); + wxCHECK_RET( cell, wxT("wxHtmlParser::Parse() returned NULL?") ); // set the cell's ID to item's index so that CellCoordsToPhysical() // can quickly find the item: - cell->SetId(wxString::Format(_T("%lu"), (unsigned long)n)); + cell->SetId(wxString::Format(wxT("%lu"), (unsigned long)n)); cell->Layout(GetClientSize().x - 2*GetMargins().x); @@ -320,18 +338,18 @@ void wxHtmlListBox::OnSize(wxSizeEvent& event) event.Skip(); } -void wxHtmlListBox::RefreshLine(size_t line) +void wxHtmlListBox::RefreshRow(size_t line) { m_cache->InvalidateRange(line, line); - wxVListBox::RefreshLine(line); + wxVListBox::RefreshRow(line); } -void wxHtmlListBox::RefreshLines(size_t from, size_t to) +void wxHtmlListBox::RefreshRows(size_t from, size_t to) { m_cache->InvalidateRange(from, to); - wxVListBox::RefreshLines(from, to); + wxVListBox::RefreshRows(from, to); } void wxHtmlListBox::RefreshAll() @@ -353,25 +371,51 @@ void wxHtmlListBox::SetItemCount(size_t count) // wxHtmlListBox implementation of wxVListBox pure virtuals // ---------------------------------------------------------------------------- +void +wxHtmlListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const +{ + if ( IsSelected(n) ) + { + if ( DoDrawSolidBackground + ( + GetSelectedTextBgColour(GetBackgroundColour()), + dc, + rect, + n + ) ) + { + return; + } + //else: no custom selection background colour, use base class version + } + + wxVListBox::OnDrawBackground(dc, rect, n); +} + void wxHtmlListBox::OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const { CacheItem(n); wxHtmlCell *cell = m_cache->Get(n); - wxCHECK_RET( cell, _T("this cell should be cached!") ); + wxCHECK_RET( cell, wxT("this cell should be cached!") ); wxHtmlRenderingInfo htmlRendInfo; - // draw the selected cell in selected state - if ( IsSelected(n) ) + // draw the selected cell in selected state ourselves if we're using custom + // colours (to test for this, check the callbacks by passing them any dummy + // (but valid, to avoid asserts) colour): + if ( IsSelected(n) && + (GetSelectedTextColour(*wxBLACK).IsOk() || + GetSelectedTextBgColour(*wxWHITE).IsOk()) ) { wxHtmlSelection htmlSel; htmlSel.Set(wxPoint(0,0), cell, wxPoint(INT_MAX, INT_MAX), cell); htmlRendInfo.SetSelection(&htmlSel); - if ( m_htmlRendStyle ) - htmlRendInfo.SetStyle(m_htmlRendStyle); + htmlRendInfo.SetStyle(m_htmlRendStyle); htmlRendInfo.GetState().SetSelectionState(wxHTML_SEL_IN); } + //else: normal item or selected item with default colours, its background + // was already taken care of in the base class // 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 @@ -386,7 +430,7 @@ wxCoord wxHtmlListBox::OnMeasureItem(size_t n) const CacheItem(n); wxHtmlCell *cell = m_cache->Get(n); - wxCHECK_MSG( cell, 0, _T("this cell should be cached!") ); + wxCHECK_MSG( cell, 0, wxT("this cell should be cached!") ); return cell->GetHeight() + cell->GetDescent() + 4; } @@ -405,6 +449,13 @@ void wxHtmlListBox::OnHTMLLinkClicked(const wxHtmlLinkInfo& link) OnLinkClicked(GetItemForCell(link.GetHtmlCell()), link); } +void wxHtmlListBox::OnLinkClicked(size_t WXUNUSED(n), + const wxHtmlLinkInfo& link) +{ + wxHtmlLinkEvent event(GetId(), link); + GetEventHandler()->ProcessEvent(event); +} + wxHtmlOpeningStatus wxHtmlListBox::OnHTMLOpeningURL(wxHtmlURLType WXUNUSED(type), const wxString& WXUNUSED(url), @@ -459,13 +510,13 @@ wxPoint wxHtmlListBox::GetRootCellCoords(size_t n) const { wxPoint pos(CELL_BORDER, CELL_BORDER); pos += GetMargins(); - pos.y += GetLinesHeight(GetFirstVisibleLine(), n); + pos.y += GetRowsHeight(GetVisibleBegin(), n); return pos; } bool wxHtmlListBox::PhysicalCoordsToCell(wxPoint& pos, wxHtmlCell*& cell) const { - int n = HitTest(pos); + int n = VirtualHitTest(pos.y); if ( n == wxNOT_FOUND ) return false; @@ -480,17 +531,17 @@ bool wxHtmlListBox::PhysicalCoordsToCell(wxPoint& pos, wxHtmlCell*& cell) const size_t wxHtmlListBox::GetItemForCell(const wxHtmlCell *cell) const { - wxCHECK_MSG( cell, 0, _T("no cell") ); + wxCHECK_MSG( cell, 0, wxT("no cell") ); cell = cell->GetRootCell(); - wxCHECK_MSG( cell, 0, _T("no root cell") ); + wxCHECK_MSG( cell, 0, wxT("no root cell") ); // the cell's ID contains item index, see CacheItem(): unsigned long n; if ( !cell->GetId().ToULong(&n) ) { - wxFAIL_MSG( _T("unexpected root cell's ID") ); + wxFAIL_MSG( wxT("unexpected root cell's ID") ); return 0; } @@ -560,25 +611,30 @@ bool wxSimpleHtmlListBox::Create(wxWindow *parent, wxWindowID id, if (!wxHtmlListBox::Create(parent, id, pos, size, style, name)) return false; +#if wxUSE_VALIDATORS SetValidator(validator); - for (int i=0; i