Fixes for semicolons, commas and wxSTRING_MAXLEN from Wlodek Szafran.

[wxWidgets.git] / include / wx / html / helpdata.h

diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h
index 62cb77393812d2a7ce4f0ebf2ea0e56ca4771a0f..02eb64c8fa57ef382c12b594c2c99d9259a1dbf9 100644 (file)
--- a/include/wx/html/helpdata.h
+++ b/include/wx/html/helpdata.h
@@ -12,10 +12,6 @@
 #ifndef _WX_HELPDATA_H_
 #define _WX_HELPDATA_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "helpdata.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_HTML
@@ -35,7 +31,7 @@ class WXDLLIMPEXP_HTML wxHtmlHelpData;
 class WXDLLIMPEXP_HTML wxHtmlBookRecord
 {
 public:
-    wxHtmlBookRecord(const wxString& bookfile, const wxString& basepath, 
+    wxHtmlBookRecord(const wxString& bookfile, const wxString& basepath,
                      const wxString& title, const wxString& start)
     {
         m_BookFile = bookfile;
@@ -62,8 +58,8 @@ public:
     void SetBasePath(const wxString& path) { m_BasePath = path; }
     void SetStart(const wxString& start) { m_Start = start; }
 
-    // returns full filename of page (which is part of the book), 
-    // i.e. with book's basePath prepended. If page is already absolute 
+    // returns full filename of page (which is part of the book),
+    // i.e. with book's basePath prepended. If page is already absolute
     // path, basePath is _not_ prepended.
     wxString GetFullPath(const wxString &page) const;
 
@@ -82,15 +78,15 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxHtmlBookRecord, wxHtmlBookRecArray,
 
 struct WXDLLIMPEXP_HTML wxHtmlHelpDataItem
 {
-    wxHtmlHelpDataItem() : level(0), parent(NULL), id(-1), book(NULL) {}
+    wxHtmlHelpDataItem() : level(0), parent(NULL), id(wxID_ANY), book(NULL) {}
 
-    short int level;
+    int level;
     wxHtmlHelpDataItem *parent;
     int id;
     wxString name;
     wxString page;
     wxHtmlBookRecord *book;
-    
+
     // returns full filename of m_Page, i.e. with book's basePath prepended
     wxString GetFullPath() const { return book->GetFullPath(page); }
 
@@ -110,12 +106,12 @@ struct wxHtmlContentsItem
     wxHtmlContentsItem& operator=(const wxHtmlContentsItem& d);
     ~wxHtmlContentsItem();
 
-    short int m_Level;
+    int m_Level;
     int m_ID;
     wxChar *m_Name;
     wxChar *m_Page;
     wxHtmlBookRecord *m_Book;
-    
+
     // returns full filename of m_Page, i.e. with book's basePath prepended
     wxString GetFullPath() const { return m_Book->GetFullPath(m_Page); }
 
@@ -135,13 +131,13 @@ class WXDLLIMPEXP_HTML wxHtmlSearchEngine : public wxObject
 {
 public:
     wxHtmlSearchEngine() : wxObject() {}
-    ~wxHtmlSearchEngine() {}
+    virtual ~wxHtmlSearchEngine() {}
 
     // Sets the keyword we will be searching for
     virtual void LookFor(const wxString& keyword, bool case_sensitive, bool whole_words_only);
 
     // Scans the stream for the keyword.
-    // Returns TRUE if the stream contains keyword, fALSE otherwise
+    // Returns true if the stream contains keyword, fALSE otherwise
     virtual bool Scan(const wxFSFile& file);
 
 private:
@@ -153,8 +149,8 @@ private:
 };
 
 
-// State information of a search action. I'd have prefered to make this a nested
-// class inside wxHtmlHelpData, but that's against coding standards :-(
+// State information of a search action. I'd have preferred to make this a
+// nested class inside wxHtmlHelpData, but that's against coding standards :-(
 // Never construct this class yourself, obtain a copy from
 // wxHtmlHelpData::PrepareKeywordSearch(const wxString& key)
 class WXDLLIMPEXP_HTML wxHtmlSearchStatus
@@ -197,7 +193,7 @@ class WXDLLIMPEXP_HTML wxHtmlHelpData : public wxObject
 
 public:
     wxHtmlHelpData();
-    ~wxHtmlHelpData();
+    virtual ~wxHtmlHelpData();
 
     // Sets directory where temporary files are stored.
     // These temp files are index & contents file in binary (much faster to read)
@@ -243,7 +239,7 @@ protected:
 
     wxHtmlHelpDataItems m_contents; // list of all available books and pages
     wxHtmlHelpDataItems m_index; // list of index itesm
-    
+
 #if WXWIN_COMPATIBILITY_2_4
     // deprecated data structures, set only if GetContents(), GetIndex()
     // called