From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 24 Jul 1999 23:12:39 +0000 (+0000)
Subject: help classes compilation fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e8b591249e3a242c46f865f3ece04b067cc3ddd1?ds=sidebyside

help classes compilation fixes


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

diff --git a/include/wx/help.h b/include/wx/help.h
index 704244ae09..98f7cee571 100644
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -6,8 +6,6 @@
 #ifdef __WXMSW__
     #include "wx/msw/helpwin.h"
 
-    #undef wxHelpController
-    #undef sm_classwxHelpController
     #define wxHelpController wxWinHelpController
     #define sm_classwxHelpController sm_classwxWinHelpController
 #else // !MSW
diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h
index 2594d10f46..6ff9b79a47 100644
--- a/include/wx/helpbase.h
+++ b/include/wx/helpbase.h
@@ -54,7 +54,10 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject
 
 
 /* By default, if wxHTML is compiled in, use the
-   wxHelpControllerHtml. If not, use the external help controller. */
+   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
@@ -64,7 +67,7 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject
 #   define wxHelpController wxExtHelpController
 #   define sm_classwxHelpController sm_classwxExtHelpController
 #endif
-
+#endif // wxMSW
 
 #endif // wxUSE_HELP
 #endif