make wxSetEnv compatible with ANSI and Unicode, deprecate passing NULL to it in favou...

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

diff --git a/include/wx/help.h b/include/wx/help.h
index bd4b00f3afa852516d6a4e8679351bd8d7579afe..2bbf133418174bd63b2240b941703e0a2c73bd3b 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,6 +1,19 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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"
@@ -9,22 +22,22 @@
     #include "wx/msw/wince/helpwce.h"
 
     #define wxHelpController wxWinceHelpController
-    #define sm_classwxHelpController sm_classwxWinceHelpController
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/help.h"
+
+    #define wxHelpController wxPalmHelpController
 #elif defined(__WXMSW__)
-    #include "wx/msw/helpwin.h"
+    #include "wx/msw/helpchm.h"
 
-    #define wxHelpController wxWinHelpController
-    #define sm_classwxHelpController sm_classwxWinHelpController
+    #define wxHelpController wxCHMHelpController
 #else // !MSW
 
 #if wxUSE_WXHTML_HELP
     #include "wx/html/helpctrl.h"
     #define wxHelpController wxHtmlHelpController
-    #define sm_classwxHelpController sm_classwxHtmlHelpController
 #else
     #include "wx/generic/helpext.h"
     #define wxHelpController wxExtHelpController
-    #define sm_classwxHelpController sm_classwxExtHelpController
 #endif
 
 #endif // MSW/!MSW