fixing warning and compile error against 10.4

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

diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h
index 2ee6fa33b8a59fd0570ab1cfbdda87959c602d88..bafab9ecd529e5db9a4aded808bcd4498d30d6bb 100644 (file)
--- a/include/wx/html/helpdata.h
+++ b/include/wx/html/helpdata.h
@@ -100,7 +100,7 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxHtmlHelpDataItem, wxHtmlHelpDataItems,
 
 //------------------------------------------------------------------------------
 // wxHtmlSearchEngine
 
 //------------------------------------------------------------------------------
 // wxHtmlSearchEngine

-//                  This class takes input streams and scans them for occurence
+//                  This class takes input streams and scans them for occurrence

 //                  of keyword(s)
 //------------------------------------------------------------------------------
 
 //                  of keyword(s)
 //------------------------------------------------------------------------------
 


@@ -122,7 +122,7 @@ private:
     bool m_CaseSensitive;
     bool m_WholeWords;
 
     bool m_CaseSensitive;
     bool m_WholeWords;
 

-    DECLARE_NO_COPY_CLASS(wxHtmlSearchEngine)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlSearchEngine);

 };
 
 
 };
 
 


@@ -157,7 +157,7 @@ private:
     int m_MaxIndex;  // number of files we search
     // For progress bar: 100*curindex/maxindex = % complete
 
     int m_MaxIndex;  // number of files we search
     // For progress bar: 100*curindex/maxindex = % complete
 

-    DECLARE_NO_COPY_CLASS(wxHtmlSearchStatus)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlSearchStatus);

 };
 
 class WXDLLIMPEXP_HTML wxHtmlHelpData : public wxObject
 };
 
 class WXDLLIMPEXP_HTML wxHtmlHelpData : public wxObject


@@ -215,7 +215,7 @@ protected:
     // Writes binary book
     bool SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f);
 
     // Writes binary book
     bool SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f);
 

-    DECLARE_NO_COPY_CLASS(wxHtmlHelpData)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlHelpData);

 };
 
 #endif
 };
 
 #endif