git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71034
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
13 files changed:
virtual void ClearSelection();
virtual void RunScript(const wxString& javascript);
virtual void ClearSelection();
virtual void RunScript(const wxString& javascript);
//Virtual Filesystem Support
virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
virtual wxVector<wxSharedPtr<wxWebViewHandler> > GetHandlers() { return m_handlerList; }
//Virtual Filesystem Support
virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
virtual wxVector<wxSharedPtr<wxWebViewHandler> > GetHandlers() { return m_handlerList; }
class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
{
public:
class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
{
public:
- wxWebViewHistoryItem(const wxString& url, const wxString& title) :
+ wxWebViewHistoryItem(const wxString& url, const wxString& title) :
m_url(url), m_title(title) {}
wxString GetUrl() { return m_url; }
wxString GetTitle() { return m_title; }
m_url(url), m_title(title) {}
wxString GetUrl() { return m_url; }
wxString GetTitle() { return m_title; }
virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo) = 0;
virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo) = 0;
- virtual HRESULT wxSTDCALL ShowUI(DWORD dwID,
+ virtual HRESULT wxSTDCALL ShowUI(DWORD dwID,
IOleInPlaceActiveObject *pActiveObject,
IOleCommandTarget *pCommandTarget,
IOleInPlaceFrame *pFrame,
IOleInPlaceActiveObject *pActiveObject,
IOleCommandTarget *pCommandTarget,
IOleInPlaceFrame *pFrame,
virtual HRESULT wxSTDCALL HideUI(void) = 0;
virtual HRESULT wxSTDCALL UpdateUI(void) = 0;
virtual HRESULT wxSTDCALL HideUI(void) = 0;
virtual HRESULT wxSTDCALL UpdateUI(void) = 0;
virtual HRESULT wxSTDCALL EnableModeless(BOOL fEnable) = 0;
virtual HRESULT wxSTDCALL OnDocWindowActivate(BOOL fActivate) = 0;
virtual HRESULT wxSTDCALL EnableModeless(BOOL fEnable) = 0;
virtual HRESULT wxSTDCALL OnDocWindowActivate(BOOL fActivate) = 0;
IOleInPlaceUIWindow *pUIWindow,
BOOL fRameWindow) = 0;
IOleInPlaceUIWindow *pUIWindow,
BOOL fRameWindow) = 0;
- virtual HRESULT wxSTDCALL TranslateAccelerator(LPMSG lpMsg,
+ virtual HRESULT wxSTDCALL TranslateAccelerator(LPMSG lpMsg,
const GUID *pguidCmdGroup,
DWORD nCmdID) = 0;
const GUID *pguidCmdGroup,
DWORD nCmdID) = 0;
- virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey,
+ virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey,
DWORD dw) = 0;
virtual HRESULT wxSTDCALL GetDropTarget(IDropTarget *pDropTarget,
DWORD dw) = 0;
virtual HRESULT wxSTDCALL GetDropTarget(IDropTarget *pDropTarget,
virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt,
IUnknown *pcmdtReserved,
IDispatch *pdispReserved);
virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt,
IUnknown *pcmdtReserved,
IDispatch *pdispReserved);
virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo);
virtual HRESULT wxSTDCALL ShowUI(DWORD dwID,
virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo);
virtual HRESULT wxSTDCALL ShowUI(DWORD dwID,
const GUID *pguidCmdGroup,
DWORD nCmdID);
const GUID *pguidCmdGroup,
DWORD nCmdID);
- virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey,
+ virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey,
DWORD dw);
virtual HRESULT wxSTDCALL GetDropTarget(IDropTarget *pDropTarget,
DWORD dw);
virtual HRESULT wxSTDCALL GetDropTarget(IDropTarget *pDropTarget,
class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
{
public:
class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
{
public:
- wxWebViewHistoryItem(const wxString& url, const wxString& title) :
+ wxWebViewHistoryItem(const wxString& url, const wxString& title) :
m_url(url), m_title(title) {}
wxString GetUrl() { return m_url; }
wxString GetTitle() { return m_title; }
m_url(url), m_title(title) {}
wxString GetUrl() { return m_url; }
wxString GetTitle() { return m_title; }
virtual bool CanSetZoomType(wxWebViewZoomType type) const;
virtual bool IsBusy() const { return m_busy; }
virtual bool CanSetZoomType(wxWebViewZoomType type) const;
virtual bool IsBusy() const { return m_busy; }
//History functions
virtual void ClearHistory();
virtual void EnableHistory(bool enable = true);
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();
virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item);
//History functions
virtual void ClearHistory();
virtual void EnableHistory(bool enable = true);
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();
virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item);
//Undo / redo functionality
virtual bool CanUndo() const;
virtual bool CanRedo() const;
//Undo / redo functionality
virtual bool CanUndo() const;
virtual bool CanRedo() const;
virtual void Cut();
virtual void Copy();
virtual void Paste();
virtual void Cut();
virtual void Copy();
virtual void Paste();
//Editing functions
virtual void SetEditable(bool enable = true);
virtual bool IsEditable() const;
//Editing functions
virtual void SetEditable(bool enable = true);
virtual bool IsEditable() const;
//Selection
virtual void DeleteSelection();
virtual bool HasSelection() const;
//Selection
virtual void DeleteSelection();
virtual bool HasSelection() const;
virtual wxString GetSelectedText() const;
virtual wxString GetSelectedSource() const;
virtual void ClearSelection();
virtual wxString GetSelectedText() const;
virtual wxString GetSelectedSource() const;
virtual void ClearSelection();
void RunScript(const wxString& javascript);
void RunScript(const wxString& javascript);
//Virtual Filesystem Support
virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
//Virtual Filesystem Support
virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
//TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
};
//TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
};
-#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
+#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
struct objc_object *m_histItem;
};
struct objc_object *m_histItem;
};
-#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
+#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
#endif // _WX_OSX_WEBVIEWHISTORYITEM_H_
#endif // _WX_OSX_WEBVIEWHISTORYITEM_H_
{
//Default, may access cache
wxWEB_VIEW_RELOAD_DEFAULT,
{
//Default, may access cache
wxWEB_VIEW_RELOAD_DEFAULT,
- wxWEB_VIEW_RELOAD_NO_CACHE
+ wxWEB_VIEW_RELOAD_NO_CACHE
#include "wx/webview.h"
//Loads from uris such as scheme:///C:/example/example.html or archives such as
#include "wx/webview.h"
//Loads from uris such as scheme:///C:/example/example.html or archives such as
-//scheme:///C:/example/example.zip;protocol=zip/example.html
+//scheme:///C:/example/example.zip;protocol=zip/example.html
class WXDLLIMPEXP_WEBVIEW wxWebViewArchiveHandler : public wxWebViewHandler
{
class WXDLLIMPEXP_WEBVIEW wxWebViewArchiveHandler : public wxWebViewHandler
{
*/
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
*/
enum wxWebViewNavigationError
Types of errors that can cause navigation to fail
*/
enum wxWebViewNavigationError
*/
enum wxWebViewReloadFlags
{
/** Default reload, will access cache */
wxWEB_VIEW_RELOAD_DEFAULT,
/** Reload the current view without accessing the cache */
*/
enum wxWebViewReloadFlags
{
/** Default reload, will access cache */
wxWEB_VIEW_RELOAD_DEFAULT,
/** Reload the current view without accessing the cache */
- wxWEB_VIEW_RELOAD_NO_CACHE
+ wxWEB_VIEW_RELOAD_NO_CACHE
/**
* List of available backends for wxWebView
*/
/**
* List of available backends for wxWebView
*/
/**
@class wxWebViewHistoryItem
/**
@class wxWebViewHistoryItem
A simple class that contains the URL and title of an element of the history
A simple class that contains the URL and title of an element of the history
@since 2.9.3
@library{wxwebview}
@category{webview}
@since 2.9.3
@library{wxwebview}
@category{webview}
@see wxWebView
*/
class wxWebViewHistoryItem
@see wxWebView
*/
class wxWebViewHistoryItem
Construtor.
*/
wxWebViewHistoryItem(const wxString& url, const wxString& title);
Construtor.
*/
wxWebViewHistoryItem(const wxString& url, const wxString& title);
/**
@return The url of the page.
*/
wxString GetUrl();
/**
@return The url of the page.
*/
wxString GetUrl();
/**
@return The title of the page.
*/
/**
@return The title of the page.
*/
/**
@class wxWebViewHandler
/**
@class wxWebViewHandler
-
- The base class for handling custom schemes in wxWebView, for example to
+
+ The base class for handling custom schemes in wxWebView, for example to
allow virtual file system support.
allow virtual file system support.
@since 2.9.3
@library{wxwebview}
@category{webview}
@since 2.9.3
@library{wxwebview}
@category{webview}
@see wxWebView
*/
class wxWebViewHandler
@see wxWebView
*/
class wxWebViewHandler
/**
@return A pointer to the file represented by @c uri.
/**
@return A pointer to the file represented by @c uri.
virtual wxFSFile* GetFile(const wxString &uri) = 0;
/**
virtual wxFSFile* GetFile(const wxString &uri) = 0;
/**
This control may be used to render web (HTML / CSS / javascript) documents.
This control may be used to render web (HTML / CSS / javascript) documents.
- It is designed to allow the creation of multiple backends for each port,
+ It is designed to allow the creation of multiple backends for each port,
although currently just one is available. It differs from wxHtmlWindow in
that each backend is actually a full rendering engine, Trident on MSW and
Webkit on OSX and GTK. This allows the correct viewing complex pages with
although currently just one is available. It differs from wxHtmlWindow in
that each backend is actually a full rendering engine, Trident on MSW and
Webkit on OSX and GTK. This allows the correct viewing complex pages with
@section descriptions Backend Descriptions
@section descriptions Backend Descriptions
@par wxWEB_VIEW_BACKEND_IE (MSW)
@par wxWEB_VIEW_BACKEND_IE (MSW)
The IE backend uses Microsoft's Trident rendering engine, specifically the
version used by the locally installed copy of Internet Explorer. As such it
The IE backend uses Microsoft's Trident rendering engine, specifically the
version used by the locally installed copy of Internet Explorer. As such it
- is only available for the MSW port. By default recent versions of the
+ is only available for the MSW port. By default recent versions of the
<a href="http://msdn.microsoft.com/en-us/library/aa752085%28v=VS.85%29.aspx">WebBrowser</a>
control, which this backend uses, emulate Internet Explorer 7. This can be
<a href="http://msdn.microsoft.com/en-us/library/aa752085%28v=VS.85%29.aspx">WebBrowser</a>
control, which this backend uses, emulate Internet Explorer 7. This can be
- changed with a registry setting, see
+ changed with a registry setting, see
<a href="http://msdn.microsoft.com/en-us/library/ee330730%28v=vs.85%29.aspx#browser_emulation">
this</a> article for more information. This backend has full support for
custom schemes and virtual file systems.
<a href="http://msdn.microsoft.com/en-us/library/ee330730%28v=vs.85%29.aspx#browser_emulation">
this</a> article for more information. This backend has full support for
custom schemes and virtual file systems.
@par wxWEB_VIEW_WEBKIT (GTK)
@par wxWEB_VIEW_WEBKIT (GTK)
-
- Under GTK the WebKit backend uses
+
+ Under GTK the WebKit backend uses
<a href="http://webkitgtk.org/">WebKitGTK+</a>. The current minimum version
required is 1.3.1 which ships by default with Ubuntu Natty and Debian
<a href="http://webkitgtk.org/">WebKitGTK+</a>. The current minimum version
required is 1.3.1 which ships by default with Ubuntu Natty and Debian
- Wheezy and has the package name libwebkitgtk-dev. Custom schemes and
+ Wheezy and has the package name libwebkitgtk-dev. Custom schemes and
virtual files systems are supported under this backend, however embedded
resources such as images and stylesheets are currently loaded using the
data:// scheme.
virtual files systems are supported under this backend, however embedded
resources such as images and stylesheets are currently loaded using the
data:// scheme.
@par wxWEB_VIEW_WEBKIT (OSX)
@par wxWEB_VIEW_WEBKIT (OSX)
-
- The OSX WebKit backend uses Apple's
+
+ The OSX WebKit backend uses Apple's
<a href="http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/WebKit/Classes/WebView_Class/Reference/Reference.html#//apple_ref/doc/uid/20001903">WebView</a>
class. This backend has full support for custom schemes and virtual file
systems.
@section async Asynchronous Notifications
<a href="http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/WebKit/Classes/WebView_Class/Reference/Reference.html#//apple_ref/doc/uid/20001903">WebView</a>
class. This backend has full support for custom schemes and virtual file
systems.
@section async Asynchronous Notifications
Many of the methods in wxWebView are asynchronous, i.e. they return
immediately and perform their work in the background. This includes
Many of the methods in wxWebView are asynchronous, i.e. they return
immediately and perform their work in the background. This includes
- functions such as LoadUrl() and Reload(). To receive notification of the
+ functions such as LoadUrl() and Reload(). To receive notification of the
progress and completion of these functions you need to handle the events
that are provided. Specifically @c wxEVT_COMMAND_WEB_VIEW_LOADED notifies
progress and completion of these functions you need to handle the events
that are provided. Specifically @c wxEVT_COMMAND_WEB_VIEW_LOADED notifies
- when the page or a sub-frame has finished loading and
+ when the page or a sub-frame has finished loading and
@c wxEVT_COMMAND_WEB_VIEW_ERROR notifies that an error has occurred.
@c wxEVT_COMMAND_WEB_VIEW_ERROR notifies that an error has occurred.
@section vfs Virtual File Systems and Custom Schemes
@section vfs Virtual File Systems and Custom Schemes
wxWebView supports the registering of custom scheme handlers, for example
wxWebView supports the registering of custom scheme handlers, for example
- @c file or @c http. To do this create a new class which inherits from
- wxWebViewHandler, where wxWebHandler::GetFile() returns a pointer to a
+ @c file or @c http. To do this create a new class which inherits from
+ wxWebViewHandler, where wxWebHandler::GetFile() returns a pointer to a
wxFSFile which represents the given url. You can then register your handler
with RegisterHandler() it will be called for all pages and resources.
wxFSFile which represents the given url. You can then register your handler
with RegisterHandler() it will be called for all pages and resources.
wxWebFileHandler is provided to allow the navigation of pages inside a zip
wxWebFileHandler is provided to allow the navigation of pages inside a zip
- archive. It overrides the @c file scheme and provides support for the
- standard @c file syntax as well as paths to archives of the form
+ archive. It overrides the @c file scheme and provides support for the
+ standard @c file syntax as well as paths to archives of the form
@c file:///C:/example/docs.zip;protocol=zip/main.htm
@c file:///C:/example/docs.zip;protocol=zip/main.htm
@beginEventEmissionTable{wxWebViewEvent}
@event{EVT_WEB_VIEW_NAVIGATING(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_NAVIGATING event, generated before trying
@beginEventEmissionTable{wxWebViewEvent}
@event{EVT_WEB_VIEW_NAVIGATING(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_NAVIGATING event, generated before trying
will be generated per frame.
@event{EVT_WEB_VIEW_LOADED(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_LOADED event generated when the document
will be generated per frame.
@event{EVT_WEB_VIEW_LOADED(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_LOADED event generated when the document
- is fully loaded and displayed. Note that if the displayed HTML document has
+ is fully loaded and displayed. Note that if the displayed HTML document has
several frames, one such event will be generated per frame.
@event{EVT_WEB_VIEW_ERROR(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_ERROR event generated when a navigation
several frames, one such event will be generated per frame.
@event{EVT_WEB_VIEW_ERROR(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_ERROR event generated when a navigation
precise error message/code.
@event{EVT_WEB_VIEW_NEWWINDOW(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_NEWWINDOW event, generated when a new
precise error message/code.
@event{EVT_WEB_VIEW_NEWWINDOW(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_NEWWINDOW event, generated when a new
- window is created. You must handle this event if you want anything to
+ window is created. You must handle this event if you want anything to
happen, for example to load the page in a new window or tab.
@event{EVT_WEB_VIEW_TITLE_CHANGED(id, func)}
happen, for example to load the page in a new window or tab.
@event{EVT_WEB_VIEW_TITLE_CHANGED(id, func)}
- Process a @c wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED event, generated when
+ Process a @c wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED event, generated when
the page title changes. Use GetString to get the title.
@endEventTable
the page title changes. Use GetString to get the title.
@endEventTable
@since 2.9.3
@library{wxwebview}
@category{ctrl,webview}
@since 2.9.3
@library{wxwebview}
@category{ctrl,webview}
shown.
*/
virtual wxString GetPageSource() const = 0;
shown.
*/
virtual wxString GetPageSource() const = 0;
/**
Get the text of the current page.
*/
virtual wxString GetPageText() const = 0;
/**
Get the text of the current page.
*/
virtual wxString GetPageText() const = 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).
*/
displayed page.
*/
virtual void Print() = 0;
displayed page.
*/
virtual void Print() = 0;
/**
Registers a custom scheme handler.
@param handler A shared pointer to a wxWebHandler.
/**
Registers a custom scheme handler.
@param handler A shared pointer to a wxWebHandler.
@param flags A bit array that may optionally contain reload options.
*/
virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT) = 0;
@param flags A bit array that may optionally contain reload options.
*/
virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT) = 0;
- Runs the given javascript code.
+ Runs the given javascript code.
*/
virtual void RunScript(const wxString& javascript) = 0;
*/
virtual void RunScript(const wxString& javascript) = 0;
/**
Set the editable property of the web control. Enabling allows the user
to edit the page even if the @c contenteditable attribute is not set.
/**
Set the editable property of the web control. Enabling allows the user
to edit the page even if the @c contenteditable attribute is not set.
/**
Returns @true if the current selection can be copied.
/**
Returns @true if the current selection can be copied.
@note This always returns @c true on the OSX WebKit backend.
*/
virtual bool CanCopy() const = 0;
/**
Returns @true if the current selection can be cut.
@note This always returns @c true on the OSX WebKit backend.
*/
virtual bool CanCopy() const = 0;
/**
Returns @true if the current selection can be cut.
@note This always returns @c true on the OSX WebKit backend.
*/
virtual bool CanCut() const = 0;
/**
Returns @true if data can be pasted.
@note This always returns @c true on the OSX WebKit backend.
*/
virtual bool CanCut() const = 0;
/**
Returns @true if data can be pasted.
@note This always returns @c true on the OSX WebKit backend.
*/
virtual bool CanPaste() const = 0;
/**
@note This always returns @c true on the OSX WebKit backend.
*/
virtual bool CanPaste() const = 0;
/**
- Copies the current selection.
+ Copies the current selection.
*/
virtual void Copy() = 0;
*/
virtual void Copy() = 0;
Returns @true if it is possible to navigate backward in the history of
visited pages.
*/
virtual bool CanGoBack() const = 0;
Returns @true if it is possible to navigate backward in the history of
visited pages.
*/
virtual bool CanGoBack() const = 0;
Returns @true if it is possible to navigate forward in the history of
visited pages.
*/
Returns @true if it is possible to navigate forward in the history of
visited pages.
*/
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory() = 0;
/**
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory() = 0;
/**
- Returns a list of items in the forward history. The first item in the
- vector is the next item in the history with respect to the curently
+ Returns a list of items in the forward history. The first item in the
+ vector is the next item in the history with respect to the curently
loaded page.
*/
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory() = 0;
loaded page.
*/
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory() = 0;
Navigate back in the history of visited pages.
Only valid if CanGoBack() returns true.
*/
Navigate back in the history of visited pages.
Only valid if CanGoBack() returns true.
*/
virtual void GoForward() = 0;
/**
virtual void GoForward() = 0;
/**
*/
virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item) = 0;
*/
virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item) = 0;
- Clears the current selection.
+ Clears the current selection.
*/
virtual void ClearSelection() = 0;
*/
virtual void ClearSelection() = 0;
/**
Deletes the current selection. Note that for @c wxWEB_VIEW_BACKEND_WEBKIT
/**
Deletes the current selection. Note that for @c wxWEB_VIEW_BACKEND_WEBKIT
- the selection must be editable, either through SetEditable or the
+ the selection must be editable, either through SetEditable or the
correct HTML attribute.
*/
virtual void DeleteSelection() = 0;
correct HTML attribute.
*/
virtual void DeleteSelection() = 0;
/**
Returns the currently selected source, if any.
*/
virtual wxString GetSelectedSource() const = 0;
/**
Returns the currently selected source, if any.
*/
virtual wxString GetSelectedSource() const = 0;
/**
Returns the currently selected text, if any.
*/
/**
Returns the currently selected text, if any.
*/
/**
@class wxWebViewEvent
/**
@class wxWebViewEvent
- A navigation event holds information about events associated with
+ A navigation event holds information about events associated with
wxWebView objects.
@beginEventEmissionTable{wxWebViewEvent}
wxWebView objects.
@beginEventEmissionTable{wxWebViewEvent}
will be generated per frame.
@event{EVT_WEB_VIEW_LOADED(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_LOADED event generated when the document
will be generated per frame.
@event{EVT_WEB_VIEW_LOADED(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_LOADED event generated when the document
- is fully loaded and displayed. Note that if the displayed HTML document has
+ is fully loaded and displayed. Note that if the displayed HTML document has
several frames, one such event will be generated per frame.
@event{EVT_WEB_VIEW_ERROR(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_ERROR event generated when a navigation
several frames, one such event will be generated per frame.
@event{EVT_WEB_VIEW_ERROR(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_ERROR event generated when a navigation
precise error message/code.
@event{EVT_WEB_VIEW_NEWWINDOW(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_NEWWINDOW event, generated when a new
precise error message/code.
@event{EVT_WEB_VIEW_NEWWINDOW(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_NEWWINDOW event, generated when a new
- window is created. You must handle this event if you want anything to
+ window is created. You must handle this event if you want anything to
happen, for example to load the page in a new window or tab.
@event{EVT_WEB_VIEW_TITLE_CHANGED(id, func)}
happen, for example to load the page in a new window or tab.
@event{EVT_WEB_VIEW_TITLE_CHANGED(id, func)}
- Process a @c wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED event, generated when
+ Process a @c wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED event, generated when
the page title changes. Use GetString to get the title.
@endEventTable
the page title changes. Use GetString to get the title.
@endEventTable
@since 2.9.3
@library{wxwebview}
@category{events,webview}
@since 2.9.3
@library{wxwebview}
@category{events,webview}
/**
@class wxWebViewArchiveHandler
/**
@class wxWebViewArchiveHandler
-
- A custom handler for the file scheme which also supports loading from
- archives. The syntax for wxWebViewArchiveHandler differs from virtual file
+
+ A custom handler for the file scheme which also supports loading from
+ archives. The syntax for wxWebViewArchiveHandler differs from virtual file
systems in the rest of wxWidgets by using a syntax such as
<code> scheme:///C:/example/docs.zip;protocol=zip/main.htm </code>
systems in the rest of wxWidgets by using a syntax such as
<code> scheme:///C:/example/docs.zip;protocol=zip/main.htm </code>
- Currently the only supported protocol is @c zip.
-
+ Currently the only supported protocol is @c zip.
+
@since 2.9.3
@library{wxwebview}
@category{webview}
@since 2.9.3
@library{wxwebview}
@category{webview}
@see wxWebView, wxWebViewHandler
*/
class wxWebViewArchiveHandler : public wxWebViewHandler
@see wxWebView, wxWebViewHandler
*/
class wxWebViewArchiveHandler : public wxWebViewHandler
-wxgtk_webview_webkit_load_status(GtkWidget* widget,
+wxgtk_webview_webkit_load_status(GtkWidget* widget,
GParamSpec*,
wxWebViewWebKit *webKitCtrl)
{
GParamSpec*,
wxWebViewWebKit *webKitCtrl)
{
if(webKitCtrl->m_guard)
{
webKitCtrl->m_guard = false;
if(webKitCtrl->m_guard)
{
webKitCtrl->m_guard = false;
- //We set this to make sure that we don't try to load the page again from
+ //We set this to make sure that we don't try to load the page again from
//the resource request callback
webKitCtrl->m_vfsurl = webkit_network_request_get_uri(request);
webkit_web_policy_decision_use(policy_decision);
//the resource request callback
webKitCtrl->m_vfsurl = webkit_network_request_get_uri(request);
webkit_web_policy_decision_use(policy_decision);
- //If we found a handler we can then use it to load the file directly
+ //If we found a handler we can then use it to load the file directly
//ourselves
if(handler)
{
//ourselves
if(handler)
{
wxWebViewWebKit *webKitCtrl)
{
wxString uri = webkit_network_request_get_uri(request);
wxWebViewWebKit *webKitCtrl)
{
wxString uri = webkit_network_request_get_uri(request);
wxSharedPtr<wxWebViewHandler> handler;
wxVector<wxSharedPtr<wxWebViewHandler> > hanlders = webKitCtrl->GetHandlers();
wxSharedPtr<wxWebViewHandler> handler;
wxVector<wxSharedPtr<wxWebViewHandler> > hanlders = webKitCtrl->GetHandlers();
//We are not vetoed so see if we match one of the additional handlers
for(wxVector<wxSharedPtr<wxWebViewHandler> >::iterator it = hanlders.begin();
it != hanlders.end(); ++it)
//We are not vetoed so see if we match one of the additional handlers
for(wxVector<wxSharedPtr<wxWebViewHandler> >::iterator it = hanlders.begin();
it != hanlders.end(); ++it)
- //If we found a handler we can then use it to load the file directly
+ //If we found a handler we can then use it to load the file directly
//ourselves
if(handler)
{
//ourselves
if(handler)
{
//Then we can redirect the call
webkit_network_request_set_uri(request, path.utf8_str());
}
//Then we can redirect the call
webkit_network_request_set_uri(request, path.utf8_str());
}
g_signal_connect_after(m_web_view, "navigation-policy-decision-requested",
G_CALLBACK(wxgtk_webview_webkit_navigation),
this);
g_signal_connect_after(m_web_view, "navigation-policy-decision-requested",
G_CALLBACK(wxgtk_webview_webkit_navigation),
this);
- g_signal_connect_after(m_web_view, "load-error",
+ g_signal_connect_after(m_web_view, "load-error",
G_CALLBACK(wxgtk_webview_webkit_error),
this);
G_CALLBACK(wxgtk_webview_webkit_error),
this);
wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
{
wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
{
- wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist;
+ wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist;
WebKitWebBackForwardList* history;
history = webkit_web_view_get_back_forward_list(m_web_view);
WebKitWebBackForwardList* history;
history = webkit_web_view_get_back_forward_list(m_web_view);
- GList* list = webkit_web_back_forward_list_get_back_list_with_limit(history,
+ GList* list = webkit_web_back_forward_list_get_back_list_with_limit(history,
m_historyLimit);
//We need to iterate in reverse to get the order we desire
for(int i = g_list_length(list) - 1; i >= 0 ; i--)
m_historyLimit);
//We need to iterate in reverse to get the order we desire
for(int i = g_list_length(list) - 1; i >= 0 ; i--)
wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory()
{
wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory()
{
- wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist;
+ wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist;
WebKitWebBackForwardList* history;
history = webkit_web_view_get_back_forward_list(m_web_view);
WebKitWebBackForwardList* history;
history = webkit_web_view_get_back_forward_list(m_web_view);
- GList* list = webkit_web_back_forward_list_get_forward_list_with_limit(history,
+ GList* list = webkit_web_back_forward_list_get_forward_list_with_limit(history,
m_historyLimit);
for(guint i = 0; i < g_list_length(list); i++)
{
m_historyLimit);
for(guint i = 0; i < g_list_length(list); i++)
{
WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)item->m_histItem;
if(gtkitem)
{
WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)item->m_histItem;
if(gtkitem)
{
- webkit_web_view_go_to_back_forward_item(m_web_view,
+ webkit_web_view_go_to_back_forward_item(m_web_view,
WEBKIT_WEB_HISTORY_ITEM(gtkitem));
}
}
WEBKIT_WEB_HISTORY_ITEM(gtkitem));
}
}
wxString wxWebViewWebKit::GetSelectedText() const
{
wxString wxWebViewWebKit::GetSelectedText() const
{
- WebKitDOMDocument* doc;
+ WebKitDOMDocument* doc;
WebKitDOMDOMWindow* win;
WebKitDOMDOMSelection* sel;
WebKitDOMRange* range;
WebKitDOMDOMWindow* win;
WebKitDOMDOMSelection* sel;
WebKitDOMRange* range;
doc = webkit_web_view_get_dom_document(m_web_view);
win = webkit_dom_document_get_default_view(WEBKIT_DOM_DOCUMENT(doc));
sel = webkit_dom_dom_window_get_selection(WEBKIT_DOM_DOM_WINDOW(win));
doc = webkit_web_view_get_dom_document(m_web_view);
win = webkit_dom_document_get_default_view(WEBKIT_DOM_DOCUMENT(doc));
sel = webkit_dom_dom_window_get_selection(WEBKIT_DOM_DOM_WINDOW(win));
- range = webkit_dom_dom_selection_get_range_at(WEBKIT_DOM_DOM_SELECTION(sel),
+ range = webkit_dom_dom_selection_get_range_at(WEBKIT_DOM_DOM_SELECTION(sel),
- return wxString(webkit_dom_range_get_text(WEBKIT_DOM_RANGE(range)),
+ return wxString(webkit_dom_range_get_text(WEBKIT_DOM_RANGE(range)),
wxConvUTF8);
}
wxString wxWebViewWebKit::GetSelectedSource() const
{
wxConvUTF8);
}
wxString wxWebViewWebKit::GetSelectedSource() const
{
- WebKitDOMDocument* doc;
+ WebKitDOMDocument* doc;
WebKitDOMDOMWindow* win;
WebKitDOMDOMSelection* sel;
WebKitDOMRange* range;
WebKitDOMDOMWindow* win;
WebKitDOMDOMSelection* sel;
WebKitDOMRange* range;
doc = webkit_web_view_get_dom_document(m_web_view);
win = webkit_dom_document_get_default_view(WEBKIT_DOM_DOCUMENT(doc));
sel = webkit_dom_dom_window_get_selection(WEBKIT_DOM_DOM_WINDOW(win));
doc = webkit_web_view_get_dom_document(m_web_view);
win = webkit_dom_document_get_default_view(WEBKIT_DOM_DOCUMENT(doc));
sel = webkit_dom_dom_window_get_selection(WEBKIT_DOM_DOM_WINDOW(win));
- range = webkit_dom_dom_selection_get_range_at(WEBKIT_DOM_DOM_SELECTION(sel),
+ range = webkit_dom_dom_selection_get_range_at(WEBKIT_DOM_DOM_SELECTION(sel),
0, NULL);
div = webkit_dom_document_create_element(WEBKIT_DOM_DOCUMENT(doc), "div", NULL);
0, NULL);
div = webkit_dom_document_create_element(WEBKIT_DOM_DOCUMENT(doc), "div", NULL);
webkit_dom_node_append_child(&div->parent_instance, &clone->parent_instance, NULL);
html = (WebKitDOMHTMLElement*)div;
webkit_dom_node_append_child(&div->parent_instance, &clone->parent_instance, NULL);
html = (WebKitDOMHTMLElement*)div;
- return wxString(webkit_dom_html_element_get_inner_html(WEBKIT_DOM_HTML_ELEMENT(html)),
+ return wxString(webkit_dom_html_element_get_inner_html(WEBKIT_DOM_HTML_ELEMENT(html)),
wxConvUTF8);
}
void wxWebViewWebKit::ClearSelection()
{
wxConvUTF8);
}
void wxWebViewWebKit::ClearSelection()
{
- WebKitDOMDocument* doc;
+ WebKitDOMDocument* doc;
WebKitDOMDOMWindow* win;
WebKitDOMDOMSelection* sel;
WebKitDOMDOMWindow* win;
WebKitDOMDOMSelection* sel;
wxString wxWebViewWebKit::GetPageText() const
{
wxString wxWebViewWebKit::GetPageText() const
{
- WebKitDOMDocument* doc;
+ WebKitDOMDocument* doc;
WebKitDOMHTMLElement* body;
doc = webkit_web_view_get_dom_document(m_web_view);
body = webkit_dom_document_get_body(WEBKIT_DOM_DOCUMENT(doc));
WebKitDOMHTMLElement* body;
doc = webkit_web_view_get_dom_document(m_web_view);
body = webkit_dom_document_get_body(WEBKIT_DOM_DOCUMENT(doc));
- return wxString(webkit_dom_html_element_get_inner_text(WEBKIT_DOM_HTML_ELEMENT(body)),
+ return wxString(webkit_dom_html_element_get_inner_text(WEBKIT_DOM_HTML_ELEMENT(body)),
wxConvUTF8);
}
void wxWebViewWebKit::RunScript(const wxString& javascript)
{
wxConvUTF8);
}
void wxWebViewWebKit::RunScript(const wxString& javascript)
{
- webkit_web_view_execute_script(m_web_view,
+ webkit_web_view_execute_script(m_web_view,
javascript.mb_str(wxConvUTF8));
}
javascript.mb_str(wxConvUTF8));
}
{
return CanExecCommand("Copy");
}
{
return CanExecCommand("Copy");
}
bool wxWebViewIE::CanPaste() const
{
return CanExecCommand("Paste");
bool wxWebViewIE::CanPaste() const
{
return CanExecCommand("Paste");
{
return CanExecCommand("Undo");
}
{
return CanExecCommand("Undo");
}
bool wxWebViewIE::CanRedo() const
{
return CanExecCommand("Redo");
bool wxWebViewIE::CanRedo() const
{
return CanExecCommand("Redo");
#if wxUSE_DYNLIB_CLASS
wxDynamicLibrary urlMon(wxT("urlmon.dll"));
#if wxUSE_DYNLIB_CLASS
wxDynamicLibrary urlMon(wxT("urlmon.dll"));
- if( urlMon.IsLoaded() &&
- urlMon.HasSymbol("CoInternetSetFeatureEnabled") &&
+ if( urlMon.IsLoaded() &&
+ urlMon.HasSymbol("CoInternetSetFeatureEnabled") &&
urlMon.HasSymbol("CoInternetIsFeatureEnabled"))
{
typedef HRESULT (WINAPI *CoInternetSetFeatureEnabled_t)(DWORD, DWORD, BOOL);
urlMon.HasSymbol("CoInternetIsFeatureEnabled"))
{
typedef HRESULT (WINAPI *CoInternetSetFeatureEnabled_t)(DWORD, DWORD, BOOL);
-wxIEContainer::wxIEContainer(wxWindow *parent, REFIID iid, IUnknown *pUnk,
+wxIEContainer::wxIEContainer(wxWindow *parent, REFIID iid, IUnknown *pUnk,
DocHostUIHandler* uiHandler) :
wxActiveXContainer(parent,iid,pUnk)
{
DocHostUIHandler* uiHandler) :
wxActiveXContainer(parent,iid,pUnk)
{
-bool wxIEContainer::QueryClientSiteInterface(REFIID iid, void **_interface,
+bool wxIEContainer::QueryClientSiteInterface(REFIID iid, void **_interface,
const char *&desc)
{
if (m_uiHandler && IsEqualIID(iid, wxIID_IDocHostUIHandler))
const char *&desc)
{
if (m_uiHandler && IsEqualIID(iid, wxIID_IDocHostUIHandler))
-HRESULT DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt,
- IUnknown *pcmdtReserved,
+HRESULT DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt,
+ IUnknown *pcmdtReserved,
IDispatch *pdispReserved)
{
wxUnusedVar(dwID);
IDispatch *pdispReserved)
{
wxUnusedVar(dwID);
HRESULT DocHostUIHandler::GetHostInfo(DOCHOSTUIINFO *pInfo)
{
HRESULT DocHostUIHandler::GetHostInfo(DOCHOSTUIINFO *pInfo)
{
- //don't show 3d border and ebales themes.
+ //don't show 3d border and enable themes.
pInfo->dwFlags = pInfo->dwFlags | DOCHOSTUIFLAG_NO3DBORDER | DOCHOSTUIFLAG_THEME;
return S_OK;
}
HRESULT DocHostUIHandler::ShowUI(DWORD dwID,
pInfo->dwFlags = pInfo->dwFlags | DOCHOSTUIFLAG_NO3DBORDER | DOCHOSTUIFLAG_THEME;
return S_OK;
}
HRESULT DocHostUIHandler::ShowUI(DWORD dwID,
- IOleInPlaceActiveObject *pActiveObject,
+ IOleInPlaceActiveObject *pActiveObject,
IOleCommandTarget *pCommandTarget,
IOleInPlaceFrame *pFrame,
IOleInPlaceUIWindow *pDoc)
IOleCommandTarget *pCommandTarget,
IOleInPlaceFrame *pFrame,
IOleInPlaceUIWindow *pDoc)
-HRESULT DocHostUIHandler::ResizeBorder(LPCRECT prcBorder,
+HRESULT DocHostUIHandler::ResizeBorder(LPCRECT prcBorder,
IOleInPlaceUIWindow *pUIWindow,
BOOL fFrameWindow)
{
IOleInPlaceUIWindow *pUIWindow,
BOOL fFrameWindow)
{
-HRESULT DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg,
+HRESULT DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg,
const GUID *pguidCmdGroup,
DWORD nCmdID)
{
const GUID *pguidCmdGroup,
DWORD nCmdID)
{
{
[op setShowsPrintPanel: showPrompt];
// in my tests, the progress bar always freezes and it stops the whole
{
[op setShowsPrintPanel: showPrompt];
// in my tests, the progress bar always freezes and it stops the whole
- // print operation. do not turn this to true unless there is a
+ // print operation. do not turn this to true unless there is a
// workaround for the bug.
[op setShowsProgressPanel: false];
}
// workaround for the bug.
[op setShowsProgressPanel: false];
}
*out = wxWEB_NAV_ERR_USER_CANCELLED;
break;
*out = wxWEB_NAV_ERR_USER_CANCELLED;
break;
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
case NSURLErrorCannotDecodeRawData:
case NSURLErrorCannotDecodeContentData:
case NSURLErrorCannotParseResponse:
case NSURLErrorCannotDecodeRawData:
case NSURLErrorCannotDecodeContentData:
case NSURLErrorCannotParseResponse:
webKitWindow->GetId(),
webKitWindow->GetCurrentURL(),
target);
webKitWindow->GetId(),
webKitWindow->GetCurrentURL(),
target);
event.SetString(wxStringWithNSString(title));
if (webKitWindow && webKitWindow->GetEventHandler())
event.SetString(wxStringWithNSString(title));
if (webKitWindow && webKitWindow->GetEventHandler())
-- (void)webView:(WebView *)sender
+- (void)webView:(WebView *)sender
decidePolicyForNewWindowAction:(NSDictionary *)actionInformation
request:(NSURLRequest *)request
newFrameName:(NSString *)frameName
decidePolicyForNewWindowAction:(NSDictionary *)actionInformation
request:(NSURLRequest *)request
newFrameName:(NSString *)frameName
NSURLResponse *response = [[NSURLResponse alloc] initWithURL:[request URL]
MIMEType:wxNSStringWithWxString(file->GetMimeType())
NSURLResponse *response = [[NSURLResponse alloc] initWithURL:[request URL]
MIMEType:wxNSStringWithWxString(file->GetMimeType())
- expectedContentLength:length
+ expectedContentLength:length
//Load the data, we malloc it so it is tidied up properly
void* buffer = malloc(length);
file->GetStream()->Read(buffer, length);
NSData *data = [[NSData alloc] initWithBytesNoCopy:buffer length:length];
//Load the data, we malloc it so it is tidied up properly
void* buffer = malloc(length);
file->GetStream()->Read(buffer, length);
NSData *data = [[NSData alloc] initWithBytesNoCopy:buffer length:length];
id<NSURLProtocolClient> client = [self client];
//We do not support caching anything yet
id<NSURLProtocolClient> client = [self client];
//We do not support caching anything yet
- [client URLProtocol:self didReceiveResponse:response
+ [client URLProtocol:self didReceiveResponse:response
cacheStoragePolicy:NSURLCacheStorageNotAllowed];
//Set the data
cacheStoragePolicy:NSURLCacheStorageNotAllowed];
//Set the data
projects / wxWidgets.git / commitdiff
