Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / gtk / webviewhistoryitem_webkit.h

diff --git a/include/wx/gtk/webviewhistoryitem_webkit.h b/include/wx/gtk/webviewhistoryitem_webkit.h
index 3f96d612b4a098e8d02116d69ac0c4528124a5c9..a798efdda627cf6836d7c08f300367c75fe6dfde 100644 (file)
--- a/include/wx/gtk/webviewhistoryitem_webkit.h
+++ b/include/wx/gtk/webviewhistoryitem_webkit.h
@@ -2,7 +2,6 @@
 // Name:        include/wx/gtk/webviewhistoryitem.h
 // Purpose:     wxWebViewHistoryItem header for GTK
 // Author:      Steven Lamerton
 // Name:        include/wx/gtk/webviewhistoryitem.h
 // Purpose:     wxWebViewHistoryItem header for GTK
 // Author:      Steven Lamerton

-// Id:          $Id$

 // Copyright:   (c) 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,14 +11,12 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#if wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
+#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)

 
 

-#include "webkit/webkit.h"
-
-class WXDLLIMPEXP_WEB wxWebViewHistoryItem
+class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem

 {
 public:
 {
 public:

-    wxWebViewHistoryItem(const wxString& url, const wxString& title) : 
+    wxWebViewHistoryItem(const wxString& url, const wxString& title) :

                      m_url(url), m_title(title) {}
     wxString GetUrl() { return m_url; }
     wxString GetTitle() { return m_title; }
                      m_url(url), m_title(title) {}
     wxString GetUrl() { return m_url; }
     wxString GetTitle() { return m_title; }


@@ -28,9 +25,9 @@ public:
 
 private:
     wxString m_url, m_title;
 
 private:
     wxString m_url, m_title;

-    WebKitWebHistoryItem* m_histItem;
+    void* m_histItem;

 };
 
 };
 

-#endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
+#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)

 
 #endif // _WX_GTK_WEBVIEWHISTORYITEM_H_
 
 #endif // _WX_GTK_WEBVIEWHISTORYITEM_H_