Must have valid colours for X11 popup window implementation

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

diff --git a/include/wx/help.h b/include/wx/help.h
index 704244ae095f07de3541555b78e509a725245f09..8fd7026427507f80744164a09b01b7b5e9d043a4 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,18 +1,31 @@
 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 
 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 

+#if wxUSE_HELP
+

 #include "wx/helpbase.h"
 
 #include "wx/helpbase.h"
 

-#ifdef __WXMSW__
+#ifdef __WXWINCE__
+    #include "wx/msw/wince/helpwce.h"
+
+    #define wxHelpController wxWinceHelpController
+#elif defined(__WXMSW__)

     #include "wx/msw/helpwin.h"
 
     #include "wx/msw/helpwin.h"
 

-    #undef wxHelpController
-    #undef sm_classwxHelpController

     #define wxHelpController wxWinHelpController
     #define wxHelpController wxWinHelpController

-    #define sm_classwxHelpController sm_classwxWinHelpController

 #else // !MSW
 #else // !MSW

-    #include "wx/helpbase.h"
+
+#if wxUSE_WXHTML_HELP
+    #include "wx/html/helpctrl.h"
+    #define wxHelpController wxHtmlHelpController
+#else
+    #include "wx/generic/helpext.h"
+    #define wxHelpController wxExtHelpController
+#endif
+

 #endif // MSW/!MSW
 
 #endif // MSW/!MSW
 

+#endif // wxUSE_HELP
+

 #endif
     // _WX_HELP_H_BASE_
 #endif
     // _WX_HELP_H_BASE_