fixing warning and compile error against 10.4

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

diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h
index 92dc1be5756bc6e8b79846a2a7b06f356c5bcfc0..e9fd5e013a50472453feede1d7b57ba709d65426 100644 (file)
--- a/include/wx/html/htmlpars.h
+++ b/include/wx/html/htmlpars.h
@@ -191,7 +191,7 @@ protected:
     wxHtmlTagHandlersSet m_HandlersSet;
     wxHtmlTagHandlersHash m_HandlersHash;
 
     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;
 
     // class for opening files (file system)
     wxFileSystem *m_FS;


@@ -254,7 +254,7 @@ protected:
 
     wxHtmlParser *m_Parser;
 
 
     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.
     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);
     void SetEncoding(wxFontEncoding encoding);

+#endif

 
     // Parses entities in input and replaces them with respective characters
     // (with respect to output encoding)
 
     // Parses entities in input and replaces them with respective characters
     // (with respect to output encoding)


@@ -287,12 +291,12 @@ public:
 #endif
 
 protected:
 #endif
 
 protected:

-#if wxUSE_WCHAR_T && !wxUSE_UNICODE
+#if !wxUSE_UNICODE

     wxMBConv *m_conv;
     wxFontEncoding m_encoding;
 #endif
 
     wxMBConv *m_conv;
     wxFontEncoding m_encoding;
 #endif
 

-    DECLARE_NO_COPY_CLASS(wxHtmlEntitiesParser)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlEntitiesParser);

 };
 
 
 };