A few tweaks and cleanups

[wxWidgets.git] / include / wx / help.h

diff --git a/include/wx/help.h b/include/wx/help.h
index e67d49358a63d7d2c337e5e9a98ab4dcb8b928d1..9fceec27544169ec24982a37715d504b72a5228f 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,6 +1,8 @@
 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 
 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 

+#if wxUSE_HELP
+

 #include "wx/helpbase.h"
 
 #ifdef __WXMSW__
 #include "wx/helpbase.h"
 
 #ifdef __WXMSW__


@@ -10,22 +12,19 @@
     #define sm_classwxHelpController sm_classwxWinHelpController
 #else // !MSW
 
     #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
 #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
 
 #endif // MSW/!MSW
 

+#endif // wxUSE_HELP
+

 #endif
     // _WX_HELP_H_BASE_
 #endif
     // _WX_HELP_H_BASE_