X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e3d4a32106c8c0f85695f68856da137c14d2b5c..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/common/webview.cpp?ds=inline

diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index 8abac2300c..bbd6f3168f 100644
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -10,7 +10,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#if wxUSE_WEB
+#if wxUSE_WEBVIEW
 
 #if defined(__BORLANDC__)
     #pragma hdrstop
@@ -18,25 +18,30 @@
 
 #include "wx/webview.h"
 
+#if defined(__WXOSX_COCOA__) || defined(__WXOSX_CARBON__)
 #include "wx/osx/webview_webkit.h"
+#elif defined(__WXGTK__)
 #include "wx/gtk/webview_webkit.h"
+#elif defined(__WXMSW__)
 #include "wx/msw/webview_ie.h"
+#endif
 
 // DLL options compatibility check:
 #include "wx/app.h"
-WX_CHECK_BUILD_OPTIONS("wxWEB")
+WX_CHECK_BUILD_OPTIONS("wxWEBVIEW")
 
-extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewNameStr[] = "wxWebView";
-extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewDefaultURLStr[] = "about:blank";
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewNameStr[] = "wxWebView";
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewDefaultURLStr[] = "about:blank";
 
-IMPLEMENT_DYNAMIC_CLASS(wxWebNavigationEvent, wxCommandEvent)
+wxIMPLEMENT_ABSTRACT_CLASS(wxWebView, wxControl);
+wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewEvent, wxCommandEvent);
 
-wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebNavigationEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebNavigationEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebNavigationEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebNavigationEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, wxWebNavigationEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, wxWebNavigationEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebViewEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebViewEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebViewEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebViewEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, wxWebViewEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, wxWebViewEvent );
 
 // static
 wxWebView* wxWebView::New(wxWebViewBackend backend)
@@ -111,4 +116,4 @@ wxWebView* wxWebView::New(wxWindow* parent,
     }
 }
 
-#endif // wxUSE_WEB
+#endif // wxUSE_WEBVIEW