help classes compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
259d1674f2
commit
e8b591249e
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user