Implement GetSelectedHTML for the ie and gtk webkit backends and document.

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

diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index dbf877979fbdd3f2c97d92e12f56396ecedb7201..8c69bb92756821002ebe1c777958d66e67db45b3 100644 (file)
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -42,28 +42,21 @@ wxWebView* wxWebView::New(wxWebViewBackend backend)
 {
     switch (backend)
     {
-        #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
-            case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
-                return new wxOSXWebKitCtrl();
-        #endif
-
-        #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
-            case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
-                return new wxWebViewWebKit();
+        #if defined(wxUSE_WEBVIEW_WEBKIT) && \
+           (defined(__WXGTK__) || defined(__WXOSX__))
+        case wxWEB_VIEW_BACKEND_WEBKIT:
+            return new wxWebViewWebKit();
         #endif
 
         #if wxUSE_WEBVIEW_IE
-            case wxWEB_VIEW_BACKEND_IE:
-                return new wxWebViewIE();
+        case wxWEB_VIEW_BACKEND_IE:
+            return new wxWebViewIE();
         #endif
 
         case wxWEB_VIEW_BACKEND_DEFAULT:
 
-            #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
-            return new wxOSXWebKitCtrl();
-            #endif
-
-            #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
+            #if defined(wxUSE_WEBVIEW_WEBKIT) && \
+               (defined(__WXGTK__) || defined(__WXOSX__))
             return new wxWebViewWebKit();
             #endif
 
@@ -89,30 +82,21 @@ wxWebView* wxWebView::New(wxWindow* parent,
 {
     switch (backend)
     {
-        #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 defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
-            case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
-                return new wxWebViewWebKit(parent, id, url, pos, size, style,
-                                           name);
+        #if defined(wxUSE_WEBVIEW_WEBKIT) && \
+           (defined(__WXGTK__) || defined(__WXOSX__))
+        case wxWEB_VIEW_BACKEND_WEBKIT:
+            return new wxWebViewWebKit(parent, id, url, pos, size, style, name);
         #endif
 
         #if wxUSE_WEBVIEW_IE
-            case wxWEB_VIEW_BACKEND_IE:
-                return new wxWebViewIE(parent, id, url, pos, size, style, name);
+        case wxWEB_VIEW_BACKEND_IE:
+            return new wxWebViewIE(parent, id, url, pos, size, style, name);
         #endif
 
         case wxWEB_VIEW_BACKEND_DEFAULT:
 
-            #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
-            return new wxOSXWebKitCtrl(parent, id, url, pos, size, style, name);
-            #endif
-
-            #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
+            #if defined(wxUSE_WEBVIEW_WEBKIT) && \
+               (defined(__WXGTK__) || defined(__WXOSX__))
             return new wxWebViewWebKit(parent, id, url, pos, size, style, name);
             #endif