Split wxWebHistoryItem headers out into separate files for each backend. This will...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index bcdbd3c225f497a387375ea4166e06154cbb58f9..fd48ac92cf99efd10b9166687ccb1180fd3d99bc 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3361,9 +3361,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="WEB_HDR_PLATFORM" hints="files">
 </set>
 
 <set var="WEB_HDR_PLATFORM" hints="files">

-    <if cond="TOOLKIT=='MSW'">wx/msw/webview_ie.h</if>
-    <if cond="PLATFORM_UNIX=='1'">wx/gtk/webview_webkit.h</if>
-    <if cond="PLATFORM_MACOSX=='1'">wx/osx/webview_webkit.h</if>
+    <if cond="TOOLKIT=='MSW'">
+        wx/msw/webhistoryitem_ie.h
+        wx/msw/webview_ie.h
+    </if>
+    <if cond="PLATFORM_UNIX=='1'">
+        wx/gtk/webhistoryitem_webkit.h
+        wx/gtk/webview_webkit.h
+    </if>
+    <if cond="PLATFORM_MACOSX=='1'">
+        wx/osx/webhistoryitem_webkit.h
+        wx/osx/webview_webkit.h
+    </if>

 </set>
 <set var="WEB_HDR" hints="files">
     $(WEB_HDR_PLATFORM)
 </set>
 <set var="WEB_HDR" hints="files">
     $(WEB_HDR_PLATFORM)

diff --git a/include/wx/gtk/webhistoryitem_webkit.h b/include/wx/gtk/webhistoryitem_webkit.h
new file mode 100644 (file)
index 0000000..13fe309
--- /dev/null
+++ b/include/wx/gtk/webhistoryitem_webkit.h
@@ -0,0 +1,31 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        include/wx/gtk/webhistoryitem.h
+// Purpose:     wxWebHistoryItem header for GTK
+// Author:      Steven Lamerton
+// Id:          $Id$
+// Copyright:   (c) 2011 Steven Lamerton
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GTK_WEBHISTORYITEM_H_
+#define _WX_GTK_WEBHISTORYITEM_H_
+
+#include "wx/setup.h"
+
+#if wxUSE_WEBVIEW_WEBKIT
+
+class WXDLLIMPEXP_WEB wxWebHistoryItem
+{
+public:
+    wxWebHistoryItem(const wxString& url, const wxString& title) : 
+                     m_url(url), m_title(title) {}
+    wxString GetUrl() { return m_url; }
+    wxString GetTitle() { return m_title; }
+
+private:
+    wxString m_url, m_title;
+};
+
+#endif // wxUSE_WEBVIEW_WEBKIT
+
+#endif // _WX_GTK_WEBHISTORYITEM_H_

diff --git a/include/wx/msw/webhistoryitem_ie.h b/include/wx/msw/webhistoryitem_ie.h
new file mode 100644 (file)
index 0000000..cbd547e
--- /dev/null
+++ b/include/wx/msw/webhistoryitem_ie.h
@@ -0,0 +1,31 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        include/wx/msw/webhistoryitem.h
+// Purpose:     wxWebHistoryItem header for MSW
+// Author:      Steven Lamerton
+// Id:          $Id$
+// Copyright:   (c) 2011 Steven Lamerton
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_WEBHISTORYITEM_H_
+#define _WX_MSW_WEBHISTORYITEM_H_
+
+#include "wx/setup.h"
+
+#if wxUSE_WEBVIEW_IE
+
+class WXDLLIMPEXP_WEB wxWebHistoryItem
+{
+public:
+    wxWebHistoryItem(const wxString& url, const wxString& title) : 
+                     m_url(url), m_title(title) {}
+    wxString GetUrl() { return m_url; }
+    wxString GetTitle() { return m_title; }
+
+private:
+    wxString m_url, m_title;
+};
+
+#endif // wxUSE_WEBVIEW_IE
+
+#endif // _WX_MSW_WEBHISTORYITEM_H_

diff --git a/include/wx/osx/webhistoryitem_webkit.h b/include/wx/osx/webhistoryitem_webkit.h
new file mode 100644 (file)
index 0000000..5c500fb
--- /dev/null
+++ b/include/wx/osx/webhistoryitem_webkit.h
@@ -0,0 +1,31 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        include/wx/osx/webhistoryitem.h
+// Purpose:     wxWebHistoryItem header for OSX
+// Author:      Steven Lamerton
+// Id:          $Id$
+// Copyright:   (c) 2011 Steven Lamerton
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_OSX_WEBHISTORYITEM_H_
+#define _WX_OSX_WEBHISTORYITEM_H_
+
+#include "wx/setup.h"
+
+#if wxUSE_WEBVIEW_WEBKIT
+
+class WXDLLIMPEXP_WEB wxWebHistoryItem
+{
+public:
+    wxWebHistoryItem(const wxString& url, const wxString& title) : 
+                     m_url(url), m_title(title) {}
+    wxString GetUrl() { return m_url; }
+    wxString GetTitle() { return m_title; }
+
+private:
+    wxString m_url, m_title;
+};
+
+#endif // wxUSE_WEBVIEW_WEBKIT
+
+#endif // _WX_OSX_WEBHISTORYITEM_H_

diff --git a/include/wx/webview.h b/include/wx/webview.h
index bb1a8fbcb722cf58744b93a76a5c3791002780ca..5ece8ec25788161fdc25c84fec33ff597b04b99a 100644 (file)
--- a/include/wx/webview.h
+++ b/include/wx/webview.h
@@ -20,20 +20,13 @@
 #include "wx/sharedptr.h"
 #include "wx/vector.h"
 
 #include "wx/sharedptr.h"
 #include "wx/vector.h"
 

+#include "wx/osx/webhistoryitem_webkit.h"
+#include "wx/gtk/webhistoryitem_webkit.h"
+#include "wx/msw/webhistoryitem_ie.h"
+

 class wxFSFile;
 class wxFileSystem;
 
 class wxFSFile;
 class wxFileSystem;
 

-class WXDLLIMPEXP_WEB wxWebHistoryItem
-{
-public:
-    wxWebHistoryItem(const wxString& url, const wxString& title) : 
-                     m_url(url), m_title(title) {}
-    wxString GetUrl() { return m_url; }
-    wxString GetTitle() { return m_title; }
-
-private:
-    wxString m_url, m_title;
-};

 
 /**
  * Zoom level in web view component
 
 /**
  * Zoom level in web view component