no changes, just update the copyright in the header

[wxWidgets.git] / include / wx / msw / helpbest.h

diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h
index b5e7d83a44ca92dbee20ad93d837779c2d579e1e..d5f78ffb5f23fee9ee96f01e5d3bda232f491f91 100644 (file)
--- a/include/wx/msw/helpbest.h
+++ b/include/wx/msw/helpbest.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpbest.h
+// Name:        wx/msw/helpbest.h

 // Purpose:     Tries to load MS HTML Help, falls back to wxHTML upon failure
 // Author:      Mattia Barbon
 // Modified by:
 // Purpose:     Tries to load MS HTML Help, falls back to wxHTML upon failure
 // Author:      Mattia Barbon
 // Modified by:


@@ -12,17 +12,21 @@
 #ifndef _WX_HELPBEST_H_
 #define _WX_HELPBEST_H_
 
 #ifndef _WX_HELPBEST_H_
 #define _WX_HELPBEST_H_
 

-#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) \
+#if wxUSE_HELP && wxUSE_MS_HTML_HELP \

     && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)
 
 #include "wx/helpbase.h"
     && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)
 
 #include "wx/helpbase.h"

+#include "wx/html/helpfrm.h"        // for wxHF_DEFAULT_STYLE

 
 class WXDLLIMPEXP_HTML wxBestHelpController: public wxHelpControllerBase
 {
 public:
 
 class WXDLLIMPEXP_HTML wxBestHelpController: public wxHelpControllerBase
 {
 public:

-    wxBestHelpController()
-        : m_helpControllerType( wxUseNone ),
-          m_helpController( NULL )
+    wxBestHelpController(wxWindow* parentWindow = NULL,
+                         int style = wxHF_DEFAULT_STYLE)
+        : wxHelpControllerBase(parentWindow),
+          m_helpControllerType(wxUseNone),
+          m_helpController(NULL),
+          m_style(style)

     {
     }
 
     {
     }
 


@@ -98,6 +102,12 @@ public:
                                                      newFrameEachTime );
     }
 
                                                      newFrameEachTime );
     }
 

+    /// Set the window that can optionally be used for the help window's parent.
+    virtual void SetParentWindow(wxWindow* win) { m_helpController->SetParentWindow(win); }
+
+    /// Get the window that can optionally be used for the help window's parent.
+    virtual wxWindow* GetParentWindow() const { return m_helpController->GetParentWindow(); }
+

 protected:
     // Append/change extension if necessary.
     wxString GetValidFilename(const wxString& file) const;
 protected:
     // Append/change extension if necessary.
     wxString GetValidFilename(const wxString& file) const;


@@ -107,12 +117,13 @@ protected:
 
     HelpControllerType m_helpControllerType;
     wxHelpControllerBase* m_helpController;
 
     HelpControllerType m_helpControllerType;
     wxHelpControllerBase* m_helpController;

+    int m_style;

 
     DECLARE_DYNAMIC_CLASS(wxBestHelpController)
 
     DECLARE_DYNAMIC_CLASS(wxBestHelpController)

-    DECLARE_NO_COPY_CLASS(wxBestHelpController)
+    wxDECLARE_NO_COPY_CLASS(wxBestHelpController);

 };
 
 };
 

-#endif // wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP
+#endif // wxUSE_HELP && wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP

 
 #endif
     // _WX_HELPBEST_H_
 
 #endif
     // _WX_HELPBEST_H_