Use "_x64" instead of "amd64" for x64 MSW makefile builds.

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

diff --git a/include/wx/help.h b/include/wx/help.h
index eb1575cd8488b1205d89a9bcd97a4f58301b10ec..5dbb79b3085ffc84c3cb17eb2a00f213819e3f9b 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,21 +1,44 @@
-#ifndef __HELPH_BASE__
-#define __HELPH_BASE__
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/help.h
+// Purpose:     wxHelpController base header
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////

 
 

-#ifdef __WINDOWS__
-#include "wx/msw/helpwin.h"
-#elif defined(__GTK__)
-#include "wx/generic/helphtml.h"
-#else
-#include "wx/generic/helpxlp.h"
-#endif
+#ifndef _WX_HELP_H_BASE_
+#define _WX_HELP_H_BASE_
+
+#include "wx/defs.h"
+
+#if wxUSE_HELP
+
+#include "wx/helpbase.h"

 
 

-#ifdef __WINDOWS__
-#define wxHelpController wxWinHelpController
-#elif defined(__GTK__)
-#define wxHelpController wxHTMLHelpController
+#ifdef __WXWINCE__
+    #include "wx/msw/wince/helpwce.h"
+
+    #define wxHelpController wxWinceHelpController
+#elif defined(__WXMSW__)
+    #include "wx/msw/helpchm.h"
+
+    #define wxHelpController wxCHMHelpController
+#else // !MSW
+
+#if wxUSE_WXHTML_HELP
+    #include "wx/html/helpctrl.h"
+    #define wxHelpController wxHtmlHelpController

 #else
 #else

-#define wxHelpController wxXLPHelpController
+    #include "wx/generic/helpext.h"
+    #define wxHelpController wxExtHelpController

 #endif
 
 #endif
 

+#endif // MSW/!MSW
+
+#endif // wxUSE_HELP
+

 #endif
 #endif

-    // __HELPH_BASE__
+    // _WX_HELP_H_BASE_