diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h index e1235fa40d..edd2926f8f 100644 --- a/include/wx/msw/webview_ie.h +++ b/include/wx/msw/webview_ie.h @@ -200,9 +200,6 @@ private: //Toggles control features see INTERNETFEATURELIST for values. bool EnableControlFeature(long flag, bool enable = true); - bool RunScriptInternal(wxVariant varJavascript, - wxAutomationObject* scriptAO, wxVariant* varResult); - wxDECLARE_DYNAMIC_CLASS(wxWebViewIE); }; diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp index cc447313bf..12a98d011e 100644 --- a/src/msw/webview_ie.cpp +++ b/src/msw/webview_ie.cpp @@ -879,7 +879,8 @@ bool wxWebViewIE::MSWSetModernEmulationLevel(bool modernLevel) return false; } -bool wxWebViewIE::RunScriptInternal(wxVariant varJavascript, wxAutomationObject* scriptAO, +static +bool CallEval(wxVariant varJavascript, wxAutomationObject* scriptAO, wxVariant* varResult) { if ( !scriptAO->Invoke("eval", DISPATCH_METHOD, *varResult, 1, &varJavascript) ) @@ -914,20 +915,20 @@ bool wxWebViewIE::RunScript(const wxString& javascript, wxString* output) wxVariant varJavascript(wrapJS.GetWrappedCode()); wxVariant varResult; - if ( !RunScriptInternal(varJavascript, &scriptAO, &varResult) ) + if ( !CallEval(varJavascript, &scriptAO, &varResult) ) return false; if ( varResult.IsType("bool") && varResult.GetBool() ) { varJavascript = wrapJS.GetOutputCode(); - if ( !RunScriptInternal(varJavascript, &scriptAO, &varResult) ) + if ( !CallEval(varJavascript, &scriptAO, &varResult) ) return false; if ( output != NULL ) *output = varResult.MakeString(); varJavascript = wrapJS.GetCleanUpCode(); - if ( !RunScriptInternal(varJavascript, &scriptAO, &varResult) ) + if ( !CallEval(varJavascript, &scriptAO, &varResult) ) return false; return true; }