///////////////////////////////////////////////////////////////////////////////
-// Name: generic/htmllbox.cpp
+// Name: src/generic/htmllbox.cpp
// Purpose: implementation of wxHtmlListBox
// Author: Vadim Zeitlin
// Modified by:
// Created: 31.05.03
-// RCS-ID: $Id$
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
// 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
void InvalidateItem(size_t n)
{
m_items[n] = (size_t)-1;
- delete m_cells[n];
- m_cells[n] = NULL;
+ wxDELETE(m_cells[n]);
}
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);
};
// ----------------------------------------------------------------------------
// 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
m_htmlParser->SetDC(new wxClientDC(self));
m_htmlParser->SetFS(&self->m_filesystem);
#if !wxUSE_UNICODE
- if (GetFont().Ok())
+ if (GetFont().IsOk())
m_htmlParser->SetInputEncoding(GetFont().GetEncoding());
#endif
// use system's default GUI font by default:
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);
// 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 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);
+ 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
// entire cell
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;
}
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;
}
// wxSimpleHtmlListBox
// ----------------------------------------------------------------------------
+IMPLEMENT_ABSTRACT_CLASS(wxSimpleHtmlListBox, wxHtmlListBox)
+
+
bool wxSimpleHtmlListBox::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
UpdateCount();
}
+void wxSimpleHtmlListBox::Clear()
+{
+ DoClear();
+}
+
void wxSimpleHtmlListBox::DoDeleteOneItem(unsigned int n)
{
m_items.RemoveAt(n);
UpdateCount();
- return pos;
+ return pos - 1;
}
void wxSimpleHtmlListBox::SetString(unsigned int n, const wxString& s)
projects / wxWidgets.git / blobdiff