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

Fix indentation, remove trailing whitespace

Browse Source 
no real changes
This commit is contained in:
Paul Cornett
2017-06-15 10:39:06 -07:00
parent 820149121b
commit 1d3ed51eab
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/webview_webkit.cpp
View File

@@ -86,7 +86,7 @@ wxgtk_webview_webkit_navigation(WebKitWebView *,
{ {
const gchar* uri = webkit_network_request_get_uri(request); const gchar* uri = webkit_network_request_get_uri(request);
wxString target = webkit_web_frame_get_name (frame); wxString target = webkit_web_frame_get_name (frame);
//If m_creating is true then we are the result of a new window //If m_creating is true then we are the result of a new window
//and so we need to send the event and veto the load //and so we need to send the event and veto the load
if(webKitCtrl->m_creating) if(webKitCtrl->m_creating)
@@ -467,12 +467,12 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
g_signal_connect_after(m_web_view, "resource-request-starting", g_signal_connect_after(m_web_view, "resource-request-starting",
G_CALLBACK(wxgtk_webview_webkit_resource_req), this); G_CALLBACK(wxgtk_webview_webkit_resource_req), this);
#if WEBKIT_CHECK_VERSION(1, 10, 0) #if WEBKIT_CHECK_VERSION(1, 10, 0)
g_signal_connect_after(m_web_view, "context-menu", g_signal_connect_after(m_web_view, "context-menu",
G_CALLBACK(wxgtk_webview_webkit_context_menu), this); G_CALLBACK(wxgtk_webview_webkit_context_menu), this);
#endif #endif
g_signal_connect_after(m_web_view, "create-web-view", g_signal_connect_after(m_web_view, "create-web-view",
G_CALLBACK(wxgtk_webview_webkit_create_webview), this); G_CALLBACK(wxgtk_webview_webkit_create_webview), this);

10
src/gtk/webview_webkit2.cpp
View File

@@ -67,7 +67,7 @@ wxgtk_webview_webkit_navigation(WebKitWebView *web_view,
WebKitURIRequest* request = webkit_navigation_action_get_request(action); WebKitURIRequest* request = webkit_navigation_action_get_request(action);
const gchar* uri = webkit_uri_request_get_uri(request); const gchar* uri = webkit_uri_request_get_uri(request);
wxString target = webkit_navigation_policy_decision_get_frame_name(navigation_decision); wxString target = webkit_navigation_policy_decision_get_frame_name(navigation_decision);
//If m_creating is true then we are the result of a new window //If m_creating is true then we are the result of a new window
//and so we need to send the event and veto the load //and so we need to send the event and veto the load
if(webKitCtrl->m_creating) if(webKitCtrl->m_creating)
@@ -983,7 +983,7 @@ bool wxWebViewWebKit::HasSelection() const
G_DBUS_CALL_FLAGS_NONE, -1, G_DBUS_CALL_FLAGS_NONE, -1,
NULL, NULL); NULL, NULL);
if (retval) if (retval)
{ {
gboolean has_selection = FALSE; gboolean has_selection = FALSE;
g_variant_get(retval, "(b)", &has_selection); g_variant_get(retval, "(b)", &has_selection);
g_variant_unref(retval); g_variant_unref(retval);
@@ -1010,7 +1010,7 @@ wxString wxWebViewWebKit::GetSelectedText() const
G_DBUS_CALL_FLAGS_NONE, -1, G_DBUS_CALL_FLAGS_NONE, -1,
NULL, NULL); NULL, NULL);
if (retval) if (retval)
{ {
char *text; char *text;
g_variant_get(retval, "(s)", &text); g_variant_get(retval, "(s)", &text);
g_variant_unref(retval); g_variant_unref(retval);
@@ -1031,7 +1031,7 @@ wxString wxWebViewWebKit::GetSelectedSource() const
G_DBUS_CALL_FLAGS_NONE, -1, G_DBUS_CALL_FLAGS_NONE, -1,
NULL, NULL); NULL, NULL);
if (retval) if (retval)
{ {
char *source; char *source;
g_variant_get(retval, "(s)", &source); g_variant_get(retval, "(s)", &source);
g_variant_unref(retval); g_variant_unref(retval);
@@ -1069,7 +1069,7 @@ wxString wxWebViewWebKit::GetPageText() const
G_DBUS_CALL_FLAGS_NONE, -1, G_DBUS_CALL_FLAGS_NONE, -1,
NULL, NULL); NULL, NULL);
if (retval) if (retval)
{ {
char *text; char *text;
g_variant_get(retval, "(s)", &text); g_variant_get(retval, "(s)", &text);
g_variant_unref(retval); g_variant_unref(retval);