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 f1ba186db5c35bc81eddb3c19d03a48da9e0ab08..e67d49358a63d7d2c337e5e9a98ab4dcb8b928d1 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,24 +1,31 @@
-#ifndef __HELPH_BASE__
-#define __HELPH_BASE__
+#ifndef _WX_HELP_H_BASE_
+#define _WX_HELP_H_BASE_
 
-#ifdef __WINDOWS__
-#include "wx/msw/helpwin.h"
-#elif defined(__GTK__)
-#include "wx/generic/helphtml.h"
-#else
-#include "wx/generic/helpxlp.h"
-#endif
+#include "wx/helpbase.h"
+
+#ifdef __WXMSW__
+    #include "wx/msw/helpwin.h"
 
-#ifdef __WINDOWS__
-#define wxHelpController wxWinHelpController
-#define classwxHelpController classwxWinHelpController
-#elif defined(__GTK__)
-#define wxHelpController wxHTMLHelpController
-#define classwxHelpController classwxHTMLHelpController
+    #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 classwxHelpController classwxXLPHelpController
+#   include "wx/generic/helpext.h"
+#   define wxHelpController wxExtHelpController
+#   define sm_classwxHelpController sm_classwxExtHelpController
 #endif
 
+#endif // MSW/!MSW
+
 #endif
-    // __HELPH_BASE__
+    // _WX_HELP_H_BASE_