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

Minor changes, just trim trailing spaces in webview code.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2012-03-28 18:00:30 +00:00
parent 324ab5e2db
commit 34326da778
13 changed files with 145 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/webview_webkit.h
View File

@@ -110,7 +110,7 @@ public:
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; }

2
include/wx/gtk/webviewhistoryitem_webkit.h
View File

@@ -17,7 +17,7 @@
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; }

12
include/wx/msw/webview_ie.h
View File

@@ -200,7 +200,7 @@ public:
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,
@@ -209,7 +209,7 @@ public:
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;
@@ -220,11 +220,11 @@ public:
IOleInPlaceUIWindow *pUIWindow,
BOOL fRameWindow) = 0;
virtual HRESULT wxSTDCALL TranslateAccelerator(LPMSG lpMsg,
virtual HRESULT wxSTDCALL TranslateAccelerator(LPMSG lpMsg,
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,
@@ -468,7 +468,7 @@ public:
virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt,
IUnknown *pcmdtReserved,
IDispatch *pdispReserved);
virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo);
virtual HRESULT wxSTDCALL ShowUI(DWORD dwID,
@@ -495,7 +495,7 @@ public:
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,

2
include/wx/msw/webviewhistoryitem_ie.h
View File

@@ -17,7 +17,7 @@
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; }

14
include/wx/osx/webview_webkit.h
View File

@@ -74,14 +74,14 @@ public:
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);
//Undo / redo functionality
virtual bool CanUndo() const;
virtual bool CanRedo() const;
@@ -95,11 +95,11 @@ public:
virtual void Cut();
virtual void Copy();
virtual void Paste();
//Editing functions
virtual void SetEditable(bool enable = true);
virtual bool IsEditable() const;
//Selection
virtual void DeleteSelection();
virtual bool HasSelection() const;
@@ -107,9 +107,9 @@ public:
virtual wxString GetSelectedText() const;
virtual wxString GetSelectedSource() const;
virtual void ClearSelection();
void RunScript(const wxString& javascript);
//Virtual Filesystem Support
virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
@@ -158,6 +158,6 @@ private:
//TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
};
#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
#endif // _WX_WEBKIT_H_

2
include/wx/osx/webviewhistoryitem_webkit.h
View File

@@ -30,6 +30,6 @@ private:
struct objc_object *m_histItem;
};
#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
#endif // _WX_OSX_WEBVIEWHISTORYITEM_H_

2
include/wx/webview.h
View File

@@ -65,7 +65,7 @@ enum wxWebViewReloadFlags
{
//Default, may access cache
wxWEB_VIEW_RELOAD_DEFAULT,
wxWEB_VIEW_RELOAD_NO_CACHE
wxWEB_VIEW_RELOAD_NO_CACHE
};
enum wxWebViewBackend

2
include/wx/webviewarchivehandler.h
View File

@@ -20,7 +20,7 @@ class wxFileSystem;
#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
{

155
interface/wx/webview.h
View File

@@ -23,18 +23,18 @@ enum wxWebViewZoom
*/
enum wxWebViewZoomType
{
/**
The entire layout scales when zooming, including images
/**
The entire layout scales when zooming, including images
*/
wxWEB_VIEW_ZOOM_TYPE_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
};
/**
/**
Types of errors that can cause navigation to fail
*/
enum wxWebViewNavigationError
@@ -58,18 +58,17 @@ enum wxWebViewNavigationError
wxWEB_NAV_ERR_OTHER
};
/**
Type of refresh
/**
Type of refresh
*/
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
*/
@@ -88,14 +87,14 @@ enum wxWebViewBackend
/**
@class wxWebViewHistoryItem
A simple class that contains the URL and title of an element of the history
of a wxWebView.
of a wxWebView.
@since 2.9.3
@library{wxwebview}
@category{webview}
@see wxWebView
*/
class wxWebViewHistoryItem
@@ -105,12 +104,12 @@ public:
Construtor.
*/
wxWebViewHistoryItem(const wxString& url, const wxString& title);
/**
@return The url of the page.
*/
wxString GetUrl();
/**
@return The title of the page.
*/
@@ -119,14 +118,14 @@ public:
/**
@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.
@since 2.9.3
@library{wxwebview}
@category{webview}
@see wxWebView
*/
class wxWebViewHandler
@@ -140,7 +139,7 @@ public:
/**
@return A pointer to the file represented by @c uri.
*/
*/
virtual wxFSFile* GetFile(const wxString &uri) = 0;
/**
@@ -151,68 +150,68 @@ public:
/**
@class wxWebView
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
javascript and css.
javascript and css.
@section descriptions Backend Descriptions
@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
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
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.
@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
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.
@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
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
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.
@section vfs Virtual File Systems and Custom Schemes
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.
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
@beginEventEmissionTable{wxWebViewEvent}
@event{EVT_WEB_VIEW_NAVIGATING(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_NAVIGATING event, generated before trying
@@ -226,7 +225,7 @@ public:
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
@@ -236,13 +235,13 @@ public:
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)}
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
@since 2.9.3
@library{wxwebview}
@category{ctrl,webview}
@@ -311,12 +310,12 @@ public:
shown.
*/
virtual wxString GetPageSource() 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).
*/
@@ -341,7 +340,7 @@ public:
displayed page.
*/
virtual void Print() = 0;
/**
Registers a custom scheme handler.
@param handler A shared pointer to a wxWebHandler.
@@ -353,12 +352,12 @@ public:
@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;
/**
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.
@@ -395,27 +394,27 @@ public:
/**
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 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;
/**
Copies the current selection.
Copies the current selection.
*/
virtual void Copy() = 0;
@@ -433,13 +432,13 @@ public:
@name History
*/
/**
/**
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.
*/
@@ -462,13 +461,13 @@ public:
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;
/**
/**
Navigate back in the history of visited pages.
Only valid if CanGoBack() returns true.
*/
@@ -481,31 +480,31 @@ public:
virtual void GoForward() = 0;
/**
Loads a history item.
Loads a history item.
*/
virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item) = 0;
/**
@name Selection
*/
/**
Clears the current selection.
Clears the current selection.
*/
virtual void ClearSelection() = 0;
/**
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;
/**
Returns the currently selected source, if any.
*/
virtual wxString GetSelectedSource() const = 0;
/**
Returns the currently selected text, if any.
*/
@@ -591,7 +590,7 @@ public:
/**
@class wxWebViewEvent
A navigation event holds information about events associated with
A navigation event holds information about events associated with
wxWebView objects.
@beginEventEmissionTable{wxWebViewEvent}
@@ -607,7 +606,7 @@ public:
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
@@ -617,13 +616,13 @@ public:
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)}
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
@since 2.9.3
@library{wxwebview}
@category{events,webview}

12
interface/wx/webviewarchivehandler.h
View File

@@ -8,17 +8,17 @@
/**
@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>
Currently the only supported protocol is @c zip.
Currently the only supported protocol is @c zip.
@since 2.9.3
@library{wxwebview}
@category{webview}
@see wxWebView, wxWebViewHandler
*/
class wxWebViewArchiveHandler : public wxWebViewHandler

46
src/gtk/webview_webkit.cpp
View File

@@ -28,7 +28,7 @@ extern "C"
{
static void
wxgtk_webview_webkit_load_status(GtkWidget* widget,
wxgtk_webview_webkit_load_status(GtkWidget* widget,
GParamSpec*,
wxWebViewWebKit *webKitCtrl)
{
@@ -88,7 +88,7 @@ wxgtk_webview_webkit_navigation(WebKitWebView *,
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);
@@ -128,7 +128,7 @@ wxgtk_webview_webkit_navigation(WebKitWebView *,
handler = (*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)
{
@@ -337,10 +337,10 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *,
wxWebViewWebKit *webKitCtrl)
{
wxString uri = webkit_network_request_get_uri(request);
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)
@@ -350,7 +350,7 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *,
handler = (*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)
{
@@ -373,7 +373,7 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *,
//Then we can redirect the call
webkit_network_request_set_uri(request, path.utf8_str());
}
}
}
@@ -414,7 +414,7 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
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);
@@ -555,10 +555,10 @@ void wxWebViewWebKit::EnableHistory(bool enable)
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);
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--)
@@ -576,10 +576,10 @@ wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory
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);
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++)
{
@@ -599,7 +599,7 @@ void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)
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));
}
}
@@ -839,7 +839,7 @@ void wxWebViewWebKit::SelectAll()
wxString wxWebViewWebKit::GetSelectedText() const
{
WebKitDOMDocument* doc;
WebKitDOMDocument* doc;
WebKitDOMDOMWindow* win;
WebKitDOMDOMSelection* sel;
WebKitDOMRange* range;
@@ -847,15 +847,15 @@ wxString wxWebViewWebKit::GetSelectedText() const
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);
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
{
WebKitDOMDocument* doc;
WebKitDOMDocument* doc;
WebKitDOMDOMWindow* win;
WebKitDOMDOMSelection* sel;
WebKitDOMRange* range;
@@ -866,7 +866,7 @@ wxString wxWebViewWebKit::GetSelectedSource() const
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);
@@ -874,13 +874,13 @@ wxString wxWebViewWebKit::GetSelectedSource() const
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()
{
WebKitDOMDocument* doc;
WebKitDOMDocument* doc;
WebKitDOMDOMWindow* win;
WebKitDOMDOMSelection* sel;
@@ -893,18 +893,18 @@ void wxWebViewWebKit::ClearSelection()
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));
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)
{
webkit_web_view_execute_script(m_web_view,
webkit_web_view_execute_script(m_web_view,
javascript.mb_str(wxConvUTF8));
}

22
src/msw/webview_ie.cpp
View File

@@ -560,6 +560,7 @@ bool wxWebViewIE::CanCopy() const
{
return CanExecCommand("Copy");
}
bool wxWebViewIE::CanPaste() const
{
return CanExecCommand("Paste");
@@ -584,6 +585,7 @@ bool wxWebViewIE::CanUndo() const
{
return CanExecCommand("Undo");
}
bool wxWebViewIE::CanRedo() const
{
return CanExecCommand("Redo");
@@ -892,8 +894,8 @@ bool wxWebViewIE::EnableControlFeature(long flag, bool enable)
#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);
@@ -1296,7 +1298,7 @@ STDMETHODIMP ClassFactory::LockServer(BOOL fLock)
return S_OK;
}
wxIEContainer::wxIEContainer(wxWindow *parent, REFIID iid, IUnknown *pUnk,
wxIEContainer::wxIEContainer(wxWindow *parent, REFIID iid, IUnknown *pUnk,
DocHostUIHandler* uiHandler) :
wxActiveXContainer(parent,iid,pUnk)
{
@@ -1307,7 +1309,7 @@ wxIEContainer::~wxIEContainer()
{
}
bool wxIEContainer::QueryClientSiteInterface(REFIID iid, void **_interface,
bool wxIEContainer::QueryClientSiteInterface(REFIID iid, void **_interface,
const char *&desc)
{
if (m_uiHandler && IsEqualIID(iid, wxIID_IDocHostUIHandler))
@@ -1319,8 +1321,8 @@ bool wxIEContainer::QueryClientSiteInterface(REFIID iid, void **_interface,
return false;
}
HRESULT DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt,
IUnknown *pcmdtReserved,
HRESULT DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt,
IUnknown *pcmdtReserved,
IDispatch *pdispReserved)
{
wxUnusedVar(dwID);
@@ -1332,13 +1334,13 @@ HRESULT DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt,
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,
IOleInPlaceActiveObject *pActiveObject,
IOleInPlaceActiveObject *pActiveObject,
IOleCommandTarget *pCommandTarget,
IOleInPlaceFrame *pFrame,
IOleInPlaceUIWindow *pDoc)
@@ -1379,7 +1381,7 @@ HRESULT DocHostUIHandler::OnFrameWindowActivate(BOOL fActivate)
return E_NOTIMPL;
}
HRESULT DocHostUIHandler::ResizeBorder(LPCRECT prcBorder,
HRESULT DocHostUIHandler::ResizeBorder(LPCRECT prcBorder,
IOleInPlaceUIWindow *pUIWindow,
BOOL fFrameWindow)
{
@@ -1389,7 +1391,7 @@ HRESULT DocHostUIHandler::ResizeBorder(LPCRECT prcBorder,
return E_NOTIMPL;
}
HRESULT DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg,
HRESULT DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg,
const GUID *pguidCmdGroup,
DWORD nCmdID)
{

16
src/osx/webview_webkit.mm
View File

@@ -557,7 +557,7 @@ void wxWebViewWebKit::Print()
{
[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];
}
@@ -1086,7 +1086,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
*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:
@@ -1182,7 +1182,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
webKitWindow->GetId(),
webKitWindow->GetCurrentURL(),
target);
event.SetString(wxStringWithNSString(title));
if (webKitWindow && webKitWindow->GetEventHandler())
@@ -1228,7 +1228,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
}
}
- (void)webView:(WebView *)sender
- (void)webView:(WebView *)sender
decidePolicyForNewWindowAction:(NSDictionary *)actionInformation
request:(NSURLRequest *)request
newFrameName:(NSString *)frameName
@@ -1285,18 +1285,18 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
NSURLResponse *response = [[NSURLResponse alloc] initWithURL:[request URL]
MIMEType:wxNSStringWithWxString(file->GetMimeType())
expectedContentLength:length
expectedContentLength:length
textEncodingName:nil];
//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
[client URLProtocol:self didReceiveResponse:response
[client URLProtocol:self didReceiveResponse:response
cacheStoragePolicy:NSURLCacheStorageNotAllowed];
//Set the data