compilation fix for wxString::Format("no variadic arguments") and VC6

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

diff --git a/include/wx/help.h b/include/wx/help.h
index e67d49358a63d7d2c337e5e9a98ab4dcb8b928d1..2bbf133418174bd63b2240b941703e0a2c73bd3b 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,31 +1,48 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        help.h
+// Purpose:     wxHelpController base header
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 
+#include "wx/defs.h"
+
+#if wxUSE_HELP
+
 #include "wx/helpbase.h"
 
-#ifdef __WXMSW__
-    #include "wx/msw/helpwin.h"
+#ifdef __WXWINCE__
+    #include "wx/msw/wince/helpwce.h"
 
-    #define wxHelpController wxWinHelpController
-    #define sm_classwxHelpController sm_classwxWinHelpController
-#else // !MSW
+    #define wxHelpController wxWinceHelpController
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/help.h"
 
-/* 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)
-*/
+    #define wxHelpController wxPalmHelpController
+#elif defined(__WXMSW__)
+    #include "wx/msw/helpchm.h"
 
-#if wxUSE_HTML
-#   include "wx/generic/helpwxht.h"
-#   define wxHelpController wxHelpControllerHtml
-#   define sm_classwxHelpController sm_classwxHelpControllerHtml
+    #define wxHelpController wxCHMHelpController
+#else // !MSW
+
+#if wxUSE_WXHTML_HELP
+    #include "wx/html/helpctrl.h"
+    #define wxHelpController wxHtmlHelpController
 #else
-#   include "wx/generic/helpext.h"
-#   define wxHelpController wxExtHelpController
-#   define sm_classwxHelpController sm_classwxExtHelpController
+    #include "wx/generic/helpext.h"
+    #define wxHelpController wxExtHelpController
 #endif
 
 #endif // MSW/!MSW
 
+#endif // wxUSE_HELP
+
 #endif
     // _WX_HELP_H_BASE_