Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set the correct svn properties on the new files. Correct a minor date typo.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-05-04 18:24:30 +00:00
parent cfcf1d6ee3
commit 61b98a2dac
9 changed files with 4001 additions and 4001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

232
include/wx/gtk/webview.h
View File

@@ -1,116 +1,116 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: include/gtk/wx/webview.h // Name: include/gtk/wx/webview.h
// Purpose: GTK webkit backend for web view component // Purpose: GTK webkit backend for web view component
// Author: Robert Roebling, Marianne Gagnon // Author: Robert Roebling, Marianne Gagnon
// Id: $Id$ // Id: $Id$
// Copyright: (c) 200 Marianne Gagnon, 1998 Robert Roebling // Copyright: (c) 2010 Marianne Gagnon, 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_GTK_WEBKITCTRL_H_ #ifndef _WX_GTK_WEBKITCTRL_H_
#define _WX_GTK_WEBKITCTRL_H_ #define _WX_GTK_WEBKITCTRL_H_
#include "wx/setup.h" #include "wx/setup.h"
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
#include "wx/webview.h" #include "wx/webview.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxWebViewGTKWebKit // wxWebViewGTKWebKit
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxWebViewGTKWebKit : public wxWebView class WXDLLIMPEXP_CORE wxWebViewGTKWebKit : public wxWebView
{ {
public: public:
wxWebViewGTKWebKit() { Init(); } wxWebViewGTKWebKit() { Init(); }
wxWebViewGTKWebKit(wxWindow *parent, wxWebViewGTKWebKit(wxWindow *parent,
wxWindowID id = wxID_ANY, wxWindowID id = wxID_ANY,
const wxString& url = wxWebViewDefaultURLStr, const wxString& url = wxWebViewDefaultURLStr,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxWebViewNameStr) const wxString& name = wxWebViewNameStr)
{ {
Init(); Init();
Create(parent, id, url, pos, size, style, name); Create(parent, id, url, pos, size, style, name);
} }
virtual bool Create(wxWindow *parent, virtual bool Create(wxWindow *parent,
wxWindowID id = wxID_ANY, wxWindowID id = wxID_ANY,
const wxString& url = wxWebViewDefaultURLStr, const wxString& url = wxWebViewDefaultURLStr,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxWebViewNameStr); const wxString& name = wxWebViewNameStr);
virtual bool Enable( bool enable = true ); virtual bool Enable( bool enable = true );
// implementation // implementation
// -------------- // --------------
static wxVisualAttributes static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
// helper to allow access to protected member from GTK callback // helper to allow access to protected member from GTK callback
void MoveWindow(int x, int y, int width, int height) void MoveWindow(int x, int y, int width, int height)
{ {
DoMoveWindow(x, y, width, height); DoMoveWindow(x, y, width, height);
} }
void ZoomIn(); void ZoomIn();
void ZoomOut(); void ZoomOut();
void SetWebkitZoom(float level); void SetWebkitZoom(float level);
float GetWebkitZoom(); float GetWebkitZoom();
virtual void Stop(); virtual void Stop();
virtual void LoadUrl(const wxString& url); virtual void LoadUrl(const wxString& url);
virtual void GoBack(); virtual void GoBack();
virtual void GoForward(); virtual void GoForward();
virtual void Reload(wxWebViewReloadFlags flags = 0); virtual void Reload(wxWebViewReloadFlags flags = 0);
virtual bool CanGoBack(); virtual bool CanGoBack();
virtual bool CanGoForward(); virtual bool CanGoForward();
virtual wxString GetCurrentURL(); virtual wxString GetCurrentURL();
virtual wxString GetCurrentTitle(); virtual wxString GetCurrentTitle();
virtual wxString GetPageSource(); virtual wxString GetPageSource();
virtual void SetPage(const wxString& html, const wxString& baseUrl); virtual void SetPage(const wxString& html, const wxString& baseUrl);
virtual void Print(); virtual void Print();
virtual bool IsBusy(); virtual bool IsBusy();
void SetZoomType(wxWebViewZoomType); void SetZoomType(wxWebViewZoomType);
wxWebViewZoomType GetZoomType() const; wxWebViewZoomType GetZoomType() const;
bool CanSetZoomType(wxWebViewZoomType) const; bool CanSetZoomType(wxWebViewZoomType) const;
virtual wxWebViewZoom GetZoom(); virtual wxWebViewZoom GetZoom();
virtual void SetZoom(wxWebViewZoom); virtual void SetZoom(wxWebViewZoom);
/** FIXME: hack to work around signals being received too early */ /** FIXME: hack to work around signals being received too early */
bool m_ready; bool m_ready;
/** TODO: check if this can be made private /** TODO: check if this can be made private
* The native control has a getter to check for busy state, but except in * The native control has a getter to check for busy state, but except in
* very recent versions of webkit this getter doesn't say everything we need * very recent versions of webkit this getter doesn't say everything we need
* (namely it seems to stay indefinitely busy when loading is cancelled by * (namely it seems to stay indefinitely busy when loading is cancelled by
* user) * user)
*/ */
bool m_busy; bool m_busy;
protected: protected:
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
private: private:
// focus event handler: calls GTKUpdateBitmap() // focus event handler: calls GTKUpdateBitmap()
void GTKOnFocus(wxFocusEvent& event); void GTKOnFocus(wxFocusEvent& event);
GtkWidget *web_view; GtkWidget *web_view;
// FIXME: try to get DECLARE_DYNAMIC_CLASS macros & stuff right // FIXME: try to get DECLARE_DYNAMIC_CLASS macros & stuff right
//DECLARE_DYNAMIC_CLASS(wxWebViewGTKWebKit) //DECLARE_DYNAMIC_CLASS(wxWebViewGTKWebKit)
}; };
#endif // if wxHAVE_WEB_BACKEND_GTK_WEBKIT #endif // if wxHAVE_WEB_BACKEND_GTK_WEBKIT

252
include/wx/msw/webviewie.h
View File

@@ -1,126 +1,126 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: include/wx/msw/webviewie.h // Name: include/wx/msw/webviewie.h
// Purpose: wxMSW IE wxWebView backend // Purpose: wxMSW IE wxWebView backend
// Author: Marianne Gagnon // Author: Marianne Gagnon
// Id: $Id$ // Id: $Id$
// Copyright: (c) 2010 Marianne Gagnon // Copyright: (c) 2010 Marianne Gagnon
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef wxWebViewIE_H #ifndef wxWebViewIE_H
#define wxWebViewIE_H #define wxWebViewIE_H
#include "wx/setup.h" #include "wx/setup.h"
#if wxHAVE_WEB_BACKEND_IE #if wxHAVE_WEB_BACKEND_IE
#include "wx/control.h" #include "wx/control.h"
#include "wx/webview.h" #include "wx/webview.h"
#include "wx/msw/ole/automtn.h" #include "wx/msw/ole/automtn.h"
#include "wx/msw/ole/activex.h" #include "wx/msw/ole/activex.h"
// TODO: move this to wx/msw/chkconf.h // TODO: move this to wx/msw/chkconf.h
#if wxUSE_ACTIVEX != 1 #if wxUSE_ACTIVEX != 1
#error "wxUSE_ACTIVEX must be activated for this to work" #error "wxUSE_ACTIVEX must be activated for this to work"
#endif #endif
#if wxUSE_OLE_AUTOMATION != 1 #if wxUSE_OLE_AUTOMATION != 1
#error "wxUSE_OLE_AUTOMATION must be activated for this to work" #error "wxUSE_OLE_AUTOMATION must be activated for this to work"
#endif #endif
// FIXME: get those DLL export macros right... // FIXME: get those DLL export macros right...
class wxWebViewIE : public wxWebView class wxWebViewIE : public wxWebView
{ {
public: public:
wxWebViewIE() {} wxWebViewIE() {}
wxWebViewIE(wxWindow* parent, wxWebViewIE(wxWindow* parent,
wxWindowID id, wxWindowID id,
const wxString& url = wxWebViewDefaultURLStr, const wxString& url = wxWebViewDefaultURLStr,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxWebViewNameStr) const wxString& name = wxWebViewNameStr)
{ {
Create(parent, id, url, pos, size, style, name); Create(parent, id, url, pos, size, style, name);
} }
bool Create(wxWindow* parent, bool Create(wxWindow* parent,
wxWindowID id, wxWindowID id,
const wxString& url = wxWebViewDefaultURLStr, const wxString& url = wxWebViewDefaultURLStr,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxWebViewNameStr); const wxString& name = wxWebViewNameStr);
virtual void LoadUrl(const wxString& url); virtual void LoadUrl(const wxString& url);
virtual bool CanGoForward() { return m_canNavigateForward; } virtual bool CanGoForward() { return m_canNavigateForward; }
virtual bool CanGoBack() { return m_canNavigateBack; } virtual bool CanGoBack() { return m_canNavigateBack; }
virtual void GoBack(); virtual void GoBack();
virtual void GoForward(); virtual void GoForward();
virtual void Stop(); virtual void Stop();
virtual void Reload(wxWebViewReloadFlags flags=0); virtual void Reload(wxWebViewReloadFlags flags=0);
virtual wxString GetPageSource(); virtual wxString GetPageSource();
virtual bool IsBusy(); virtual bool IsBusy();
virtual wxString GetCurrentURL(); virtual wxString GetCurrentURL();
virtual wxString GetCurrentTitle(); virtual wxString GetCurrentTitle();
virtual void SetZoomType(wxWebViewZoomType); virtual void SetZoomType(wxWebViewZoomType);
virtual wxWebViewZoomType GetZoomType() const; virtual wxWebViewZoomType GetZoomType() const;
virtual bool CanSetZoomType(wxWebViewZoomType) const; virtual bool CanSetZoomType(wxWebViewZoomType) const;
virtual void Print(); virtual void Print();
virtual void SetPage(const wxString& html, const wxString& baseUrl); virtual void SetPage(const wxString& html, const wxString& baseUrl);
virtual wxWebViewZoom GetZoom(); virtual wxWebViewZoom GetZoom();
virtual void SetZoom(wxWebViewZoom zoom); virtual void SetZoom(wxWebViewZoom zoom);
// ---- IE-specific methods // ---- IE-specific methods
// FIXME: I seem to be able to access remote webpages even in offline mode... // FIXME: I seem to be able to access remote webpages even in offline mode...
bool IsOfflineMode(); bool IsOfflineMode();
void SetOfflineMode(bool offline); void SetOfflineMode(bool offline);
/** /**
* Get text zoom * Get text zoom
* @return text zoom from 0 to 4 * @return text zoom from 0 to 4
*/ */
int GetIETextZoom(); int GetIETextZoom();
/** /**
* @param level 0 to 4 * @param level 0 to 4
*/ */
void SetIETextZoom(int level); void SetIETextZoom(int level);
void SetIEOpticalZoom(float zoom); void SetIEOpticalZoom(float zoom);
float GetIEOpticalZoom(); float GetIEOpticalZoom();
void onActiveXEvent(wxActiveXEvent& evt); void onActiveXEvent(wxActiveXEvent& evt);
void onEraseBg(wxEraseEvent& evt) {} void onEraseBg(wxEraseEvent& evt) {}
DECLARE_EVENT_TABLE(); DECLARE_EVENT_TABLE();
private: private:
wxActiveXContainer* m_container; wxActiveXContainer* m_container;
wxAutomationObject m_ie; wxAutomationObject m_ie;
IWebBrowser2* m_webBrowser; IWebBrowser2* m_webBrowser;
DWORD m_dwCookie; DWORD m_dwCookie;
bool m_canNavigateBack; bool m_canNavigateBack;
bool m_canNavigateForward; bool m_canNavigateForward;
/** The "Busy" property of IWebBrowser2 does not always return busy when /** The "Busy" property of IWebBrowser2 does not always return busy when
* we'd want it to; this variable may be set to true in cases where the * we'd want it to; this variable may be set to true in cases where the
* Busy property is false but should be true. * Busy property is false but should be true.
*/ */
bool m_isBusy; bool m_isBusy;
}; };
#endif // wxHAVE_WEB_BACKEND_IE #endif // wxHAVE_WEB_BACKEND_IE
#endif // wxWebViewIE_H #endif // wxWebViewIE_H

284
include/wx/osx/webview.h
View File

@@ -1,142 +1,142 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: include/wx/osx/webkit.h // Name: include/wx/osx/webkit.h
// Purpose: wxOSXWebKitCtrl - embeddable web kit control, // Purpose: wxOSXWebKitCtrl - embeddable web kit control,
// OS X implementation of web view component // OS X implementation of web view component
// Author: Jethro Grassie / Kevin Ollivier / Marianne Gagnon // Author: Jethro Grassie / Kevin Ollivier / Marianne Gagnon
// Modified by: // Modified by:
// Created: 2004-4-16 // Created: 2004-4-16
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Jethro Grassie / Kevin Ollivier / Marianne Gagnon // Copyright: (c) Jethro Grassie / Kevin Ollivier / Marianne Gagnon
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_WEBKIT_H #ifndef _WX_WEBKIT_H
#define _WX_WEBKIT_H #define _WX_WEBKIT_H
#include "wx/setup.h" #include "wx/setup.h"
#if wxUSE_WEBKIT && (defined(__WXMAC__) || defined(__WXCOCOA__)) #if wxUSE_WEBKIT && (defined(__WXMAC__) || defined(__WXCOCOA__))
// TODO: define this in setup.h ? // TODO: define this in setup.h ?
#define wxHAVE_WEB_BACKEND_OSX_WEBKIT 1 #define wxHAVE_WEB_BACKEND_OSX_WEBKIT 1
#include "wx/control.h" #include "wx/control.h"
#include "wx/webview.h" #include "wx/webview.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Web Kit Control // Web Kit Control
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxOSXWebKitCtrl : public wxWebView class WXDLLIMPEXP_CORE wxOSXWebKitCtrl : public wxWebView
{ {
public: public:
wxDECLARE_DYNAMIC_CLASS(wxOSXWebKitCtrl); wxDECLARE_DYNAMIC_CLASS(wxOSXWebKitCtrl);
wxOSXWebKitCtrl() {} wxOSXWebKitCtrl() {}
wxOSXWebKitCtrl(wxWindow *parent, wxOSXWebKitCtrl(wxWindow *parent,
wxWindowID winID = wxID_ANY, wxWindowID winID = wxID_ANY,
const wxString& strURL = wxWebViewDefaultURLStr, const wxString& strURL = wxWebViewDefaultURLStr,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxWebViewNameStr) const wxString& name = wxWebViewNameStr)
{ {
Create(parent, winID, strURL, pos, size, style, name); Create(parent, winID, strURL, pos, size, style, name);
} }
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID winID = wxID_ANY, wxWindowID winID = wxID_ANY,
const wxString& strURL = wxWebViewDefaultURLStr, const wxString& strURL = wxWebViewDefaultURLStr,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxWebViewNameStr); const wxString& name = wxWebViewNameStr);
virtual ~wxOSXWebKitCtrl(); virtual ~wxOSXWebKitCtrl();
void InternalLoadURL(const wxString &url); void InternalLoadURL(const wxString &url);
virtual bool CanGoBack(); virtual bool CanGoBack();
virtual bool CanGoForward(); virtual bool CanGoForward();
virtual void GoBack(); virtual void GoBack();
virtual void GoForward(); virtual void GoForward();
virtual void Reload(wxWebViewReloadFlags flags = 0); virtual void Reload(wxWebViewReloadFlags flags = 0);
virtual void Stop(); virtual void Stop();
virtual wxString GetPageSource(); virtual wxString GetPageSource();
virtual void SetPageTitle(const wxString& title) { m_pageTitle = title; } virtual void SetPageTitle(const wxString& title) { m_pageTitle = title; }
virtual wxString GetPageTitle(){ return m_pageTitle; } virtual wxString GetPageTitle(){ return m_pageTitle; }
virtual void SetPage(const wxString& html, const wxString& baseUrl); virtual void SetPage(const wxString& html, const wxString& baseUrl);
virtual void Print(); virtual void Print();
virtual void LoadUrl(const wxString& url); virtual void LoadUrl(const wxString& url);
virtual wxString GetCurrentURL(); virtual wxString GetCurrentURL();
virtual wxString GetCurrentTitle(); virtual wxString GetCurrentTitle();
virtual wxWebViewZoom GetZoom(); virtual wxWebViewZoom GetZoom();
virtual void SetZoom(wxWebViewZoom zoom); virtual void SetZoom(wxWebViewZoom zoom);
virtual void SetZoomType(wxWebViewZoomType zoomType); virtual void SetZoomType(wxWebViewZoomType zoomType);
virtual wxWebViewZoomType GetZoomType() const; virtual wxWebViewZoomType GetZoomType() const;
virtual bool CanSetZoomType(wxWebViewZoomType type) const; virtual bool CanSetZoomType(wxWebViewZoomType type) const;
virtual bool IsBusy() { return m_busy; } virtual bool IsBusy() { return m_busy; }
// ---- methods not from the parent (common) interface // ---- methods not from the parent (common) interface
wxString GetSelectedText(); wxString GetSelectedText();
wxString RunScript(const wxString& javascript); wxString RunScript(const wxString& javascript);
bool CanGetPageSource(); bool CanGetPageSource();
void SetScrollPos(int pos); void SetScrollPos(int pos);
int GetScrollPos(); int GetScrollPos();
void MakeEditable(bool enable = true); void MakeEditable(bool enable = true);
bool IsEditable(); bool IsEditable();
wxString GetSelection(); wxString GetSelection();
bool CanIncreaseTextSize(); bool CanIncreaseTextSize();
void IncreaseTextSize(); void IncreaseTextSize();
bool CanDecreaseTextSize(); bool CanDecreaseTextSize();
void DecreaseTextSize(); void DecreaseTextSize();
float GetWebkitZoom(); float GetWebkitZoom();
void SetWebkitZoom(float zoom); void SetWebkitZoom(float zoom);
// don't hide base class virtuals // don't hide base class virtuals
virtual void SetScrollPos( int orient, int pos, bool refresh = true ) virtual void SetScrollPos( int orient, int pos, bool refresh = true )
{ return wxControl::SetScrollPos(orient, pos, refresh); } { return wxControl::SetScrollPos(orient, pos, refresh); }
virtual int GetScrollPos( int orient ) const virtual int GetScrollPos( int orient ) const
{ return wxControl::GetScrollPos(orient); } { return wxControl::GetScrollPos(orient); }
//we need to resize the webview when the control size changes //we need to resize the webview when the control size changes
void OnSize(wxSizeEvent &event); void OnSize(wxSizeEvent &event);
void OnMove(wxMoveEvent &event); void OnMove(wxMoveEvent &event);
void OnMouseEvents(wxMouseEvent &event); void OnMouseEvents(wxMouseEvent &event);
bool m_busy; bool m_busy;
protected: protected:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
void MacVisibilityChanged(); void MacVisibilityChanged();
private: private:
wxWindow *m_parent; wxWindow *m_parent;
wxWindowID m_windowID; wxWindowID m_windowID;
wxString m_pageTitle; wxString m_pageTitle;
struct objc_object *m_webView; struct objc_object *m_webView;
// we may use this later to setup our own mouse events, // we may use this later to setup our own mouse events,
// so leave it in for now. // so leave it in for now.
void* m_webKitCtrlEventHandler; void* m_webKitCtrlEventHandler;
//It should be WebView*, but WebView is an Objective-C class //It should be WebView*, but WebView is an Objective-C class
//TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this. //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
}; };
#else #else
// TODO: define this in setup.h ? // TODO: define this in setup.h ?
#define wxHAVE_WEB_BACKEND_OSX_WEBKIT 0 #define wxHAVE_WEB_BACKEND_OSX_WEBKIT 0
#endif // wxUSE_WEBKIT #endif // wxUSE_WEBKIT
#endif // _WX_WEBKIT_H_ #endif // _WX_WEBKIT_H_

858
include/wx/webview.h
View File

@@ -1,429 +1,429 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: webview.h // Name: webview.h
// Purpose: Common interface and events for web view component // Purpose: Common interface and events for web view component
// Author: Marianne Gagnon // Author: Marianne Gagnon
// Id: $Id$ // Id: $Id$
// Copyright: (c) 2010 Marianne Gagnon // Copyright: (c) 2010 Marianne Gagnon
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_WEB_VIEW_H_ #ifndef _WX_WEB_VIEW_H_
#define _WX_WEB_VIEW_H_ #define _WX_WEB_VIEW_H_
#include <wx/control.h> #include <wx/control.h>
#include <wx/event.h> #include <wx/event.h>
#include <wx/sstream.h> #include <wx/sstream.h>
/** /**
* Zoom level in web view component * Zoom level in web view component
*/ */
enum wxWebViewZoom enum wxWebViewZoom
{ {
wxWEB_VIEW_ZOOM_TINY, wxWEB_VIEW_ZOOM_TINY,
wxWEB_VIEW_ZOOM_SMALL, wxWEB_VIEW_ZOOM_SMALL,
wxWEB_VIEW_ZOOM_MEDIUM, wxWEB_VIEW_ZOOM_MEDIUM,
wxWEB_VIEW_ZOOM_LARGE, wxWEB_VIEW_ZOOM_LARGE,
wxWEB_VIEW_ZOOM_LARGEST wxWEB_VIEW_ZOOM_LARGEST
}; };
/** /**
* The type of zooming that the web view control can perform * The type of zooming that the web view control can perform
*/ */
enum wxWebViewZoomType enum wxWebViewZoomType
{ {
/** The entire layout scales when zooming, including images */ /** The entire layout scales when zooming, including images */
wxWEB_VIEW_ZOOM_TYPE_LAYOUT, wxWEB_VIEW_ZOOM_TYPE_LAYOUT,
/** Only the text changes in size when zooming, images and other layout /** Only the text changes in size when zooming, images and other layout
* elements retain their initial size */ * elements retain their initial size */
wxWEB_VIEW_ZOOM_TYPE_TEXT wxWEB_VIEW_ZOOM_TYPE_TEXT
}; };
/** Types of errors that can cause navigation to fail */ /** Types of errors that can cause navigation to fail */
enum wxWebNavigationError enum wxWebNavigationError
{ {
/** Connection error (timeout, etc.) */ /** Connection error (timeout, etc.) */
wxWEB_NAV_ERR_CONNECTION = 1, wxWEB_NAV_ERR_CONNECTION = 1,
/** Invalid certificate */ /** Invalid certificate */
wxWEB_NAV_ERR_CERTIFICATE = 2, wxWEB_NAV_ERR_CERTIFICATE = 2,
/** Authentication required */ /** Authentication required */
wxWEB_NAV_ERR_AUTH = 3, wxWEB_NAV_ERR_AUTH = 3,
/** Other security error */ /** Other security error */
wxWEB_NAV_ERR_SECURITY = 4, wxWEB_NAV_ERR_SECURITY = 4,
/** Requested resource not found */ /** Requested resource not found */
wxWEB_NAV_ERR_NOT_FOUND = 5, wxWEB_NAV_ERR_NOT_FOUND = 5,
/** Invalid request/parameters (e.g. bad URL, bad protocol, /** Invalid request/parameters (e.g. bad URL, bad protocol,
* unsupported resource type) */ * unsupported resource type) */
wxWEB_NAV_ERR_REQUEST = 6, wxWEB_NAV_ERR_REQUEST = 6,
/** The user cancelled (e.g. in a dialog) */ /** The user cancelled (e.g. in a dialog) */
wxWEB_NAV_ERR_USER_CANCELLED = 7, wxWEB_NAV_ERR_USER_CANCELLED = 7,
/** Another (exotic) type of error that didn't fit in other categories*/ /** Another (exotic) type of error that didn't fit in other categories*/
wxWEB_NAV_ERR_OTHER = 8 wxWEB_NAV_ERR_OTHER = 8
}; };
/** Type of refresh */ /** Type of refresh */
enum wxWebViewReloadFlags enum wxWebViewReloadFlags
{ {
/** Reload the current view without accessing the cache */ /** Reload the current view without accessing the cache */
wxWEB_VIEW_RELOAD_NO_CACHE = 1 wxWEB_VIEW_RELOAD_NO_CACHE = 1
}; };
/** /**
* List of available backends for wxWebView * List of available backends for wxWebView
*/ */
enum wxWebViewBackend enum wxWebViewBackend
{ {
/** Value that may be passed to wxWebView to let it pick an appropriate /** Value that may be passed to wxWebView to let it pick an appropriate
* engine for the current platform*/ * engine for the current platform*/
wxWEB_VIEW_BACKEND_DEFAULT, wxWEB_VIEW_BACKEND_DEFAULT,
/** The OSX-native WebKit web engine */ /** The OSX-native WebKit web engine */
wxWEB_VIEW_BACKEND_OSX_WEBKIT, wxWEB_VIEW_BACKEND_OSX_WEBKIT,
/** The GTK port of the WebKit engine */ /** The GTK port of the WebKit engine */
wxWEB_VIEW_BACKEND_GTK_WEBKIT, wxWEB_VIEW_BACKEND_GTK_WEBKIT,
/** Use Microsoft Internet Explorer as web engine */ /** Use Microsoft Internet Explorer as web engine */
wxWEB_VIEW_BACKEND_IE wxWEB_VIEW_BACKEND_IE
}; };
extern WXDLLIMPEXP_DATA_CORE(const char) wxWebViewNameStr[]; extern WXDLLIMPEXP_DATA_CORE(const char) wxWebViewNameStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxWebViewDefaultURLStr[]; extern WXDLLIMPEXP_DATA_CORE(const char) wxWebViewDefaultURLStr[];
/** /**
* @class wxWebView * @class wxWebView
* *
* This control may be used to render web (HTML / CSS / javascript) documents. * This control may be used to render web (HTML / CSS / javascript) documents.
* Capabilities of the HTML renderer will depend upon the backed. * Capabilities of the HTML renderer will depend upon the backed.
* TODO: describe each backend and its capabilities here * TODO: describe each backend and its capabilities here
* *
* Note that errors are generally reported asynchronously though the * Note that errors are generally reported asynchronously though the
* wxEVT_COMMAND_WEB_VIEW_ERROR event described below. * wxEVT_COMMAND_WEB_VIEW_ERROR event described below.
* *
* @beginEventEmissionTable{wxWebNavigationEvent} * @beginEventEmissionTable{wxWebNavigationEvent}
* @event{EVT_BUTTON(id, func)} * @event{EVT_BUTTON(id, func)}
* *
* @event{EVT_WEB_VIEW_NAVIGATING(id, func)} * @event{EVT_WEB_VIEW_NAVIGATING(id, func)}
* Process a wxEVT_COMMAND_WEB_VIEW_NAVIGATING event, generated before trying * Process a wxEVT_COMMAND_WEB_VIEW_NAVIGATING event, generated before trying
* to get a resource. This event may be vetoed to prevent navigating to this * to get a resource. This event may be vetoed to prevent navigating to this
* resource. Note that if the displayed HTML document has several frames, one * resource. Note that if the displayed HTML document has several frames, one
* such event will be generated per frame. * such event will be generated per frame.
* *
* @event{EVT_WEB_VIEW_NAVIGATED(id, func)} * @event{EVT_WEB_VIEW_NAVIGATED(id, func)}
* Process a wxEVT_COMMAND_WEB_VIEW_NAVIGATED event generated after it was * Process a wxEVT_COMMAND_WEB_VIEW_NAVIGATED event generated after it was
* confirmed that a resource would be requested. This event may not be vetoed. * confirmed that a resource would be requested. This event may not be vetoed.
* Note that if the displayed HTML document has several frames, one such event * Note that if the displayed HTML document has several frames, one such event
* will be generated per frame. * will be generated per frame.
* *
* @event{EVT_WEB_VIEW_LOADED(id, func)} * @event{EVT_WEB_VIEW_LOADED(id, func)}
* Process a wxEVT_COMMAND_WEB_VIEW_LOADED event generated when the document * Process a wxEVT_COMMAND_WEB_VIEW_LOADED event generated when the document
* is fully loaded and displayed. * is fully loaded and displayed.
* *
* @event{EVT_WEB_VIEW_ERRROR(id, func)} * @event{EVT_WEB_VIEW_ERRROR(id, func)}
* Process a wxEVT_COMMAND_WEB_VIEW_ERROR event generated when a navigation * Process a wxEVT_COMMAND_WEB_VIEW_ERROR event generated when a navigation
* error occurs. * error occurs.
* The integer associated with this event will be a wxWebNavigationError item. * The integer associated with this event will be a wxWebNavigationError item.
* The string associated with this event may contain a backend-specific more * The string associated with this event may contain a backend-specific more
* precise error message/code. * precise error message/code.
* *
* @endEventTable * @endEventTable
*/ */
class wxWebView : public wxControl class wxWebView : public wxControl
{ {
public: public:
/** /**
* Creation function for two-step creation. * Creation function for two-step creation.
*/ */
virtual bool Create(wxWindow* parent, virtual bool Create(wxWindow* parent,
wxWindowID id, wxWindowID id,
const wxString& url, const wxString& url,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
const wxString& name) = 0; const wxString& name) = 0;
/** /**
* Factory function to create a new wxWebView for two-step creation * Factory function to create a new wxWebView for two-step creation
* (you need to call wxWebView::Create on the returned object) * (you need to call wxWebView::Create on the returned object)
* @param backend which web engine to use as backend for wxWebView * @param backend which web engine to use as backend for wxWebView
* @return the created wxWebView, or NULL if the requested backend is * @return the created wxWebView, or NULL if the requested backend is
* not available * not available
*/ */
static wxWebView* New(wxWebViewBackend backend = wxWEB_VIEW_BACKEND_DEFAULT); static wxWebView* New(wxWebViewBackend backend = wxWEB_VIEW_BACKEND_DEFAULT);
// TODO: clarify what styles can do, or remove this flag // TODO: clarify what styles can do, or remove this flag
/** /**
* Factory function to create a new wxWebView * Factory function to create a new wxWebView
* @param parent parent window to create this view in * @param parent parent window to create this view in
* @param id ID of this control * @param id ID of this control
* @param url URL to load by default in the web view * @param url URL to load by default in the web view
* @param pos position to create this control at * @param pos position to create this control at
* (you may use wxDefaultPosition if you use sizers) * (you may use wxDefaultPosition if you use sizers)
* @param size size to create this control with * @param size size to create this control with
* (you may use wxDefaultSize if you use sizers) * (you may use wxDefaultSize if you use sizers)
* @param backend which web engine to use as backend for wxWebView * @param backend which web engine to use as backend for wxWebView
* @return the created wxWebView, or NULL if the requested backend * @return the created wxWebView, or NULL if the requested backend
* is not available * is not available
*/ */
static wxWebView* New(wxWindow* parent, static wxWebView* New(wxWindow* parent,
wxWindowID id, wxWindowID id,
const wxString& url = wxWebViewDefaultURLStr, const wxString& url = wxWebViewDefaultURLStr,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
wxWebViewBackend backend = wxWEB_VIEW_BACKEND_DEFAULT, wxWebViewBackend backend = wxWEB_VIEW_BACKEND_DEFAULT,
long style = 0, long style = 0,
const wxString& name = wxWebViewNameStr); const wxString& name = wxWebViewNameStr);
/** Get whether it is possible to navigate back in the history of /** Get whether it is possible to navigate back in the history of
* visited pages * visited pages
*/ */
virtual bool CanGoBack() = 0; virtual bool CanGoBack() = 0;
/** Get whether it is possible to navigate forward in the history of /** Get whether it is possible to navigate forward in the history of
* visited pages * visited pages
*/ */
virtual bool CanGoForward() = 0; virtual bool CanGoForward() = 0;
/** Navigate back in the history of visited pages. /** Navigate back in the history of visited pages.
* Only valid if CanGoBack() returned true. * Only valid if CanGoBack() returned true.
*/ */
virtual void GoBack() = 0; virtual void GoBack() = 0;
/** Navigate forwardin the history of visited pages. /** Navigate forwardin the history of visited pages.
* Only valid if CanGoForward() returned true. * Only valid if CanGoForward() returned true.
*/ */
virtual void GoForward() = 0; virtual void GoForward() = 0;
/** /**
* Load a HTMl document (web page) from a URL * Load a HTMl document (web page) from a URL
* @param url the URL where the HTML document to display can be found * @param url the URL where the HTML document to display can be found
* @note web engines generally report errors asynchronously, so if you wish * @note web engines generally report errors asynchronously, so if you wish
* to know whether loading the URL was successful, register to receive * to know whether loading the URL was successful, register to receive
* navigation error events * navigation error events
*/ */
virtual void LoadUrl(const wxString& url) = 0; virtual void LoadUrl(const wxString& url) = 0;
/** /**
* Stop the current page loading process, if any. * Stop the current page loading process, if any.
* May trigger an error event of type wxWEB_NAV_ERR_USER_CANCELLED. * May trigger an error event of type wxWEB_NAV_ERR_USER_CANCELLED.
* TODO: make wxWEB_NAV_ERR_USER_CANCELLED errors uniform across ports. * TODO: make wxWEB_NAV_ERR_USER_CANCELLED errors uniform across ports.
*/ */
virtual void Stop() = 0; virtual void Stop() = 0;
/** /**
* Reload the currently displayed URL. * Reload the currently displayed URL.
* @param flags A bit array that may optionnally contain reload options * @param flags A bit array that may optionnally contain reload options
*/ */
virtual void Reload(wxWebViewReloadFlags flags=0) = 0; virtual void Reload(wxWebViewReloadFlags flags=0) = 0;
/** /**
* Get the URL of the currently displayed document * Get the URL of the currently displayed document
*/ */
virtual wxString GetCurrentURL() = 0; virtual wxString GetCurrentURL() = 0;
/** /**
* Get the title of the current web page, or its URL/path if title is not * Get the title of the current web page, or its URL/path if title is not
* available * available
*/ */
virtual wxString GetCurrentTitle() = 0; virtual wxString GetCurrentTitle() = 0;
// TODO: handle choosing a frame when calling GetPageSource()? // TODO: handle choosing a frame when calling GetPageSource()?
/** /**
* Get the HTML source code of the currently displayed document * Get the HTML source code of the currently displayed document
* @return the HTML source code, or an empty string if no page is currently * @return the HTML source code, or an empty string if no page is currently
* shown * shown
*/ */
virtual wxString GetPageSource() = 0; virtual wxString GetPageSource() = 0;
/** /**
* Get the zoom factor of the page * Get the zoom factor of the page
* @return How much the HTML document is zoomed (scaleed) * @return How much the HTML document is zoomed (scaleed)
*/ */
virtual wxWebViewZoom GetZoom() = 0; virtual wxWebViewZoom GetZoom() = 0;
/** /**
* Set the zoom factor of the page * Set the zoom factor of the page
* @param zoom How much to zoom (scale) the HTML document * @param zoom How much to zoom (scale) the HTML document
*/ */
virtual void SetZoom(wxWebViewZoom zoom) = 0; virtual void SetZoom(wxWebViewZoom zoom) = 0;
/** /**
* Set how to interpret the zoom factor * Set how to interpret the zoom factor
* @param zoomType how the zoom factor should be interpreted by the * @param zoomType how the zoom factor should be interpreted by the
* HTML engine * HTML engine
* @note invoke canSetZoomType() first, some HTML renderers may not * @note invoke canSetZoomType() first, some HTML renderers may not
* support all zoom types * support all zoom types
*/ */
virtual void SetZoomType(wxWebViewZoomType zoomType) = 0; virtual void SetZoomType(wxWebViewZoomType zoomType) = 0;
/** /**
* Get how the zoom factor is currently interpreted * Get how the zoom factor is currently interpreted
* @return how the zoom factor is currently interpreted by the HTML engine * @return how the zoom factor is currently interpreted by the HTML engine
*/ */
virtual wxWebViewZoomType GetZoomType() const = 0; virtual wxWebViewZoomType GetZoomType() const = 0;
/** /**
* Retrieve whether the current HTML engine supports a type of zoom * Retrieve whether the current HTML engine supports a type of zoom
* @param type the type of zoom to test * @param type the type of zoom to test
* @return whether this type of zoom is supported by this HTML engine * @return whether this type of zoom is supported by this HTML engine
* (and thus can be set through setZoomType()) * (and thus can be set through setZoomType())
*/ */
virtual bool CanSetZoomType(wxWebViewZoomType type) const = 0; virtual bool CanSetZoomType(wxWebViewZoomType type) const = 0;
// TODO: allow 'SetPage' to find files (e.g. images) from a virtual file // TODO: allow 'SetPage' to find files (e.g. images) from a virtual file
// system if possible // system if possible
/** /**
* Set the displayed page source to the contents of the given string * Set the displayed page source to the contents of the given string
* @param html the string that contains the HTML data to display * @param html the string that contains the HTML data to display
* @param baseUrl URL assigned to the HTML data, to be used to resolve * @param baseUrl URL assigned to the HTML data, to be used to resolve
* relative paths, for instance * relative paths, for instance
*/ */
virtual void SetPage(const wxString& html, const wxString& baseUrl) = 0; virtual void SetPage(const wxString& html, const wxString& baseUrl) = 0;
/** /**
* Set the displayed page source to the contents of the given stream * Set the displayed page source to the contents of the given stream
* @param html the stream to read HTML data from * @param html the stream to read HTML data from
* @param baseUrl URL assigned to the HTML data, to be used to resolve * @param baseUrl URL assigned to the HTML data, to be used to resolve
* relative paths, for instance * relative paths, for instance
*/ */
virtual void SetPage(wxInputStream& html, wxString baseUrl) virtual void SetPage(wxInputStream& html, wxString baseUrl)
{ {
wxStringOutputStream stream; wxStringOutputStream stream;
stream.Write(html); stream.Write(html);
SetPage(stream.GetString(), baseUrl); SetPage(stream.GetString(), baseUrl);
} }
// TODO: // TODO:
// wxString GetSelection(); // maybe? // wxString GetSelection(); // maybe?
// void SetSelection(...); // maybe? // void SetSelection(...); // maybe?
// void MakeEditable(bool enable = true); // maybe? // void MakeEditable(bool enable = true); // maybe?
// bool IsEditable(); // maybe? // bool IsEditable(); // maybe?
// void EnableJavascript(bool enabled); // maybe? // void EnableJavascript(bool enabled); // maybe?
// wxString RunScript(const wxString& javascript); // maybe? // wxString RunScript(const wxString& javascript); // maybe?
// void SetScrollPos(int pos); // maybe? // void SetScrollPos(int pos); // maybe?
// int GetScrollPos(); // maybe? // int GetScrollPos(); // maybe?
// wxString GetStatusText(); // maybe? // wxString GetStatusText(); // maybe?
// void SetStatusText(wxString text); // maybe? // void SetStatusText(wxString text); // maybe?
// * status text changed event? // * status text changed event?
// * title changed event? // * title changed event?
// virtual bool IsOfflineMode() = 0; // maybe? // virtual bool IsOfflineMode() = 0; // maybe?
// virtual void SetOfflineMode(bool offline) = 0; // maybe? // virtual void SetOfflineMode(bool offline) = 0; // maybe?
// TODO: offer API to control the opening of new frames // TODO: offer API to control the opening of new frames
// (through <a target="..."> as well as through javascript), OR // (through <a target="..."> as well as through javascript), OR
// provide a behavior consistent across ports. // provide a behavior consistent across ports.
// - OSX : I receive an event for new frames opened with HTML target, and // - OSX : I receive an event for new frames opened with HTML target, and
// currently block them all. // currently block them all.
// - IE : The DISPID_NEWWINDOW2 event looks like it should work, but I // - IE : The DISPID_NEWWINDOW2 event looks like it should work, but I
// receive way too many of them. A new IE instance opens. // receive way too many of them. A new IE instance opens.
// - GTK : All frame open requests are blocked. A slot exists that I could // - GTK : All frame open requests are blocked. A slot exists that I could
// connect to to be notified if ever needed // connect to to be notified if ever needed
/** /**
* Opens a print dialog so that the user may print the currently * Opens a print dialog so that the user may print the currently
* displayed page. * displayed page.
*/ */
virtual void Print() = 0; virtual void Print() = 0;
/** /**
* Returns whether the web control is currently busy (e.g. loading a page) * Returns whether the web control is currently busy (e.g. loading a page)
*/ */
virtual bool IsBusy() = 0; virtual bool IsBusy() = 0;
}; };
//class WXDLLIMPEXP_FWD_HTML wxWebNavigationEvent; //class WXDLLIMPEXP_FWD_HTML wxWebNavigationEvent;
// FIXME: get those WXDLLIMPEXP_HTML & DECLARE_DYNAMIC_CLASS right... // FIXME: get those WXDLLIMPEXP_HTML & DECLARE_DYNAMIC_CLASS right...
//wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_HTML, wxEVT_COMMAND_WEB_VIEW_NAVIGATE, //wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_HTML, wxEVT_COMMAND_WEB_VIEW_NAVIGATE,
// wxWebNavigationEvent ); // wxWebNavigationEvent );
// FIXME: get those WXDLLIMPEXP_HTML & DECLARE_DYNAMIC_CLASS right... // FIXME: get those WXDLLIMPEXP_HTML & DECLARE_DYNAMIC_CLASS right...
class wxWebNavigationEvent : public wxCommandEvent class wxWebNavigationEvent : public wxCommandEvent
{ {
public: public:
wxWebNavigationEvent() {} wxWebNavigationEvent() {}
wxWebNavigationEvent(wxEventType type, int id, const wxString href, wxWebNavigationEvent(wxEventType type, int id, const wxString href,
const wxString target, bool canVeto) const wxString target, bool canVeto)
: wxCommandEvent(type, id) : wxCommandEvent(type, id)
{ {
m_href = href; m_href = href;
m_target = target; m_target = target;
m_vetoed = false; m_vetoed = false;
m_canVeto = canVeto; m_canVeto = canVeto;
} }
/** /**
* Get the URL being visited * Get the URL being visited
*/ */
const wxString& GetHref() const { return m_href; } const wxString& GetHref() const { return m_href; }
/** /**
* Get the target (frame or window) in which the URL that caused this event * Get the target (frame or window) in which the URL that caused this event
* is viewed, or an empty string if not available. * is viewed, or an empty string if not available.
*/ */
const wxString& GetTarget() const { return m_target; } const wxString& GetTarget() const { return m_target; }
// default copy ctor, assignment operator and dtor are ok // default copy ctor, assignment operator and dtor are ok
virtual wxEvent* Clone() const { return new wxWebNavigationEvent(*this); } virtual wxEvent* Clone() const { return new wxWebNavigationEvent(*this); }
/** Get whether this event may be vetoed (stopped/prevented). Only /** Get whether this event may be vetoed (stopped/prevented). Only
* meaningful for events fired before navigation takes place. * meaningful for events fired before navigation takes place.
*/ */
bool CanVeto() const { return m_canVeto; } bool CanVeto() const { return m_canVeto; }
/** Whether this event was vetoed (stopped/prevented). Only meaningful for /** Whether this event was vetoed (stopped/prevented). Only meaningful for
* events fired before navigation takes place. * events fired before navigation takes place.
*/ */
bool IsVetoed() const { return m_vetoed; } bool IsVetoed() const { return m_vetoed; }
/** Veto (prevent/stop) this event. Only meaningful for events fired /** Veto (prevent/stop) this event. Only meaningful for events fired
* before navigation takes place. Only valid if CanVeto() returned true. * before navigation takes place. Only valid if CanVeto() returned true.
*/ */
void Veto() { wxASSERT(m_canVeto); m_vetoed = true; } void Veto() { wxASSERT(m_canVeto); m_vetoed = true; }
private: private:
wxString m_href; wxString m_href;
wxString m_target; wxString m_target;
bool m_canVeto; bool m_canVeto;
bool m_vetoed; bool m_vetoed;
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWebNavigationEvent); wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWebNavigationEvent);
}; };
wxDECLARE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebNavigationEvent ); wxDECLARE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebNavigationEvent );
wxDECLARE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebNavigationEvent ); wxDECLARE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebNavigationEvent );
wxDECLARE_EVENT( wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebNavigationEvent ); wxDECLARE_EVENT( wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebNavigationEvent );
wxDECLARE_EVENT( wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebNavigationEvent ); wxDECLARE_EVENT( wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebNavigationEvent );
typedef void (wxEvtHandler::*wxWebNavigationEventFunction) typedef void (wxEvtHandler::*wxWebNavigationEventFunction)
(wxWebNavigationEvent&); (wxWebNavigationEvent&);
#define wxWebNavigationEventHandler(func) \ #define wxWebNavigationEventHandler(func) \
wxEVENT_HANDLER_CAST(wxWebNavigationEventFunction, func) wxEVENT_HANDLER_CAST(wxWebNavigationEventFunction, func)
#define EVT_WEB_VIEW_NAVIGATING(id, fn) \ #define EVT_WEB_VIEW_NAVIGATING(id, fn) \
wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_NAVIGATING, id, wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_NAVIGATING, id,
wxHtmlNavigatingEventHandler(fn)) wxHtmlNavigatingEventHandler(fn))
#define EVT_WEB_VIEW_NAVIGATED(id, fn) \ #define EVT_WEB_VIEW_NAVIGATED(id, fn) \
wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_NAVIGATED, id, wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_NAVIGATED, id,
wxHtmlNavigatingEventHandler(fn)) wxHtmlNavigatingEventHandler(fn))
#define EVT_WEB_VIEW_LOADED(id, fn) \ #define EVT_WEB_VIEW_LOADED(id, fn) \
wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_LOADED, id, wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_LOADED, id,
wxHtmlNavigatingEventHandler(fn)) wxHtmlNavigatingEventHandler(fn))
#define EVT_WEB_VIEW_ERRROR(id, fn) \ #define EVT_WEB_VIEW_ERRROR(id, fn) \
wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_ERROR, id, wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_ERROR, id,
wxHtmlNavigatingEventHandler(fn)) wxHtmlNavigatingEventHandler(fn))
#endif #endif

1280
samples/web/web.cpp
View File

File diff suppressed because it is too large Load Diff

226
src/common/webview.cpp
View File

@@ -1,113 +1,113 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: webview.cpp // Name: webview.cpp
// Purpose: Common interface and events for web view component // Purpose: Common interface and events for web view component
// Author: Marianne Gagnon // Author: Marianne Gagnon
// Id: $Id$ // Id: $Id$
// Copyright: (c) 2010 Marianne Gagnon // Copyright: (c) 2010 Marianne Gagnon
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#include "wx/webview.h" #include "wx/webview.h"
#include "wx/osx/webkit.h" #include "wx/osx/webkit.h"
#include "wx/gtk/webkit.h" #include "wx/gtk/webkit.h"
#include "wx/msw/webkitie.h" #include "wx/msw/webkitie.h"
extern WXDLLEXPORT_DATA(const char) wxWebViewNameStr[] = "wxWebView"; extern WXDLLEXPORT_DATA(const char) wxWebViewNameStr[] = "wxWebView";
extern WXDLLEXPORT_DATA(const char) wxWebViewDefaultURLStr[] = "about:blank"; extern WXDLLEXPORT_DATA(const char) wxWebViewDefaultURLStr[] = "about:blank";
IMPLEMENT_DYNAMIC_CLASS(wxWebNavigationEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxWebNavigationEvent, wxCommandEvent)
wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebNavigationEvent ); wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebNavigationEvent );
wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebNavigationEvent ); wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebNavigationEvent );
wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebNavigationEvent ); wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebNavigationEvent );
wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebNavigationEvent ); wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebNavigationEvent );
// static // static
wxWebView* wxWebView::New(wxWebViewBackend backend) wxWebView* wxWebView::New(wxWebViewBackend backend)
{ {
switch (backend) switch (backend)
{ {
#if wxHAVE_WEB_BACKEND_OSX_WEBKIT #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
case wxWEB_VIEW_BACKEND_OSX_WEBKIT: case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
return new wxOSXWebKitCtrl(); return new wxOSXWebKitCtrl();
#endif #endif
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
case wxWEB_VIEW_BACKEND_GTK_WEBKIT: case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
return new wxGtkWebKitCtrl(); return new wxGtkWebKitCtrl();
#endif #endif
#if wxHAVE_WEB_BACKEND_IE #if wxHAVE_WEB_BACKEND_IE
case wxWEB_VIEW_BACKEND_IE: case wxWEB_VIEW_BACKEND_IE:
return new wxIEPanel(); return new wxIEPanel();
#endif #endif
case wxWEB_VIEW_BACKEND_DEFAULT: case wxWEB_VIEW_BACKEND_DEFAULT:
#if wxHAVE_WEB_BACKEND_OSX_WEBKIT #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
return new wxOSXWebKitCtrl(); return new wxOSXWebKitCtrl();
#endif #endif
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
return new wxGtkWebKitCtrl(); return new wxGtkWebKitCtrl();
#endif #endif
#if wxHAVE_WEB_BACKEND_IE #if wxHAVE_WEB_BACKEND_IE
return new wxIEPanel(); return new wxIEPanel();
#endif #endif
// fall-through intended // fall-through intended
default: default:
return NULL; return NULL;
} }
} }
// static // static
wxWebView* wxWebView::New(wxWindow* parent, wxWebView* wxWebView::New(wxWindow* parent,
wxWindowID id, wxWindowID id,
const wxString& url, const wxString& url,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
wxWebViewBackend backend, wxWebViewBackend backend,
long style, long style,
const wxString& name) const wxString& name)
{ {
switch (backend) switch (backend)
{ {
#if wxHAVE_WEB_BACKEND_OSX_WEBKIT #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
case wxWEB_VIEW_BACKEND_OSX_WEBKIT: case wxWEB_VIEW_BACKEND_OSX_WEBKIT:
return new wxOSXWebKitCtrl(parent, id, url, pos, size, style, return new wxOSXWebKitCtrl(parent, id, url, pos, size, style,
name); name);
#endif #endif
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
case wxWEB_VIEW_BACKEND_GTK_WEBKIT: case wxWEB_VIEW_BACKEND_GTK_WEBKIT:
return new wxGtkWebKitCtrl(parent, id, url, pos, size, style, return new wxGtkWebKitCtrl(parent, id, url, pos, size, style,
name); name);
#endif #endif
#if wxHAVE_WEB_BACKEND_IE #if wxHAVE_WEB_BACKEND_IE
case wxWEB_VIEW_BACKEND_IE: case wxWEB_VIEW_BACKEND_IE:
return new wxIEPanel(parent, id, url, pos, size, style, name); return new wxIEPanel(parent, id, url, pos, size, style, name);
#endif #endif
case wxWEB_VIEW_BACKEND_DEFAULT: case wxWEB_VIEW_BACKEND_DEFAULT:
#if wxHAVE_WEB_BACKEND_OSX_WEBKIT #if wxHAVE_WEB_BACKEND_OSX_WEBKIT
return new wxOSXWebKitCtrl(parent, id, url, pos, size, style, name); return new wxOSXWebKitCtrl(parent, id, url, pos, size, style, name);
#endif #endif
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
return new wxGtkWebKitCtrl(parent, id, url, pos, size, style, name); return new wxGtkWebKitCtrl(parent, id, url, pos, size, style, name);
#endif #endif
#if wxHAVE_WEB_BACKEND_IE #if wxHAVE_WEB_BACKEND_IE
return new wxIEPanel(parent, id, url, pos, size, style, name); return new wxIEPanel(parent, id, url, pos, size, style, name);
#endif #endif
// fall-through intended // fall-through intended
default: default:
return NULL; return NULL;
} }
} }

1120
src/gtk/webview.cpp
View File

File diff suppressed because it is too large Load Diff

1334
src/msw/webviewie.cpp
View File

File diff suppressed because it is too large Load Diff

2416
src/osx/webview.mm
View File

File diff suppressed because it is too large Load Diff