Added WinHelp sample doc to samples/help, and made it possible to show

both native and wxHTML help


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/generic/helpwxht.h

@@ -6,8 +6,8 @@
  * $Id$
  *******************************************************************/
 
-#ifndef __WX_HELPWXHT_H_
-#define __WX_HELPWXHT_H_
+#ifndef _WX_HELPWXHT_H_
+#define _WX_HELPWXHT_H_
 
 #if wxUSE_HELP
 #if wxUSE_HTML
@@ -72,4 +72,4 @@ protected:
 #endif // wxUSE_HELP
 #endif // wxUSE_HTML
 
-#endif // __WX_HELPEXT_H_
+#endif // _WX_HELPWXHT_H_

include/wx/help.h

@@ -9,7 +9,22 @@
     #define wxHelpController wxWinHelpController
     #define sm_classwxHelpController sm_classwxWinHelpController
 #else // !MSW
-    #include "wx/helpbase.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)
+*/
+
+#if wxUSE_HTML
+#   include "wx/generic/helpwxht.h"
+#   define wxHelpController wxHelpControllerHtml
+#   define sm_classwxHelpController sm_classwxHelpControllerHtml
+#else
+#   include "wx/generic/helpext.h"
+#   define wxHelpController wxExtHelpController
+#   define sm_classwxHelpController sm_classwxExtHelpController
+#endif
+
 #endif // MSW/!MSW
 
 #endif

include/wx/helpbase.h

@@ -72,23 +72,6 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject
   virtual void OnQuit(void) {};
 };
 
-
-/* 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)
-*/
-#ifndef __WXMSW__
-#if wxUSE_HTML
-#   include "wx/generic/helpwxht.h"
-#   define wxHelpController wxHelpControllerHtml
-#   define sm_classwxHelpController sm_classwxHelpControllerHtml
-#else
-#   include "wx/generic/helpext.h"
-#   define wxHelpController wxExtHelpController
-#   define sm_classwxHelpController sm_classwxExtHelpController
-#endif
-#endif // wxMSW
-
 #endif // wxUSE_HELP
 #endif
     // _WX_HELPBASEH__