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 704244ae095f07de3541555b78e509a725245f09..98f7cee571d1bfbddebe130a9063073864539e5a 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -6,8 +6,6 @@
 #ifdef __WXMSW__
     #include "wx/msw/helpwin.h"
 
 #ifdef __WXMSW__
     #include "wx/msw/helpwin.h"
 

-    #undef wxHelpController
-    #undef sm_classwxHelpController

     #define wxHelpController wxWinHelpController
     #define sm_classwxHelpController sm_classwxWinHelpController
 #else // !MSW
     #define wxHelpController wxWinHelpController
     #define sm_classwxHelpController sm_classwxWinHelpController
 #else // !MSW

diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h
index 2594d10f46e6adbeefde3e0b8115a08a5e760ab5..6ff9b79a476eda077fb422a2465723021276ed75 100644 (file)
--- 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
 
 
 /* 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
 #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
 #   define wxHelpController wxExtHelpController
 #   define sm_classwxHelpController sm_classwxExtHelpController
 #endif

-
+#endif // wxMSW

 
 #endif // wxUSE_HELP
 #endif
 
 #endif // wxUSE_HELP
 #endif