Add missing lines to setup.h.in. This properly fixes compilation under configure based environments. Also update the include guards for the wxWebHistoryItem files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-01 10:10:20 +00:00
parent 263e3a8327
commit bd7901aaec
5 changed files with 14 additions and 8 deletions
--- a/include/wx/osx/webhistoryitem_webkit.h
+++ b/include/wx/osx/webhistoryitem_webkit.h
@@ -12,7 +12,7 @@

 #include "wx/setup.h"

-#if wxUSE_WEBVIEW_WEBKIT
+#if wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__)

 class WXDLLIMPEXP_WEB wxWebHistoryItem
 {
@@ -26,6 +26,6 @@ private:
    wxString m_url, m_title;
 };

-#endif // wxUSE_WEBVIEW_WEBKIT
+#endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__)

 #endif // _WX_OSX_WEBHISTORYITEM_H_