Implement undo and redo for the ie and gtk webkit backends. Extend the sample to...

[wxWidgets.git] / src / common / webview.cpp

diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index f9d95538034408857444b074f64db483074d668e..dbf877979fbdd3f2c97d92e12f56396ecedb7201 100644 (file)
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -35,38 +35,39 @@ 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 );
 
 // static
 wxWebView* wxWebView::New(wxWebViewBackend backend)
 {
     switch (backend)
     {
-        #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
+        #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
             case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
                 return new wxOSXWebKitCtrl();
         #endif
 
-        #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
+        #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
             case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
-                return new wxGtkWebKitCtrl();
+                return new wxWebViewWebKit();
         #endif
 
-        #if wxHAVE_WEB_BACKEND_IE
+        #if wxUSE_WEBVIEW_IE
             case wxWEB_VIEW_BACKEND_IE:
                 return new wxWebViewIE();
         #endif
 
         case wxWEB_VIEW_BACKEND_DEFAULT:
 
-            #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
+            #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
             return new wxOSXWebKitCtrl();
             #endif
 
-            #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
-            return new wxGtkWebKitCtrl();
+            #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
+            return new wxWebViewWebKit();
             #endif
 
-            #if wxHAVE_WEB_BACKEND_IE
+            #if wxUSE_WEBVIEW_IE
             return new wxWebViewIE();
             #endif
 
@@ -88,34 +89,34 @@ wxWebView* wxWebView::New(wxWindow* parent,
 {
     switch (backend)
     {
-        #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
+        #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
             case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
                 return new wxOSXWebKitCtrl(parent, id, url, pos, size, style,
                                            name);
         #endif
 
-        #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
+        #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
             case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
-                return new wxGtkWebKitCtrl(parent, id, url, pos, size, style,
+                return new wxWebViewWebKit(parent, id, url, pos, size, style,
                                            name);
         #endif
 
-        #if wxHAVE_WEB_BACKEND_IE
+        #if wxUSE_WEBVIEW_IE
             case wxWEB_VIEW_BACKEND_IE:
                 return new wxWebViewIE(parent, id, url, pos, size, style, name);
         #endif
 
         case wxWEB_VIEW_BACKEND_DEFAULT:
 
-            #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
+            #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
             return new wxOSXWebKitCtrl(parent, id, url, pos, size, style, name);
             #endif
 
-            #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
-            return new wxGtkWebKitCtrl(parent, id, url, pos, size, style, name);
+            #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
+            return new wxWebViewWebKit(parent, id, url, pos, size, style, name);
             #endif
 
-            #if wxHAVE_WEB_BACKEND_IE
+            #if wxUSE_WEBVIEW_IE
             return new wxWebViewIE(parent, id, url, pos, size, style, name);
             #endif