Fix wx[Sorted]ArrayString::Index when wxUSE_STL=1, because

[wxWidgets.git] / src / generic / htmllbox.cpp

diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp
index 876181f218df6197416ea0cf910ea05274939863..dff147a45c6dc1592f97622051e2e30aca336b00 100644 (file)
--- a/src/generic/htmllbox.cpp
+++ b/src/generic/htmllbox.cpp
@@ -33,48 +33,128 @@
 #include "wx/html/htmlcell.h"
 #include "wx/html/winpars.h"
 
 #include "wx/html/htmlcell.h"
 #include "wx/html/winpars.h"
 

-// ----------------------------------------------------------------------------
+// this hack forces the linker to always link in m_* files
+#include "wx/html/forcelnk.h"
+FORCE_WXHTML_MODULES()
+
+// ============================================================================

 // private classes
 // private classes

+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxHtmlListBoxCache

 // ----------------------------------------------------------------------------
 
 // this class is used by wxHtmlListBox to cache the parsed representation of
 // the items to avoid doing it anew each time an item must be drawn
 // ----------------------------------------------------------------------------
 
 // this class is used by wxHtmlListBox to cache the parsed representation of
 // the items to avoid doing it anew each time an item must be drawn

-//
-// TODO: extend the class to cache more than item

 class wxHtmlListBoxCache
 {
 public:
 class wxHtmlListBoxCache
 {
 public:

-    wxHtmlListBoxCache() { m_cell = NULL; }
-    ~wxHtmlListBoxCache() { delete m_cell; }
+    wxHtmlListBoxCache()
+    {
+        for ( size_t n = 0; n < SIZE; n++ )
+        {
+            m_items[n] = (size_t)-1;
+            m_cells[n] = NULL;
+        }

 
 

-    // returns true if we already have this item cached
-    bool Has(size_t n) const { return m_cell && n == m_item; }
+        m_next = 0;
+    }

 
 

-    // ensure that the item is cached
-    void Store(size_t n, wxHtmlCell *cell)
+    ~wxHtmlListBoxCache()

     {
     {

-        m_item = n;
+        for ( size_t n = 0; n < SIZE; n++ )
+        {
+            delete m_cells[n];
+        }
+    }

 
 

-        delete m_cell;
-        m_cell = cell;
+    // completely invalidate the cache
+    void Clear()
+    {
+        for ( size_t n = 0; n < SIZE; n++ )
+        {
+            m_items[n] = (size_t)-1;
+            delete m_cells[n];
+            m_cells[n] = NULL;
+        }

     }
 
     // return the cached cell for this index or NULL if none
     }
 
     // return the cached cell for this index or NULL if none

-    wxHtmlCell *Get(size_t n) const
+    wxHtmlCell *Get(size_t item) const
+    {
+        for ( size_t n = 0; n < SIZE; n++ )
+        {
+            if ( m_items[n] == item )
+                return m_cells[n];
+        }
+
+        return NULL;
+    }
+
+    // returns true if we already have this item cached
+    bool Has(size_t item) const { return Get(item) != NULL; }
+
+    // ensure that the item is cached
+    void Store(size_t item, wxHtmlCell *cell)

     {
     {

-        // we could be reading uninitialized m_item here but the code is still
-        // correct
-        return n == m_item ? m_cell : NULL;
+        delete m_cells[m_next];
+        m_cells[m_next] = cell;
+        m_items[m_next] = item;
+
+        // advance to the next item wrapping around if there are no more
+        if ( ++m_next == SIZE )
+            m_next = 0;

     }
 
 private:
     }
 
 private:

+    // the max number of the items we cache
+    enum { SIZE = 50 };
+
+    // the index of the LRU (oldest) cell
+    size_t m_next;
+

     // the parsed representation of the cached item or NULL
     // the parsed representation of the cached item or NULL

-    wxHtmlCell *m_cell;
+    wxHtmlCell *m_cells[SIZE];
+
+    // the index of the currently cached item (only valid if m_cells != NULL)
+    size_t m_items[SIZE];
+};
+
+// ----------------------------------------------------------------------------
+// wxHtmlListBoxStyle
+// ----------------------------------------------------------------------------
+
+// just forward wxDefaultHtmlRenderingStyle callbacks to the main class so that
+// they could be overridden by the user code
+class wxHtmlListBoxStyle : public wxDefaultHtmlRenderingStyle
+{
+public:
+    wxHtmlListBoxStyle(wxHtmlListBox& hlbox) : m_hlbox(hlbox) { }
+
+    virtual wxColour GetSelectedTextColour(const wxColour& colFg)
+    {
+        return m_hlbox.GetSelectedTextColour(colFg);
+    }

 
 

-    // the index of the currently cached item (only valid if m_cell != NULL)
-    size_t m_item;
+    virtual wxColour GetSelectedTextBgColour(const wxColour& colBg)
+    {
+        return m_hlbox.GetSelectedTextBgColour(colBg);
+    }
+
+private:
+    const wxHtmlListBox& m_hlbox;

 };
 
 };
 

+
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxHtmlListBox, wxVListBox)
+    EVT_SIZE(wxHtmlListBox::OnSize)
+END_EVENT_TABLE()
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -86,6 +166,7 @@ private:
 void wxHtmlListBox::Init()
 {
     m_htmlParser = NULL;
 void wxHtmlListBox::Init()
 {
     m_htmlParser = NULL;

+    m_htmlRendStyle = new wxHtmlListBoxStyle(*this);

     m_cache = new wxHtmlListBoxCache;
 }
 
     m_cache = new wxHtmlListBoxCache;
 }
 


@@ -93,21 +174,39 @@ bool wxHtmlListBox::Create(wxWindow *parent,
                            wxWindowID id,
                            const wxPoint& pos,
                            const wxSize& size,
                            wxWindowID id,
                            const wxPoint& pos,
                            const wxSize& size,

-                           size_t countItems,

                            long style,
                            const wxString& name)
 {
                            long style,
                            const wxString& name)
 {

-    return wxVListBox::Create(parent, id, pos, size, countItems, style, name);
+    return wxVListBox::Create(parent, id, pos, size, style, name);

 }
 
 wxHtmlListBox::~wxHtmlListBox()
 {
     delete m_cache;
 }
 
 wxHtmlListBox::~wxHtmlListBox()
 {
     delete m_cache;

+

     if ( m_htmlParser )
     {
         delete m_htmlParser->GetDC();
         delete m_htmlParser;
     }
     if ( m_htmlParser )
     {
         delete m_htmlParser->GetDC();
         delete m_htmlParser;
     }

+
+    delete m_htmlRendStyle;
+}
+
+// ----------------------------------------------------------------------------
+// wxHtmlListBox appearance
+// ----------------------------------------------------------------------------
+
+wxColour wxHtmlListBox::GetSelectedTextColour(const wxColour& colFg) const
+{
+    return m_htmlRendStyle->
+                wxDefaultHtmlRenderingStyle::GetSelectedTextColour(colFg);
+}
+
+wxColour
+wxHtmlListBox::GetSelectedTextBgColour(const wxColour& WXUNUSED(colBg)) const
+{
+    return GetSelectionBackground();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -122,6 +221,10 @@ wxString wxHtmlListBox::OnGetItemMarkup(size_t n) const
     return OnGetItem(n);
 }
 
     return OnGetItem(n);
 }
 

+// ----------------------------------------------------------------------------
+// wxHtmlListBox cache handling
+// ----------------------------------------------------------------------------
+

 void wxHtmlListBox::CacheItem(size_t n) const
 {
     if ( !m_cache->Has(n) )
 void wxHtmlListBox::CacheItem(size_t n) const
 {
     if ( !m_cache->Has(n) )


@@ -138,12 +241,35 @@ void wxHtmlListBox::CacheItem(size_t n) const
                 Parse(OnGetItemMarkup(n));
         wxCHECK_RET( cell, _T("wxHtmlParser::Parse() returned NULL?") );
 
                 Parse(OnGetItemMarkup(n));
         wxCHECK_RET( cell, _T("wxHtmlParser::Parse() returned NULL?") );
 

-        cell->Layout(GetClientSize().x);
+        cell->Layout(GetClientSize().x - 2*GetMargins().x);

 
         m_cache->Store(n, cell);
     }
 }
 
 
         m_cache->Store(n, cell);
     }
 }
 

+void wxHtmlListBox::OnSize(wxSizeEvent& event)
+{
+    // we need to relayout all the cached cells
+    m_cache->Clear();
+
+    event.Skip();
+}
+
+void wxHtmlListBox::RefreshAll()
+{
+    m_cache->Clear();
+
+    wxVListBox::RefreshAll();
+}
+
+void wxHtmlListBox::SetItemCount(size_t count)
+{
+    // the items are going to change, forget the old ones
+    m_cache->Clear();
+
+    wxVListBox::SetItemCount(count);
+}
+

 // ----------------------------------------------------------------------------
 // wxHtmlListBox implementation of wxVListBox pure virtuals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxHtmlListBox implementation of wxVListBox pure virtuals
 // ----------------------------------------------------------------------------


@@ -155,23 +281,23 @@ void wxHtmlListBox::OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const
     wxHtmlCell *cell = m_cache->Get(n);
     wxCHECK_RET( cell, _T("this cell should be cached!") );
 
     wxHtmlCell *cell = m_cache->Get(n);
     wxCHECK_RET( cell, _T("this cell should be cached!") );
 

+    wxHtmlRenderingInfo htmlRendInfo;
+

     // draw the selected cell in selected state
     if ( IsSelected(n) )
     {
         wxHtmlSelection htmlSel;
         htmlSel.Set(wxPoint(0, 0), cell, wxPoint(INT_MAX, INT_MAX), cell);
     // draw the selected cell in selected state
     if ( IsSelected(n) )
     {
         wxHtmlSelection htmlSel;
         htmlSel.Set(wxPoint(0, 0), cell, wxPoint(INT_MAX, INT_MAX), cell);

-        wxHtmlRenderingState htmlRendState(&htmlSel);
-        htmlRendState.SetSelectionState(wxHTML_SEL_IN);
-        cell->Draw(dc, rect.x, rect.y, 0, INT_MAX, htmlRendState);
-    }
-    else
-    {
-        // 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
-        wxHtmlRenderingState htmlRendState(NULL);
-        cell->Draw(dc, rect.x, rect.y, 0, INT_MAX, htmlRendState);
+        htmlRendInfo.SetSelection(&htmlSel);
+        if ( m_htmlRendStyle )
+            htmlRendInfo.SetStyle(m_htmlRendStyle);
+        htmlRendInfo.GetState().SetSelectionState(wxHTML_SEL_IN);

     }
     }

+
+    // 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);

 }
 
 wxCoord wxHtmlListBox::OnMeasureItem(size_t n) const
 }
 
 wxCoord wxHtmlListBox::OnMeasureItem(size_t n) const