show the taskbar icon even after Explorer restart (patch 723532) + some code cleanup

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

diff --git a/include/wx/help.h b/include/wx/help.h
index 704244ae095f07de3541555b78e509a725245f09..9fceec27544169ec24982a37715d504b72a5228f 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,18 +1,30 @@
 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 
+#if wxUSE_HELP
+
 #include "wx/helpbase.h"
 
 #ifdef __WXMSW__
     #include "wx/msw/helpwin.h"
 
-    #undef wxHelpController
-    #undef sm_classwxHelpController
     #define wxHelpController wxWinHelpController
     #define sm_classwxHelpController sm_classwxWinHelpController
 #else // !MSW
-    #include "wx/helpbase.h"
+
+#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
+#endif
+
 #endif // MSW/!MSW
 
+#endif // wxUSE_HELP
+
 #endif
     // _WX_HELP_H_BASE_