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

No real changes, just reformat the code a little

Browse Source 
Put long function calls on multiple lines.
This commit is contained in:
Vadim Zeitlin
2017-10-21 23:25:11 +02:00
parent 9d9f692024
commit ec54ddb66b
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gtk/webview_webkit2.cpp
View File

@@ -1126,8 +1126,15 @@ bool wxWebViewWebKit::RunScriptSync(const wxString& javascript, wxString* output
g_main_context_iteration(main_context, TRUE); g_main_context_iteration(main_context, TRUE);
wxGtkError error; wxGtkError error;
wxWebKitJavascriptResult js_result(webkit_web_view_run_javascript_finish(m_web_view, wxWebKitJavascriptResult js_result
result, error.Out())); (
webkit_web_view_run_javascript_finish
(
m_web_view,
result,
error.Out()
)
);
// Match g_object_ref() in wxgtk_run_javascript_cb() // Match g_object_ref() in wxgtk_run_javascript_cb()
g_object_unref(result); g_object_unref(result);
@@ -1142,9 +1149,12 @@ bool wxWebViewWebKit::RunScriptSync(const wxString& javascript, wxString* output
JSValueRef value = webkit_javascript_result_get_value(js_result); JSValueRef value = webkit_javascript_result_get_value(js_result);
JSValueRef exception = NULL; JSValueRef exception = NULL;
wxJSStringRef js_value(JSValueIsObject(context, value) ? wxJSStringRef js_value
JSValueCreateJSONString(context, value, 0, &exception) : (
JSValueToStringCopy (context, value, &exception)); JSValueIsObject(context, value)
? JSValueCreateJSONString(context, value, 0, &exception)
: JSValueToStringCopy(context, value, &exception)
);
if ( exception ) if ( exception )
{ {