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 492745a6b85fedfce0080cbcba9a2a74c079a180..dbf877979fbdd3f2c97d92e12f56396ecedb7201 100644 (file)
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -10,22 +10,24 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_WEB
+

 #if defined(__BORLANDC__)
     #pragma hdrstop
 #endif
 
 #include "wx/webview.h"
 
 #if defined(__BORLANDC__)
     #pragma hdrstop
 #endif
 
 #include "wx/webview.h"
 

-#include "wx/osx/webview.h"
-#include "wx/gtk/webview.h"
-#include "wx/msw/webviewie.h"
+#include "wx/osx/webview_webkit.h"
+#include "wx/gtk/webview_webkit.h"
+#include "wx/msw/webview_ie.h"

 
 // DLL options compatibility check:
 #include "wx/app.h"
 WX_CHECK_BUILD_OPTIONS("wxWEB")
 
 
 // DLL options compatibility check:
 #include "wx/app.h"
 WX_CHECK_BUILD_OPTIONS("wxWEB")
 

-extern WXDLLEXPORT_DATA(const char) wxWebViewNameStr[] = "wxWebView";
-extern WXDLLEXPORT_DATA(const char) wxWebViewDefaultURLStr[] = "about:blank";
+extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewNameStr[] = "wxWebView";
+extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewDefaultURLStr[] = "about:blank";

 
 IMPLEMENT_DYNAMIC_CLASS(wxWebNavigationEvent, wxCommandEvent)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxWebNavigationEvent, wxCommandEvent)
 


@@ -33,39 +35,40 @@ 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_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)
     {
 
 // 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
 
             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:
             case wxWEB_VIEW_BACKEND_GTK_WEBKIT:

-                return new wxGtkWebKitCtrl();
+                return new wxWebViewWebKit();

         #endif
 
         #endif
 

-        #if wxHAVE_WEB_BACKEND_IE
+        #if wxUSE_WEBVIEW_IE

             case wxWEB_VIEW_BACKEND_IE:
             case wxWEB_VIEW_BACKEND_IE:

-                return new wxIEPanel();
+                return new wxWebViewIE();

         #endif
 
         case wxWEB_VIEW_BACKEND_DEFAULT:
 
         #endif
 
         case wxWEB_VIEW_BACKEND_DEFAULT:
 

-            #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
+            #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)

             return new wxOSXWebKitCtrl();
             #endif
 
             return new wxOSXWebKitCtrl();
             #endif
 

-            #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
-            return new wxGtkWebKitCtrl();
+            #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
+            return new wxWebViewWebKit();

             #endif
 
             #endif
 

-            #if wxHAVE_WEB_BACKEND_IE
-            return new wxIEPanel();
+            #if wxUSE_WEBVIEW_IE
+            return new wxWebViewIE();

             #endif
 
         // fall-through intended
             #endif
 
         // fall-through intended


@@ -86,35 +89,35 @@ wxWebView* wxWebView::New(wxWindow* parent,
 {
     switch (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(parent, id, url, pos, size, style,
                                            name);
         #endif
 
             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:
             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
 
                                            name);
         #endif
 

-        #if wxHAVE_WEB_BACKEND_IE
+        #if wxUSE_WEBVIEW_IE

             case wxWEB_VIEW_BACKEND_IE:
             case wxWEB_VIEW_BACKEND_IE:

-                return new wxIEPanel(parent, id, url, pos, size, style, name);
+                return new wxWebViewIE(parent, id, url, pos, size, style, name);

         #endif
 
         case wxWEB_VIEW_BACKEND_DEFAULT:
 
         #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
 
             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
 
             #endif
 

-            #if wxHAVE_WEB_BACKEND_IE
-            return new wxIEPanel(parent, id, url, pos, size, style, name);
+            #if wxUSE_WEBVIEW_IE
+            return new wxWebViewIE(parent, id, url, pos, size, style, name);

             #endif
 
         // fall-through intended
             #endif
 
         // fall-through intended


@@ -122,3 +125,5 @@ wxWebView* wxWebView::New(wxWindow* parent,
             return NULL;
     }
 }
             return NULL;
     }
 }

+
+#endif // wxUSE_WEB