no message

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

diff --git a/include/wx/generic/helpwxht.h b/include/wx/generic/helpwxht.h
index 18c765afae0e1d1f71df24031b28b8a49e7b114c..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


@@ -51,14 +51,14 @@ DECLARE_CLASS(wxHelpControllerHtml)
                                    const wxPoint &pos = wxDefaultPosition,
                                    bool newFrameEachTime = FALSE);
    /// Obtains the latest settings used by the help frame.
                                    const wxPoint &pos = wxDefaultPosition,
                                    bool newFrameEachTime = FALSE);
    /// Obtains the latest settings used by the help frame.

-   virtual void GetFrameParameters(wxSize *size = NULL,
-                                   wxPoint *pos = NULL,
-                                   bool *newFrameEachTime = NULL);
+   virtual wxFrame * GetFrameParameters(wxSize *size = NULL,
+                                        wxPoint *pos = NULL,
+                                        bool *newFrameEachTime = NULL);

    
    
 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_