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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-08-01 10:10:20 +00:00
parent 263e3a8327
commit bd7901aaec
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk/webhistoryitem_webkit.h
View File

@@ -12,7 +12,7 @@
#include "wx/setup.h" #include "wx/setup.h"
#if wxUSE_WEBVIEW_WEBKIT #if wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
#include "webkit/webkit.h" #include "webkit/webkit.h"
@@ -31,6 +31,6 @@ private:
WebKitWebHistoryItem* m_histItem; WebKitWebHistoryItem* m_histItem;
}; };
#endif // wxUSE_WEBVIEW_WEBKIT #endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
#endif // _WX_GTK_WEBHISTORYITEM_H_ #endif // _WX_GTK_WEBHISTORYITEM_H_

4
include/wx/msw/webhistoryitem_ie.h
View File

@@ -12,7 +12,7 @@
#include "wx/setup.h" #include "wx/setup.h"
#if wxUSE_WEBVIEW_IE #if wxUSE_WEBVIEW_IE && defined(__WXMSW__)
class WXDLLIMPEXP_WEB wxWebHistoryItem class WXDLLIMPEXP_WEB wxWebHistoryItem
{ {
@@ -26,6 +26,6 @@ private:
wxString m_url, m_title; wxString m_url, m_title;
}; };
#endif // wxUSE_WEBVIEW_IE #endif // wxUSE_WEBVIEW_IE && defined(__WXMSW__)
#endif // _WX_MSW_WEBHISTORYITEM_H_ #endif // _WX_MSW_WEBHISTORYITEM_H_

4
include/wx/msw/webview_ie.h
View File

@@ -12,7 +12,7 @@
#include "wx/setup.h" #include "wx/setup.h"
#if wxUSE_WEBVIEW_IE #if wxUSE_WEBVIEW_IE && defined(__WXMSW__)
#include "wx/control.h" #include "wx/control.h"
#include "wx/webview.h" #include "wx/webview.h"
@@ -243,6 +243,6 @@ private:
wxWebHandler* m_handler; wxWebHandler* m_handler;
}; };
#endif // wxUSE_WEBVIEW_IE #endif // wxUSE_WEBVIEW_IE && defined(__WXMSW__)
#endif // wxWebViewIE_H #endif // wxWebViewIE_H

4
include/wx/osx/webhistoryitem_webkit.h
View File

@@ -12,7 +12,7 @@
#include "wx/setup.h" #include "wx/setup.h"
#if wxUSE_WEBVIEW_WEBKIT #if wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__)
class WXDLLIMPEXP_WEB wxWebHistoryItem class WXDLLIMPEXP_WEB wxWebHistoryItem
{ {
@@ -26,6 +26,6 @@ private:
wxString m_url, m_title; wxString m_url, m_title;
}; };
#endif // wxUSE_WEBVIEW_WEBKIT #endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__)
#endif // _WX_OSX_WEBHISTORYITEM_H_ #endif // _WX_OSX_WEBHISTORYITEM_H_

6
setup.h.in
View File

@@ -331,6 +331,12 @@
#define wxUSE_STC 0 #define wxUSE_STC 0
#define wxUSE_WEB 0
#define wxUSE_WEBVIEW_WEBKIT 0
#define wxUSE_WEBVIEW_IE 0
#ifdef _MSC_VER #ifdef _MSC_VER