X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c4a59a881c4b58111b104fb18597009c6b55fec..ab0d42f76d5594bd28fdcad35bedeb380902f3ea:/include/wx/help.h?ds=inline

diff --git a/include/wx/help.h b/include/wx/help.h
index e67d49358a..9fceec2754 100644
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,6 +1,8 @@
 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 
+#if wxUSE_HELP
+
 #include "wx/helpbase.h"
 
 #ifdef __WXMSW__
@@ -10,22 +12,19 @@
     #define sm_classwxHelpController sm_classwxWinHelpController
 #else // !MSW
 
-/* By default, if wxHTML is compiled in, use the
-   wxHelpControllerHtml. If not, use the external help controller.
-   (of course, we shouldn't do it for wxMSW)
-*/
-
-#if wxUSE_HTML
-#   include "wx/generic/helpwxht.h"
-#   define wxHelpController wxHelpControllerHtml
-#   define sm_classwxHelpController sm_classwxHelpControllerHtml
+#if wxUSE_WXHTML_HELP
+    #include "wx/html/helpctrl.h"
+    #define wxHelpController wxHtmlHelpController
+    #define sm_classwxHelpController sm_classwxHtmlHelpController
 #else
-#   include "wx/generic/helpext.h"
-#   define wxHelpController wxExtHelpController
-#   define sm_classwxHelpController sm_classwxExtHelpController
+    #include "wx/generic/helpext.h"
+    #define wxHelpController wxExtHelpController
+    #define sm_classwxHelpController sm_classwxExtHelpController
 #endif
 
 #endif // MSW/!MSW
 
+#endif // wxUSE_HELP
+
 #endif
     // _WX_HELP_H_BASE_