Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/help.h b/include/wx/help.h
index 5ea82acabd216a8ea53671e54540a671e9909032..5dbb79b3085ffc84c3cb17eb2a00f213819e3f9b 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,6 +1,19 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/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_
 
 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 

+#include "wx/defs.h"
+

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


@@ -9,14 +22,10 @@
     #include "wx/msw/wince/helpwce.h"
 
     #define wxHelpController wxWinceHelpController
     #include "wx/msw/wince/helpwce.h"
 
     #define wxHelpController wxWinceHelpController

-#elif defined(__WXPALMOS__)
-    #include "wx/palmos/help.h"
-
-    #define wxHelpController wxPalmHelpController

 #elif defined(__WXMSW__)
 #elif defined(__WXMSW__)

-    #include "wx/msw/helpwin.h"
+    #include "wx/msw/helpchm.h"

 
 

-    #define wxHelpController wxWinHelpController
+    #define wxHelpController wxCHMHelpController

 #else // !MSW
 
 #if wxUSE_WXHTML_HELP
 #else // !MSW
 
 #if wxUSE_WXHTML_HELP