diff --git a/Import/VlppWorkflow.cpp b/Import/VlppWorkflow.cpp index e5e34d67..7edb43b3 100644 --- a/Import/VlppWorkflow.cpp +++ b/Import/VlppWorkflow.cpp @@ -20562,8 +20562,8 @@ WfMethodBase } - WfMethodBase::WfMethodBase() - :MethodInfoImpl(nullptr, nullptr, true) + WfMethodBase::WfMethodBase(bool isStatic) + :MethodInfoImpl(nullptr, nullptr, isStatic) { } @@ -20598,6 +20598,11 @@ WfStaticMethod return Value::From(lambda); } + WfStaticMethod::WfStaticMethod() + :WfMethodBase(true) + { + } + /*********************************************************************** WfInterfaceMethod ***********************************************************************/ @@ -20612,6 +20617,11 @@ WfInterfaceMethod throw 0; } + WfInterfaceMethod::WfInterfaceMethod() + :WfMethodBase(false) + { + } + /*********************************************************************** WfEvent ***********************************************************************/ diff --git a/Import/VlppWorkflow.h b/Import/VlppWorkflow.h index b73ebf27..c5393d75 100644 --- a/Import/VlppWorkflow.h +++ b/Import/VlppWorkflow.h @@ -2065,7 +2065,7 @@ Method void SetGlobalContext(runtime::WfRuntimeGlobalContext* _globalContext); public: - WfMethodBase(); + WfMethodBase(bool isStatic); ~WfMethodBase(); runtime::WfRuntimeGlobalContext* GetGlobalContext(); @@ -2081,6 +2081,8 @@ Method Value CreateFunctionProxyInternal(const Value& thisObject)override; public: vint functionIndex = -1; + + WfStaticMethod(); }; class WfInterfaceMethod : public WfMethodBase @@ -2091,6 +2093,7 @@ Method Value InvokeInternal(const Value& thisObject, collections::Array& arguments)override; Value CreateFunctionProxyInternal(const Value& thisObject)override; public: + WfInterfaceMethod(); }; /*********************************************************************** diff --git a/Tools/GacGen.exe b/Tools/GacGen.exe index 7b220984..e9bb2b97 100644 Binary files a/Tools/GacGen.exe and b/Tools/GacGen.exe differ diff --git a/Tutorial/GacUI_Layout/UIRes/RichTextEmbedding.bin b/Tutorial/GacUI_Layout/UIRes/RichTextEmbedding.bin index 0bb93fbe..bc8f7397 100644 Binary files a/Tutorial/GacUI_Layout/UIRes/RichTextEmbedding.bin and b/Tutorial/GacUI_Layout/UIRes/RichTextEmbedding.bin differ