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

Move msw configuration checking to chkconf.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-05-06 12:59:13 +00:00
parent 3046dbdcfe
commit 2724d84bbe
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/msw/chkconf.h
View File

@@ -408,6 +408,14 @@
# define wxUSE_MEDIACTRL 0 # define wxUSE_MEDIACTRL 0
# endif # endif
# endif # endif
# if wxUSE_WEB
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxWebView requires wxActiveXContainer under MSW"
# else
# undef wxUSE_WEB
# define wxUSE_WEB 0
# endif
# endif
#endif /* !wxUSE_ACTIVEX */ #endif /* !wxUSE_ACTIVEX */
#if !wxUSE_THREADS #if !wxUSE_THREADS
@@ -421,6 +429,18 @@
# endif # endif
#endif /* !wxUSE_THREADS */ #endif /* !wxUSE_THREADS */
#if !wxUSE_OLE_AUTOMATION
# if wxUSE_WEB
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxWebView requires wxUSE_OLE_AUTOMATION under MSW"
# else
# undef wxUSE_WEB
# define wxUSE_WEB 0
# endif
# endif
#endif /* !wxUSE_OLE_AUTOMATION */
#if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT #if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
# undef wxUSE_POSTSCRIPT # undef wxUSE_POSTSCRIPT
# define wxUSE_POSTSCRIPT 1 # define wxUSE_POSTSCRIPT 1

11
include/wx/msw/webviewie.h
View File

@@ -19,17 +19,6 @@
#include "wx/msw/ole/automtn.h" #include "wx/msw/ole/automtn.h"
#include "wx/msw/ole/activex.h" #include "wx/msw/ole/activex.h"
// TODO: move this to wx/msw/chkconf.h
#if wxUSE_ACTIVEX != 1
#error "wxUSE_ACTIVEX must be activated for this to work"
#endif
#if wxUSE_OLE_AUTOMATION != 1
#error "wxUSE_OLE_AUTOMATION must be activated for this to work"
#endif
// FIXME: get those DLL export macros right...
class WXDLLIMPEXP_WEB wxWebViewIE : public wxWebView class WXDLLIMPEXP_WEB wxWebViewIE : public wxWebView
{ {
public: public: