fixing 'id' objc.h collisions, listbox rewrite

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

diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h
index 6c37476ace42552c38a828c69a5b9956a06e8183..8a2a379e3502165b017dfbf06b324d8e2925d16f 100644 (file)
--- a/include/wx/htmllbox.h
+++ b/include/wx/htmllbox.h
@@ -30,7 +30,7 @@ class WXDLLIMPEXP_HTML wxHtmlListBoxStyle;
 
 class WXDLLIMPEXP_HTML wxHtmlListBox : public wxVListBox,
                                        public wxHtmlWindowInterface,
 
 class WXDLLIMPEXP_HTML wxHtmlListBox : public wxVListBox,
                                        public wxHtmlWindowInterface,

-                                       private wxHtmlWindowMouseHelper
+                                       public wxHtmlWindowMouseHelper

 {
     DECLARE_ABSTRACT_CLASS(wxHtmlListBox)
 public:
 {
     DECLARE_ABSTRACT_CLASS(wxHtmlListBox)
 public:


@@ -139,6 +139,7 @@ private:
     virtual void SetHTMLBackgroundColour(const wxColour& clr);
     virtual void SetHTMLBackgroundImage(const wxBitmap& bmpBg);
     virtual void SetHTMLStatusText(const wxString& text);
     virtual void SetHTMLBackgroundColour(const wxColour& clr);
     virtual void SetHTMLBackgroundImage(const wxBitmap& bmpBg);
     virtual void SetHTMLStatusText(const wxString& text);

+    virtual wxCursor GetHTMLCursor(HTMLCursor type) const;

 
     // returns index of item that contains given HTML cell
     size_t GetItemForCell(const wxHtmlCell *cell) const;
 
     // returns index of item that contains given HTML cell
     size_t GetItemForCell(const wxHtmlCell *cell) const;