Add missing WXK constants for the control keys

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

diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index 484488faa4fc4d1c55648c74d7846817cef10834..bbd6f3168f2bc83a452c3e1a8048b7d3635c1cb7 100644 (file)
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -3,14 +3,14 @@
 // Purpose:     Common interface and events for web view component
 // Author:      Marianne Gagnon
 // Id:          $Id$
 // Purpose:     Common interface and events for web view component
 // Author:      Marianne Gagnon
 // Id:          $Id$

-// Copyright:   (c) 2010 Marianne Gagnon
+// Copyright:   (c) 2010 Marianne Gagnon, 2011 Steven Lamerton

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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,53 +18,52 @@
 
 #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_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_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)
 {
     switch (backend)
     {
 
 // static
 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 wxWebViewGTKWebKit();
+        #if defined(wxUSE_WEBVIEW_WEBKIT) && \
+           (defined(__WXGTK__) || defined(__WXOSX__))
+        case wxWEB_VIEW_BACKEND_WEBKIT:
+            return new wxWebViewWebKit();

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

-            #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXOSX__)
-            return new wxOSXWebKitCtrl();
-            #endif
-
-            #if defined(wxUSE_WEBVIEW_WEBKIT) && defined(__WXGTK__)
-            return new wxWebViewGTKWebKit();
+            #if defined(wxUSE_WEBVIEW_WEBKIT) && \
+               (defined(__WXGTK__) || defined(__WXOSX__))
+            return new wxWebViewWebKit();

             #endif
 
             #if wxUSE_WEBVIEW_IE
             #endif
 
             #if wxUSE_WEBVIEW_IE


@@ -89,31 +88,22 @@ wxWebView* wxWebView::New(wxWindow* parent,
 {
     switch (backend)
     {
 {
     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 wxWebViewGTKWebKit(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
         #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:
 
         #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__)
-            return new wxWebViewGTKWebKit(parent, id, url, pos, size, style, name);
+            #if defined(wxUSE_WEBVIEW_WEBKIT) && \
+               (defined(__WXGTK__) || defined(__WXOSX__))
+            return new wxWebViewWebKit(parent, id, url, pos, size, style, name);

             #endif
 
             #if wxUSE_WEBVIEW_IE
             #endif
 
             #if wxUSE_WEBVIEW_IE


@@ -126,4 +116,4 @@ wxWebView* wxWebView::New(wxWindow* parent,
     }
 }
 
     }
 }
 

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