Fix a number of mingw compile errors.

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

diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h
index 92dc1be5756bc6e8b79846a2a7b06f356c5bcfc0..e654cb3f0ace66818d5f8936f7dadf5427688645 100644 (file)
--- a/include/wx/html/htmlpars.h
+++ b/include/wx/html/htmlpars.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        htmlpars.h
+// Name:        wx/html/htmlpars.h
 // Purpose:     wxHtmlParser class (generic parser)
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -156,14 +156,14 @@ protected:
                           wxHtmlTagsCache *cache);
 
     // Adds text to the output.
-    // This is called from Parse() and must be overriden in derived classes.
+    // This is called from Parse() and must be overridden in derived classes.
     // txt is not guaranteed to be only one word. It is largest continuous part
     // of text (= not broken by tags)
     virtual void AddText(const wxString& txt) = 0;
 
     // Adds tag and proceeds it. Parse() may (and usually is) called from this method.
-    // This is called from Parse() and may be overriden.
-    // Default behavior is that it looks for proper handler in m_Handlers. The tag is
+    // This is called from Parse() and may be overridden.
+    // Default behaviour is that it looks for proper handler in m_Handlers. The tag is
     // ignored if no hander is found.
     // Derived class is *responsible* for filling in m_Handlers table.
     virtual void AddTag(const wxHtmlTag& tag);
@@ -191,7 +191,7 @@ protected:
     wxHtmlTagHandlersSet m_HandlersSet;
     wxHtmlTagHandlersHash m_HandlersHash;
 
-    DECLARE_NO_COPY_CLASS(wxHtmlParser)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlParser);
 
     // class for opening files (file system)
     wxFileSystem *m_FS;
@@ -254,7 +254,7 @@ protected:
 
     wxHtmlParser *m_Parser;
 
-    DECLARE_NO_COPY_CLASS(wxHtmlTagHandler)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlTagHandler);
 };
 
 
@@ -269,8 +269,12 @@ public:
     virtual ~wxHtmlEntitiesParser();
 
     // Sets encoding of output string.
-    // Has no effect if wxUSE_WCHAR_T==0 or wxUSE_UNICODE==1
+    // Has no effect if wxUSE_UNICODE==1
+#if wxUSE_UNICODE
+    void SetEncoding(wxFontEncoding WXUNUSED(encoding)) {}
+#else
     void SetEncoding(wxFontEncoding encoding);
+#endif
 
     // Parses entities in input and replaces them with respective characters
     // (with respect to output encoding)
@@ -287,12 +291,12 @@ public:
 #endif
 
 protected:
-#if wxUSE_WCHAR_T && !wxUSE_UNICODE
+#if !wxUSE_UNICODE
     wxMBConv *m_conv;
     wxFontEncoding m_encoding;
 #endif
 
-    DECLARE_NO_COPY_CLASS(wxHtmlEntitiesParser)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlEntitiesParser);
 };