Moved the declaration of wxEVT_NULL to event.cpp and made it extern in the header...

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

diff --git a/include/wx/help.h b/include/wx/help.h
index 7448e58349734314e134e6b5b5611909697d0baf..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_
 
 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 

-#ifdef __WXMSW__
-#include "wx/msw/helpwin.h"
-#elif defined(__WXGTK__)
-#include "wx/generic/helpext.h"
-#else
-#include "wx/generic/helpxlp.h"
-#endif
+#include "wx/helpbase.h"

 
 #ifdef __WXMSW__
 
 #ifdef __WXMSW__

-#define wxHelpController wxWinHelpController
-#define sm_classwxHelpController sm_classwxWinHelpController
-#elif defined(__WXGTK__)
-#define wxHelpController wxExtHelpController
-#define sm_classwxHelpController sm_classwxExtHelpController
+    #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
 #else

-#define wxHelpController wxXLPHelpController
-#define sm_classwxHelpController sm_classwxXLPHelpController
+#   include "wx/generic/helpext.h"
+#   define wxHelpController wxExtHelpController
+#   define sm_classwxHelpController sm_classwxExtHelpController

 #endif
 
 #endif
 

+#endif // MSW/!MSW
+

 #endif
     // _WX_HELP_H_BASE_
 #endif
     // _WX_HELP_H_BASE_