Added __WXMAC_OSX__ guards around the CFRunLoop calls, CFRunLoop not available on...

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

diff --git a/include/wx/help.h b/include/wx/help.h
index 98f7cee571d1bfbddebe130a9063073864539e5a..267a4b4d13b534d942ab20f7eb051576fae31f4e 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,16 +1,48 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        help.h
+// Purpose:     wxHelpController base header
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// Copyright:   (c) wxWidgets Team
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 
 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 

+#include "wx/defs.h"
+
+#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(__WXPALMOS__)
+    #include "wx/palmos/help.h"
+
+    #define wxHelpController wxPalmHelpController
+#elif defined(__WXMSW__)

     #include "wx/msw/helpwin.h"
 
     #define wxHelpController wxWinHelpController
     #include "wx/msw/helpwin.h"
 
     #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_