wxTinderbox warning fix.

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

diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp
index 812e663dd7644db2ea8e4067df05e37e16a436e8..f6669cbfe978bf69d1043689dab60812500d0acd 100644 (file)
--- a/src/generic/htmllbox.cpp
+++ b/src/generic/htmllbox.cpp
@@ -28,6 +28,8 @@
     #include "wx/dcclient.h"
 #endif //WX_PRECOMP
 
     #include "wx/dcclient.h"
 #endif //WX_PRECOMP
 

+#if wxUSE_HTML
+

 #include "wx/htmllbox.h"
 
 #include "wx/html/htmlcell.h"
 #include "wx/htmllbox.h"
 
 #include "wx/html/htmlcell.h"


@@ -37,14 +39,27 @@
 #include "wx/html/forcelnk.h"
 FORCE_WXHTML_MODULES()
 
 #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
 class 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
 class wxHtmlListBoxCache
 {

+private:
+    // invalidate a single item, used by Clear() and InvalidateRange()
+    void InvalidateItem(size_t n)
+    {
+        m_items[n] = (size_t)-1;
+        delete m_cells[n];
+        m_cells[n] = NULL;
+    }
+

 public:
     wxHtmlListBoxCache()
     {
 public:
     wxHtmlListBoxCache()
     {


@@ -70,9 +85,7 @@ public:
     {
         for ( size_t n = 0; n < SIZE; n++ )
         {
     {
         for ( size_t n = 0; n < SIZE; n++ )
         {

-            m_items[n] = (size_t)-1;
-            delete m_cells[n];
-            m_cells[n] = NULL;
+            InvalidateItem(n);

         }
     }
 
         }
     }
 


@@ -103,6 +116,18 @@ public:
             m_next = 0;
     }
 
             m_next = 0;
     }
 

+    // forget the cached value of the item(s) between the given ones (inclusive)
+    void InvalidateRange(size_t from, size_t to)
+    {
+        for ( size_t n = 0; n < SIZE; n++ )
+        {
+            if ( m_items[n] >= from && m_items[n] <= to )
+            {
+                InvalidateItem(n);
+            }
+        }
+    }
+

 private:
     // the max number of the items we cache
     enum { SIZE = 50 };
 private:
     // the max number of the items we cache
     enum { SIZE = 50 };


@@ -117,6 +142,34 @@ private:
     size_t m_items[SIZE];
 };
 
     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(const wxHtmlListBox& hlbox) : m_hlbox(hlbox) { }
+
+    virtual wxColour GetSelectedTextColour(const wxColour& colFg)
+    {
+        return m_hlbox.GetSelectedTextColour(colFg);
+    }
+
+    virtual wxColour GetSelectedTextBgColour(const wxColour& colBg)
+    {
+        return m_hlbox.GetSelectedTextBgColour(colBg);
+    }
+
+private:
+    const wxHtmlListBox& m_hlbox;
+
+    DECLARE_NO_COPY_CLASS(wxHtmlListBoxStyle)
+};
+
+

 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------


@@ -129,6 +182,9 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+IMPLEMENT_ABSTRACT_CLASS(wxHtmlListBox, wxVListBox)
+
+

 // ----------------------------------------------------------------------------
 // wxHtmlListBox creation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxHtmlListBox creation
 // ----------------------------------------------------------------------------


@@ -136,6 +192,7 @@ END_EVENT_TABLE()
 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;
 }
 


@@ -143,21 +200,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();

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


@@ -186,6 +261,10 @@ void wxHtmlListBox::CacheItem(size_t n) const
 
             self->m_htmlParser = new wxHtmlWinParser;
             m_htmlParser->SetDC(new wxClientDC(self));
 
             self->m_htmlParser = new wxHtmlWinParser;
             m_htmlParser->SetDC(new wxClientDC(self));

+            m_htmlParser->SetFS(&self->m_filesystem);
+
+            // use system's default GUI font by default:
+            m_htmlParser->SetStandardFonts();

         }
 
         wxHtmlContainerCell *cell = (wxHtmlContainerCell *)m_htmlParser->
         }
 
         wxHtmlContainerCell *cell = (wxHtmlContainerCell *)m_htmlParser->


@@ -206,6 +285,20 @@ void wxHtmlListBox::OnSize(wxSizeEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

+void wxHtmlListBox::RefreshLine(size_t line)
+{
+    m_cache->InvalidateRange(line, line);
+
+    wxVListBox::RefreshLine(line);
+}
+
+void wxHtmlListBox::RefreshLines(size_t from, size_t to)
+{
+    m_cache->InvalidateRange(from, to);
+
+    wxVListBox::RefreshLines(from, to);
+}
+

 void wxHtmlListBox::RefreshAll()
 {
     m_cache->Clear();
 void wxHtmlListBox::RefreshAll()
 {
     m_cache->Clear();


@@ -213,6 +306,14 @@ void wxHtmlListBox::RefreshAll()
     wxVListBox::RefreshAll();
 }
 
     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
 // ----------------------------------------------------------------------------


@@ -230,15 +331,17 @@ void wxHtmlListBox::OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const
     if ( IsSelected(n) )
     {
         wxHtmlSelection htmlSel;
     if ( IsSelected(n) )
     {
         wxHtmlSelection htmlSel;

-        htmlSel.Set(wxPoint(0, 0), cell, wxPoint(INT_MAX, INT_MAX), cell);
+        htmlSel.Set(wxPoint(0,0), cell, wxPoint(INT_MAX, INT_MAX), cell);

         htmlRendInfo.SetSelection(&htmlSel);
         htmlRendInfo.SetSelection(&htmlSel);

-        //htmlRendInfo.SetSelectionState(wxHTML_SEL_IN);
+        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
     }
 
     // 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
 }
 
 wxCoord wxHtmlListBox::OnMeasureItem(size_t n) const


@@ -248,6 +351,8 @@ wxCoord wxHtmlListBox::OnMeasureItem(size_t n) const
     wxHtmlCell *cell = m_cache->Get(n);
     wxCHECK_MSG( cell, 0, _T("this cell should be cached!") );
 
     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;

 }
 
 }
 

+#endif // wxUSE_HTML
+