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

Update wxWebView guards to stop backend compilation when wxUSE_WEBVIEW is 0.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-09-12 18:35:39 +00:00
parent 96ceb55625
commit 9d2f31db0c
9 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/osx/webview_webkit.h
View File

@@ -15,8 +15,8 @@
#include "wx/setup.h"
#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
|| defined(__WXOSX_CARBON__))
#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
|| defined(__WXOSX_CARBON__))
#include "wx/control.h"
#include "wx/webview.h"
@@ -158,6 +158,6 @@ private:
//TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
};
#endif // wxUSE_WEBKIT
#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
#endif // _WX_WEBKIT_H_

6
include/wx/osx/webviewhistoryitem_webkit.h
View File

@@ -12,8 +12,8 @@
#include "wx/setup.h"
#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
|| defined(__WXOSX_CARBON__))
#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
|| defined(__WXOSX_CARBON__))
class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
{
@@ -30,6 +30,6 @@ private:
struct objc_object *m_histItem;
};
#endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__)
#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
#endif // _WX_OSX_WEBVIEWHISTORYITEM_H_