Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

help classes compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-07-24 23:12:39 +00:00
parent 259d1674f2
commit e8b591249e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/help.h
View File

@@ -6,8 +6,6 @@
#ifdef __WXMSW__ #ifdef __WXMSW__
#include "wx/msw/helpwin.h" #include "wx/msw/helpwin.h"
#undef wxHelpController
#undef sm_classwxHelpController
#define wxHelpController wxWinHelpController #define wxHelpController wxWinHelpController
#define sm_classwxHelpController sm_classwxWinHelpController #define sm_classwxHelpController sm_classwxWinHelpController
#else // !MSW #else // !MSW

7
include/wx/helpbase.h
View File

@@ -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 #if wxUSE_HTML
# include "wx/generic/helpwxht.h" # include "wx/generic/helpwxht.h"
# define wxHelpController wxHelpControllerHtml # define wxHelpController wxHelpControllerHtml
@@ -64,7 +67,7 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject
# define wxHelpController wxExtHelpController # define wxHelpController wxExtHelpController
# define sm_classwxHelpController sm_classwxExtHelpController # define sm_classwxHelpController sm_classwxExtHelpController
#endif #endif
#endif // wxMSW
#endif // wxUSE_HELP #endif // wxUSE_HELP
#endif #endif