rewrote wxLocale to work in Unicode mode and support charsets better

[wxWidgets.git] / include / wx / generic / helpwxht.h

diff --git a/include/wx/generic/helpwxht.h b/include/wx/generic/helpwxht.h
index 9f1f8f9fcad2c7593985ff1550dfffc6c6dceb1d..62d3da59aa4f11cd1a9d88380f62aebf3941eab7 100644 (file)
--- a/include/wx/generic/helpwxht.h
+++ b/include/wx/generic/helpwxht.h
@@ -6,8 +6,8 @@
  * $Id$
  *******************************************************************/
 
  * $Id$
  *******************************************************************/
 

-#ifndef __WX_HELPWXHT_H_
-#define __WX_HELPWXHT_H_
+#ifndef _WX_HELPWXHT_H_
+#define _WX_HELPWXHT_H_

 
 #if wxUSE_HELP
 #if wxUSE_HTML
 
 #if wxUSE_HELP
 #if wxUSE_HTML


@@ -58,7 +58,7 @@ DECLARE_CLASS(wxHelpControllerHtml)
    
 private:
    /// Call the browser using a relative URL.
    
 private:
    /// Call the browser using a relative URL.

-   virtual bool DisplayHelp(wxString const &);
+   virtual bool DisplayHelp(const wxString &);

 protected:
    friend class wxHelpFrame;
    class wxHelpFrame *m_Frame;
 protected:
    friend class wxHelpFrame;
    class wxHelpFrame *m_Frame;


@@ -72,4 +72,4 @@ protected:
 #endif // wxUSE_HELP
 #endif // wxUSE_HTML
 
 #endif // wxUSE_HELP
 #endif // wxUSE_HTML
 

-#endif // __WX_HELPEXT_H_
+#endif // _WX_HELPWXHT_H_