diff --git a/.gitignore b/.gitignore index 121811d..a3fb496 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,6 @@ Html/ dunitx-results.xml __history __recovery +*.stat +*.pas +*.ithelper diff --git a/AddIn/DelphiPraxis.MVVMExpert.CodeGen.pas b/AddIn/DelphiPraxis.MVVMExpert.CodeGen.pas index 786f7c8..d98163c 100644 --- a/AddIn/DelphiPraxis.MVVMExpert.CodeGen.pas +++ b/AddIn/DelphiPraxis.MVVMExpert.CodeGen.pas @@ -10,7 +10,7 @@ TCodeGen = class private FDict: TDictionary; public - constructor CreateCreate( aModel: TModel); + constructor Create( aModel: TModel); procedure RecreateDict( aViewModel: TMView); end; @@ -24,9 +24,11 @@ constructor TCodeGen.Create( aModel: TModel); procedure TCodeGen.RecreateDict( aViewModel: TMView); var + Model: TModel; cfg: TConfig; begin //ProjectValues + Model := TModel.Instance; cfg := Model.Config; FDict.AddOrSetValue( '%%basepath%%', cfg.Path); FDict.AddOrSetValue( '%%basepath%%', cfg.Path); diff --git a/Demo/Shared/Model/Model.Node.pas b/Demo/Shared/Model/Model.Node.pas index 368c8c8..55d6979 100644 --- a/Demo/Shared/Model/Model.Node.pas +++ b/Demo/Shared/Model/Model.Node.pas @@ -123,6 +123,7 @@ constructor TNodes.Create; destructor TNodes.Destroy; begin - + inherited; end; + end. diff --git a/Grijjy.Mvvm.Rtti.pas b/Grijjy.Mvvm.Rtti.pas index 247538b..456df72 100644 --- a/Grijjy.Mvvm.Rtti.pas +++ b/Grijjy.Mvvm.Rtti.pas @@ -392,7 +392,7 @@ procedure TgoValue.SetFAsOrdinal(const Value: NativeInt); TgoValueType.Unsupported, // tkClassRef TgoValueType.Ordinal, // tkPointer TgoValueType.Unsupported // tkProcedure - {,TgoValueType.Unsupported}); //??? + {$IFDEF VER330},TgoValueType.Unsupported{$ENDIF}); //??? { Property Getters }