fixed printing preview to not report errors in infinite loop (bug introduced by r54133)

[wxWidgets.git] / include / wx / htmllbox.h

diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h
index 89c06d29dc11154c52a51dc314afb33a0864345c..a8f41d7f76c92f968efcf0c033be6fbe140e991d 100644 (file)
--- a/include/wx/htmllbox.h
+++ b/include/wx/htmllbox.h
@@ -111,8 +111,11 @@ protected:
     virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const;
     virtual wxCoord OnMeasureItem(size_t n) const;
 
-    // This method may be overriden to handle clicking on a link in
-    // the listbox. By default, clicking links is ignored.
+    // override this one to draw custom background for selected items correctly
+    virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const;
+
+    // this method may be overridden to handle clicking on a link in the
+    // listbox (by default, clicks on links are simply ignored)
     virtual void OnLinkClicked(size_t n, const wxHtmlLinkInfo& link);
 
     // event handlers
@@ -268,8 +271,8 @@ public:
 
     virtual void SetString(unsigned int n, const wxString& s);
 
-    virtual void DoClear();
-    virtual void DoDeleteOneItem(unsigned int n);
+    // resolve ambiguity between wxItemContainer and wxVListBox versions
+    void Clear();
 
 protected:
     virtual int DoInsertItems(const wxArrayStringsAdapter & items,
@@ -282,10 +285,14 @@ protected:
     virtual void *DoGetItemClientData(unsigned int n) const
         { return m_HTMLclientData[n]; }
 
+    // wxItemContainer methods
+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n);
+
     // calls wxHtmlListBox::SetItemCount() and RefreshAll()
     void UpdateCount();
 
-    // overload these functions just to change their visibility: users of
+    // override these functions just to change their visibility: users of
     // wxSimpleHtmlListBox shouldn't be allowed to call them directly!
     virtual void SetItemCount(size_t count)
         { wxHtmlListBox::SetItemCount(count); }