// 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:
private:
const wxHtmlListBox& m_hlbox;
- DECLARE_NO_COPY_CLASS(wxHtmlListBoxStyle)
+ wxDECLARE_NO_COPY_CLASS(wxHtmlListBoxStyle);
};
// ----------------------------------------------------------------------------
wxColour
wxHtmlListBox::GetSelectedTextBgColour(const wxColour& WXUNUSED(colBg)) const
{
- return wxNullColour;
+ return GetSelectionBackground();
}
// ----------------------------------------------------------------------------
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);
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;
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;
}
UpdateCount();
- return pos;
+ return pos - 1;
}
void wxSimpleHtmlListBox::SetString(unsigned int n, const wxString& s)