Return NULL from wxWindow::GetCapture() when the capture is being lost.

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

diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index 4ceb94c320cf35b4b55a186130739f8bdcc3bc36..afaf3ffd099b01a23db43e26efed2a6f23306f80 100644 (file)
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -2,7 +2,6 @@
 // Name:        webview.cpp
 // Purpose:     Common interface and events for web view component
 // Author:      Marianne Gagnon
 // Name:        webview.cpp
 // Purpose:     Common interface and events for web view component
 // Author:      Marianne Gagnon

-// Id:          $Id$

 // Copyright:   (c) 2010 Marianne Gagnon, 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2010 Marianne Gagnon, 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -10,7 +9,7 @@
 // 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 wxUSE_WEBVIEW

 
 #if defined(__BORLANDC__)
     #pragma hdrstop
 
 #if defined(__BORLANDC__)
     #pragma hdrstop


@@ -18,98 +17,95 @@
 
 #include "wx/webview.h"
 
 
 #include "wx/webview.h"
 

+#if defined(__WXOSX_COCOA__) || defined(__WXOSX_CARBON__)

 #include "wx/osx/webview_webkit.h"
 #include "wx/osx/webview_webkit.h"

+#elif defined(__WXGTK__)

 #include "wx/gtk/webview_webkit.h"
 #include "wx/gtk/webview_webkit.h"

+#elif defined(__WXMSW__)

 #include "wx/msw/webview_ie.h"
 #include "wx/msw/webview_ie.h"

+#endif

 
 // DLL options compatibility check:
 #include "wx/app.h"
 
 // DLL options compatibility check:
 #include "wx/app.h"

-WX_CHECK_BUILD_OPTIONS("wxWEB")
+WX_CHECK_BUILD_OPTIONS("wxWEBVIEW")
+
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewNameStr[] = "wxWebView";
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewDefaultURLStr[] = "about:blank";
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendIE[] = "wxWebViewIE";
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendWebKit[] = "wxWebViewWebKit";

 
 

-extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewNameStr[] = "wxWebView";
-extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewDefaultURLStr[] = "about:blank";
+#ifdef __WXMSW__
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendDefault[] = "wxWebViewIE";
+#else
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendDefault[] = "wxWebViewWebKit";
+#endif

 
 wxIMPLEMENT_ABSTRACT_CLASS(wxWebView, wxControl);
 
 wxIMPLEMENT_ABSTRACT_CLASS(wxWebView, wxControl);

-wxIMPLEMENT_DYNAMIC_CLASS(wxWebNavigationEvent, wxCommandEvent);
+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_WEBVIEW_NAVIGATING, wxWebViewEvent );
+wxDEFINE_EVENT( wxEVT_WEBVIEW_NAVIGATED, wxWebViewEvent );
+wxDEFINE_EVENT( wxEVT_WEBVIEW_LOADED, wxWebViewEvent );
+wxDEFINE_EVENT( wxEVT_WEBVIEW_ERROR, wxWebViewEvent );
+wxDEFINE_EVENT( wxEVT_WEBVIEW_NEWWINDOW, wxWebViewEvent );
+wxDEFINE_EVENT( wxEVT_WEBVIEW_TITLE_CHANGED, wxWebViewEvent );
+
+wxStringWebViewFactoryMap wxWebView::m_factoryMap;

 
 // static
 
 // static

-wxWebView* wxWebView::New(wxWebViewBackend backend)
+wxWebView* wxWebView::New(const wxString& backend)

 {
 {

-    switch (backend)
-    {
-        #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();
-        #endif
-
-        case wxWEB_VIEW_BACKEND_DEFAULT:
-
-            #if defined(wxUSE_WEBVIEW_WEBKIT) && \
-               (defined(__WXGTK__) || defined(__WXOSX__))
-            return new wxWebViewWebKit();
-            #endif
-
-            #if wxUSE_WEBVIEW_IE
-            return new wxWebViewIE();
-            #endif
-
-        // fall-through intended
-        default:
-            return NULL;
-    }
+    wxStringWebViewFactoryMap::iterator iter = FindFactory(backend);
+
+    if(iter == m_factoryMap.end())
+        return NULL;
+    else
+        return (*iter).second->Create();

 }
 
 // static
 }
 
 // static

-wxWebView* wxWebView::New(wxWindow* parent,
-       wxWindowID id,
-       const wxString& url,
-       const wxPoint& pos,
-       const wxSize& size,
-       wxWebViewBackend backend,
-       long style,
-       const wxString& name)
+wxWebView* wxWebView::New(wxWindow* parent, wxWindowID id, const wxString& url,
+                          const wxPoint& pos, const wxSize& size, 
+                          const wxString& backend, long style, 
+                          const wxString& name)

 {
 {

-    switch (backend)
-    {
-        #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);
-        #endif
-
-        case wxWEB_VIEW_BACKEND_DEFAULT:
-
-            #if defined(wxUSE_WEBVIEW_WEBKIT) && \
-               (defined(__WXGTK__) || defined(__WXOSX__))
-            return new wxWebViewWebKit(parent, id, url, pos, size, style, name);
-            #endif
-
-            #if wxUSE_WEBVIEW_IE
-            return new wxWebViewIE(parent, id, url, pos, size, style, name);
-            #endif
-
-        // fall-through intended
-        default:
-            return NULL;
-    }
+    wxStringWebViewFactoryMap::iterator iter = FindFactory(backend);
+
+    if(iter == m_factoryMap.end())
+        return NULL;
+    else
+        return (*iter).second->Create(parent, id, url, pos, size, style, name);
+
+}
+
+// static
+void wxWebView::RegisterFactory(const wxString& backend, 
+                                wxSharedPtr<wxWebViewFactory> factory)
+{
+    m_factoryMap[backend] = factory;
+}
+
+// static 
+wxStringWebViewFactoryMap::iterator wxWebView::FindFactory(const wxString &backend)
+{
+    // Initialise the map, it checks internally for existing factories
+    InitFactoryMap();
+
+    return m_factoryMap.find(backend);
+}
+ 
+// static
+void wxWebView::InitFactoryMap()
+{
+#ifdef __WXMSW__
+    if(m_factoryMap.find(wxWebViewBackendIE) == m_factoryMap.end())
+        RegisterFactory(wxWebViewBackendIE, wxSharedPtr<wxWebViewFactory>
+                                                   (new wxWebViewFactoryIE));
+#else
+    if(m_factoryMap.find(wxWebViewBackendWebKit) == m_factoryMap.end())
+        RegisterFactory(wxWebViewBackendWebKit, wxSharedPtr<wxWebViewFactory>
+                                                       (new wxWebViewFactoryWebKit));
+#endif

 }
 
 }
 

-#endif // wxUSE_WEB
+#endif // wxUSE_WEBVIEW