make it non mach-o carbon savvy

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

diff --git a/include/wx/help.h b/include/wx/help.h
index eb1575cd8488b1205d89a9bcd97a4f58301b10ec..8fd7026427507f80744164a09b01b7b5e9d043a4 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,21 +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
+#if wxUSE_HELP
+
+#include "wx/helpbase.h"
+
+#ifdef __WXWINCE__
+    #include "wx/msw/wince/helpwce.h"
 
-#ifdef __WINDOWS__
-#define wxHelpController wxWinHelpController
-#elif defined(__GTK__)
-#define wxHelpController wxHTMLHelpController
+    #define wxHelpController wxWinceHelpController
+#elif defined(__WXMSW__)
+    #include "wx/msw/helpwin.h"
+
+    #define wxHelpController wxWinHelpController
+#else // !MSW
+
+#if wxUSE_WXHTML_HELP
+    #include "wx/html/helpctrl.h"
+    #define wxHelpController wxHtmlHelpController
 #else
-#define wxHelpController wxXLPHelpController
+    #include "wx/generic/helpext.h"
+    #define wxHelpController wxExtHelpController
 #endif
 
+#endif // MSW/!MSW
+
+#endif // wxUSE_HELP
+
 #endif
-    // __HELPH_BASE__
+    // _WX_HELP_H_BASE_