Derive wxScrollBar from wxScrollBarBase, plus miscellaneous

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

diff --git a/include/wx/help.h b/include/wx/help.h
index b8d5098502f3ddcb6925f068a45211828440fa8a..9fceec27544169ec24982a37715d504b72a5228f 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,19 +1,30 @@
 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 
-#ifdef __WXMSW__
-#include "wx/msw/helpwin.h"
-#else
-#include "wx/generic/helpext.h"
-#endif
+#if wxUSE_HELP
+
+#include "wx/helpbase.h"
 
 #ifdef __WXMSW__
-#define wxHelpController wxWinHelpController
-#define sm_classwxHelpController sm_classwxWinHelpController
+    #include "wx/msw/helpwin.h"
+
+    #define wxHelpController wxWinHelpController
+    #define sm_classwxHelpController sm_classwxWinHelpController
+#else // !MSW
+
+#if wxUSE_WXHTML_HELP
+    #include "wx/html/helpctrl.h"
+    #define wxHelpController wxHtmlHelpController
+    #define sm_classwxHelpController sm_classwxHtmlHelpController
 #else
-#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_