Avoid CRT deprecation warnings for MSVC build using makefiles too.

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

diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h
index 95b128084c3b6d22a6c75181e5649f3083e0ead0..d5f78ffb5f23fee9ee96f01e5d3bda232f491f91 100644 (file)
--- a/include/wx/msw/helpbest.h
+++ b/include/wx/msw/helpbest.h
@@ -16,13 +16,17 @@
     && 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(wxWindow* parentWindow = NULL)
-        : wxHelpControllerBase( parentWindow ), 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)

     {
     }
 
     {
     }
 


@@ -113,9 +117,10 @@ 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 && wxUSE_WXHTML_HELP
 };
 
 #endif // wxUSE_HELP && wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP