applied patch 103575 (more efficient wxString comparison)

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

diff --git a/include/wx/help.h b/include/wx/help.h
index 36c6b04e41f50aa29d3d994c0083fe130da10bf3..e67d49358a63d7d2c337e5e9a98ab4dcb8b928d1 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,24 +1,31 @@
 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 
-#ifdef __WXMSW__
-#include "wx/msw/helpwin.h"
-#elif defined(__WXGTK__)
-#include "wx/generic/helphtml.h"
-#else
-#include "wx/generic/helpxlp.h"
-#endif
+#include "wx/helpbase.h"
 
 #ifdef __WXMSW__
-#define wxHelpController wxWinHelpController
-#define sm_classwxHelpController sm_classwxWinHelpController
-#elif defined(__WXGTK__)
-#define wxHelpController wxHTMLHelpController
-#define sm_classwxHelpController sm_classwxHTMLHelpController
+    #include "wx/msw/helpwin.h"
+
+    #define wxHelpController wxWinHelpController
+    #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
 #else
-#define wxHelpController wxXLPHelpController
-#define sm_classwxHelpController sm_classwxXLPHelpController
+#   include "wx/generic/helpext.h"
+#   define wxHelpController wxExtHelpController
+#   define sm_classwxHelpController sm_classwxExtHelpController
 #endif
 
+#endif // MSW/!MSW
+
 #endif
     // _WX_HELP_H_BASE_