don't pass NULL pointer to printf(), this crashes Solaris printf

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

diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h
index 97f2ae413edae12f43b86f44e60572b4f8266aa2..bf0d295bde861249b5d8d5391a6a60a72c8725ce 100644 (file)
--- a/include/wx/htmllbox.h
+++ b/include/wx/htmllbox.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     31.05.03
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -14,17 +14,22 @@
 
 #include "wx/vlbox.h"               // base class
 
-class WXDLLEXPORT wxHtmlCell;
-class WXDLLEXPORT wxHtmlWinParser;
-class WXDLLEXPORT wxHtmlListBoxCache;
-class WXDLLEXPORT wxHtmlListBoxStyle;
+#if wxUSE_FILESYSTEM
+    #include "wx/filesys.h"
+#endif // wxUSE_FILESYSTEM
+
+class WXDLLIMPEXP_HTML wxHtmlCell;
+class WXDLLIMPEXP_HTML wxHtmlWinParser;
+class WXDLLIMPEXP_HTML wxHtmlListBoxCache;
+class WXDLLIMPEXP_HTML wxHtmlListBoxStyle;
 
 // ----------------------------------------------------------------------------
 // wxHtmlListBox
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxHtmlListBox : public wxVListBox
+class WXDLLIMPEXP_HTML wxHtmlListBox : public wxVListBox
 {
+    DECLARE_ABSTRACT_CLASS(wxHtmlListBox)
 public:
     // constructors and such
     // ---------------------
@@ -61,9 +66,19 @@ public:
     // destructor cleans up whatever resources we use
     virtual ~wxHtmlListBox();
 
-    // refresh everything
+    // override some base class virtuals
+    virtual void RefreshLine(size_t line);
+    virtual void RefreshLines(size_t from, size_t to);
     virtual void RefreshAll();
+    virtual void SetItemCount(size_t count);
+
 
+#if wxUSE_FILESYSTEM
+    // retrieve the file system used by the wxHtmlWinParser: if you use
+    // relative paths in your HTML, you should use its ChangePathTo() method
+    wxFileSystem& GetFileSystem() { return m_filesystem; }
+    const wxFileSystem& GetFileSystem() const { return m_filesystem; }
+#endif // wxUSE_FILESYSTEM
 
 protected:
     // this method must be implemented in the derived class and should return
@@ -111,6 +126,11 @@ private:
     // HTML parser we use
     wxHtmlWinParser *m_htmlParser;
 
+#if wxUSE_FILESYSTEM
+    // file system used by m_htmlParser
+    wxFileSystem m_filesystem;
+#endif // wxUSE_FILESYSTEM
+
     // rendering style for the parser which allows us to customize our colours
     wxHtmlListBoxStyle *m_htmlRendStyle;
 
@@ -120,6 +140,7 @@ private:
 
 
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxHtmlListBox)
 };
 
 #endif // _WX_HTMLLBOX_H_