proper default for iphone

[wxWidgets.git] / tests / benchmarks / htmlparser / htmlpars.h

diff --git a/tests/benchmarks/htmlparser/htmlpars.h b/tests/benchmarks/htmlparser/htmlpars.h
index 5618267231f007933f5f2a70568b6147fa6d8558..f2e73452771c5ad48a92c48b48d135cf25442ae6 100644 (file)
--- a/tests/benchmarks/htmlparser/htmlpars.h
+++ b/tests/benchmarks/htmlparser/htmlpars.h
@@ -2,7 +2,6 @@
 // Name:        htmlpars.h
 // Purpose:     wx28HtmlParser class (generic parser)
 // Author:      Vaclav Slavik
 // Name:        htmlpars.h
 // Purpose:     wx28HtmlParser class (generic parser)
 // Author:      Vaclav Slavik

-// RCS-ID:      $Id$

 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -136,15 +135,15 @@ protected:
                           wx28HtmlTagsCache *cache);
 
     // Adds text to the output.
                           wx28HtmlTagsCache *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)
     // NOTE : using char* because of speed improvements
     virtual void AddText(const wxChar* txt) = 0;
 
     // Adds tag and proceeds it. Parse() may (and usually is) called from this method.
     // txt is not guaranteed to be only one word. It is largest continuous part of text
     // (= not broken by tags)
     // NOTE : using char* because of speed improvements
     virtual void AddText(const wxChar* 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 wx28HtmlTag& tag);
     // ignored if no hander is found.
     // Derived class is *responsible* for filling in m_Handlers table.
     virtual void AddTag(const wx28HtmlTag& tag);


@@ -250,7 +249,7 @@ public:
     virtual ~wx28HtmlEntitiesParser();
 
     // Sets encoding of output string.
     virtual ~wx28HtmlEntitiesParser();
 
     // Sets encoding of output string.

-    // Has no effect if wxUSE_WCHAR_T==0 or wxUSE_UNICODE==1
+    // Has no effect if wxUSE_UNICODE==1

     void SetEncoding(wxFontEncoding encoding);
 
     // Parses entities in input and replaces them with respective characters
     void SetEncoding(wxFontEncoding encoding);
 
     // Parses entities in input and replaces them with respective characters


@@ -268,7 +267,7 @@ 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