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

Pass wxAutomationObject by reference to CallEval()

Browse Source 
Using pointer here makes no sense: this parameter can never be null and
we don't even have the excuse of making it simpler to call like this as
the caller has an object and not a pointer to it, so this even results
in extra typing.
This commit is contained in:
Vadim Zeitlin
2017-10-22 00:19:06 +02:00
parent 408ee0523c
commit 8f42fec21a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/webview_ie.cpp
View File

@@ -880,10 +880,10 @@ bool wxWebViewIE::MSWSetModernEmulationLevel(bool modernLevel)
} }
static static
bool CallEval(wxVariant varJavascript, wxAutomationObject* scriptAO, bool CallEval(wxVariant varJavascript, wxAutomationObject& scriptAO,
wxVariant* varResult) wxVariant* varResult)
{ {
if ( !scriptAO->Invoke("eval", DISPATCH_METHOD, *varResult, 1, &varJavascript) ) if ( !scriptAO.Invoke("eval", DISPATCH_METHOD, *varResult, 1, &varJavascript) )
{ {
wxLogWarning(_("Can't run JavaScript")); wxLogWarning(_("Can't run JavaScript"));
return false; return false;
@@ -915,20 +915,20 @@ bool wxWebViewIE::RunScript(const wxString& javascript, wxString* output)
wxVariant varJavascript(wrapJS.GetWrappedCode()); wxVariant varJavascript(wrapJS.GetWrappedCode());
wxVariant varResult; wxVariant varResult;
if ( !CallEval(varJavascript, &scriptAO, &varResult) ) if ( !CallEval(varJavascript, scriptAO, &varResult) )
return false; return false;
if ( varResult.IsType("bool") && varResult.GetBool() ) if ( varResult.IsType("bool") && varResult.GetBool() )
{ {
varJavascript = wrapJS.GetOutputCode(); varJavascript = wrapJS.GetOutputCode();
if ( !CallEval(varJavascript, &scriptAO, &varResult) ) if ( !CallEval(varJavascript, scriptAO, &varResult) )
return false; return false;
if ( output != NULL ) if ( output != NULL )
*output = varResult.MakeString(); *output = varResult.MakeString();
varJavascript = wrapJS.GetCleanUpCode(); varJavascript = wrapJS.GetCleanUpCode();
if ( !CallEval(varJavascript, &scriptAO, &varResult) ) if ( !CallEval(varJavascript, scriptAO, &varResult) )
return false; return false;
return true; return true;
} }