safer definitions for wx(U)Int32,16 (taken from intl.cpp)

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

diff --git a/include/wx/help.h b/include/wx/help.h
index 98f7cee571d1bfbddebe130a9063073864539e5a..8b6a9c1ddbc529bf42f90620b77488d71723261d 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_
 
+#if wxUSE_HELP
+
 #include "wx/helpbase.h"
 
 #ifdef __WXMSW__
@@ -9,8 +11,20 @@
     #define wxHelpController wxWinHelpController
     #define sm_classwxHelpController sm_classwxWinHelpController
 #else // !MSW
-    #include "wx/helpbase.h"
+
+#if wxUSE_WXHTML_HELP
+    #include "wx/generic/helpwxht.h"
+    #define wxHelpController wxHelpControllerHtml
+    #define sm_classwxHelpController sm_classwxHelpControllerHtml
+#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_