diff --git a/.gitignore b/.gitignore index 4c1d5bec..a2f9b546 100644 --- a/.gitignore +++ b/.gitignore @@ -76,6 +76,8 @@ ipch/ *.opensdf *.sdf *.cachefile +*.VC.db +*.VC.VC.opendb # Visual Studio profiler *.psess diff --git a/Import/GacUI.h b/Import/GacUI.h index 521d4c77..15ffe3cb 100644 --- a/Import/GacUI.h +++ b/Import/GacUI.h @@ -19558,7 +19558,7 @@ GuiGrammarColorizer ***********************************************************************/ /// Grammar based colorizer. - class GuiGrammarColorizer : public GuiTextBoxRegexColorizer, private RepeatingParsingExecutor::CallbackBase + class GuiGrammarColorizer : public GuiTextBoxRegexColorizer, protected RepeatingParsingExecutor::CallbackBase { typedef collections::Pair FieldDesc; typedef collections::Dictionary FieldContextColors; @@ -19667,7 +19667,7 @@ GuiGrammarAutoComplete /// Grammar based auto complete controller. class GuiGrammarAutoComplete : public GuiTextBoxAutoCompleteBase - , private RepeatingParsingExecutor::CallbackBase + , protected RepeatingParsingExecutor::CallbackBase , private RepeatingTaskExecutor { public: diff --git a/Import/GacUIWindows.cpp b/Import/GacUIWindows.cpp index f8b5d237..23eabef7 100644 --- a/Import/GacUIWindows.cpp +++ b/Import/GacUIWindows.cpp @@ -2446,10 +2446,10 @@ WinTransform WinTransform WinTransform::Rotate(float Angle) { XFORM Transform; - Transform.eM11=cos(Angle); - Transform.eM12=sin(Angle); - Transform.eM21=-sin(Angle); - Transform.eM22=cos(Angle); + Transform.eM11=(FLOAT)cos(Angle); + Transform.eM12= (FLOAT)sin(Angle); + Transform.eM21= (FLOAT)-sin(Angle); + Transform.eM22= (FLOAT)cos(Angle); Transform.eDx=0.0f; Transform.eDy=0.0f; return Transform; @@ -2493,7 +2493,7 @@ WinTransform WinTransform WinTransform::Reflect(float VectorX, float VectorY) { - float Len=sqrt(VectorX*VectorX+VectorY*VectorY); + float Len= (FLOAT)sqrt(VectorX*VectorX+VectorY*VectorY); float Cos=VectorX/Len; float Sin=VectorY/Len; @@ -2502,7 +2502,7 @@ WinTransform WinTransform WinTransform::Reflect(float OriginX, float OriginY, float VectorX, float VectorY) { - float Len=sqrt(VectorX*VectorX+VectorY*VectorY); + float Len= (FLOAT)sqrt(VectorX*VectorX+VectorY*VectorY); float Cos=VectorX/Len; float Sin=VectorY/Len; @@ -2524,10 +2524,10 @@ WinTransform WinTransform WinTransform::AxisA(float AngleX, float LenX, float AngleY, float LenY) { XFORM Transform; - Transform.eM11=cos(AngleX)*LenX; - Transform.eM12=sin(AngleX)*LenX; - Transform.eM21=cos(AngleY)*LenY; - Transform.eM22=sin(AngleY)*LenY; + Transform.eM11=(FLOAT)cos(AngleX)*LenX; + Transform.eM12=(FLOAT)sin(AngleX)*LenX; + Transform.eM21=(FLOAT)cos(AngleY)*LenY; + Transform.eM22=(FLOAT)sin(AngleY)*LenY; Transform.eDx=0.0f; Transform.eDy=0.0f; return Transform; diff --git a/Import/Vlpp.cpp b/Import/Vlpp.cpp index a741934f..20e95a88 100644 --- a/Import/Vlpp.cpp +++ b/Import/Vlpp.cpp @@ -15695,7 +15695,11 @@ DescriptableObject { if (aggregationInfo[aggregationSize + 1] != nullptr) { +#pragma warning (push) +#pragma warning (disable: 4297) + // Your class should call FinalizeAggregation in the destructor if it inherits from AggregatableDescription. CHECK_ERROR(!IsAggregated(), L"vl::reflection::DescriptableObject::~DescriptableObject0()#FinalizeAggregation function should be called."); +#pragma warning (pop) } } for (vint i = 0; i < aggregationSize; i++) diff --git a/Import/VlppWorkflow.cpp b/Import/VlppWorkflow.cpp index 37e23c03..4b482dac 100644 --- a/Import/VlppWorkflow.cpp +++ b/Import/VlppWorkflow.cpp @@ -2964,7 +2964,7 @@ WfRuntimeThreadContext (Operators) CONTEXT_ACTION(PopValue(first), L"failed to pop a value from the stack."); T firstValue = UnboxValue(first); T secondValue = UnboxValue(second); - T value = exp(secondValue * log(firstValue)); + T value = (T)exp(secondValue * log(firstValue)); context.PushValue(BoxValue(value)); return WfRuntimeExecutionAction::ExecuteInstruction; } diff --git a/Tools/GacGen.exe b/Tools/GacGen.exe index 953281de..98d79007 100644 Binary files a/Tools/GacGen.exe and b/Tools/GacGen.exe differ diff --git a/Tools/ParserGen.exe b/Tools/ParserGen.exe index 7633eff9..fda5bbb7 100644 Binary files a/Tools/ParserGen.exe and b/Tools/ParserGen.exe differ diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/BlackSkin.vcxproj b/Tutorial/GacUI_ControlTemplate/BlackSkin/BlackSkin.vcxproj index 530493df..963a08f3 100644 --- a/Tutorial/GacUI_ControlTemplate/BlackSkin/BlackSkin.vcxproj +++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/BlackSkin.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_ControlTemplate/UIRes/BlackSkin.bin b/Tutorial/GacUI_ControlTemplate/UIRes/BlackSkin.bin index 53539a36..3ac01204 100644 Binary files a/Tutorial/GacUI_ControlTemplate/UIRes/BlackSkin.bin and b/Tutorial/GacUI_ControlTemplate/UIRes/BlackSkin.bin differ diff --git a/Tutorial/GacUI_Controls/AddressBook/AddressBook.vcxproj b/Tutorial/GacUI_Controls/AddressBook/AddressBook.vcxproj index b5dd5a72..ad45d35a 100644 --- a/Tutorial/GacUI_Controls/AddressBook/AddressBook.vcxproj +++ b/Tutorial/GacUI_Controls/AddressBook/AddressBook.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Controls/ColorPicker/ColorPicker.vcxproj b/Tutorial/GacUI_Controls/ColorPicker/ColorPicker.vcxproj index e8ae8174..9b70971e 100644 --- a/Tutorial/GacUI_Controls/ColorPicker/ColorPicker.vcxproj +++ b/Tutorial/GacUI_Controls/ColorPicker/ColorPicker.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Controls/ContainersAndButtons/ContainersAndButtons.vcxproj b/Tutorial/GacUI_Controls/ContainersAndButtons/ContainersAndButtons.vcxproj index 78701968..bf13cfc2 100644 --- a/Tutorial/GacUI_Controls/ContainersAndButtons/ContainersAndButtons.vcxproj +++ b/Tutorial/GacUI_Controls/ContainersAndButtons/ContainersAndButtons.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Controls/TextEditor/TextEditor.vcxproj b/Tutorial/GacUI_Controls/TextEditor/TextEditor.vcxproj index 9b6f2310..fb16e928 100644 --- a/Tutorial/GacUI_Controls/TextEditor/TextEditor.vcxproj +++ b/Tutorial/GacUI_Controls/TextEditor/TextEditor.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Controls/UIRes/AddressBook.bin b/Tutorial/GacUI_Controls/UIRes/AddressBook.bin index cbf92631..6562745f 100644 Binary files a/Tutorial/GacUI_Controls/UIRes/AddressBook.bin and b/Tutorial/GacUI_Controls/UIRes/AddressBook.bin differ diff --git a/Tutorial/GacUI_Controls/UIRes/ColorPicker.bin b/Tutorial/GacUI_Controls/UIRes/ColorPicker.bin index d01c9cc1..7849e40f 100644 Binary files a/Tutorial/GacUI_Controls/UIRes/ColorPicker.bin and b/Tutorial/GacUI_Controls/UIRes/ColorPicker.bin differ diff --git a/Tutorial/GacUI_Controls/UIRes/ContainersAndButtons.bin b/Tutorial/GacUI_Controls/UIRes/ContainersAndButtons.bin index 80e5f808..886fb460 100644 Binary files a/Tutorial/GacUI_Controls/UIRes/ContainersAndButtons.bin and b/Tutorial/GacUI_Controls/UIRes/ContainersAndButtons.bin differ diff --git a/Tutorial/GacUI_Controls/UIRes/TextEditor.bin b/Tutorial/GacUI_Controls/UIRes/TextEditor.bin index 45bf9fd7..fbfa3dcd 100644 Binary files a/Tutorial/GacUI_Controls/UIRes/TextEditor.bin and b/Tutorial/GacUI_Controls/UIRes/TextEditor.bin differ diff --git a/Tutorial/GacUI_HelloWorlds/Cpp/Cpp.vcxproj b/Tutorial/GacUI_HelloWorlds/Cpp/Cpp.vcxproj index 73422394..fe79f9ba 100644 --- a/Tutorial/GacUI_HelloWorlds/Cpp/Cpp.vcxproj +++ b/Tutorial/GacUI_HelloWorlds/Cpp/Cpp.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_HelloWorlds/CppXml/CppXml.vcxproj b/Tutorial/GacUI_HelloWorlds/CppXml/CppXml.vcxproj index 4e95507c..01331985 100644 --- a/Tutorial/GacUI_HelloWorlds/CppXml/CppXml.vcxproj +++ b/Tutorial/GacUI_HelloWorlds/CppXml/CppXml.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/MVVM.vcxproj b/Tutorial/GacUI_HelloWorlds/MVVM/MVVM.vcxproj index 71ddd9a9..101e93e0 100644 --- a/Tutorial/GacUI_HelloWorlds/MVVM/MVVM.vcxproj +++ b/Tutorial/GacUI_HelloWorlds/MVVM/MVVM.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_HelloWorlds/UIRes/CppXml.bin b/Tutorial/GacUI_HelloWorlds/UIRes/CppXml.bin index 601d0d52..f24ffbda 100644 Binary files a/Tutorial/GacUI_HelloWorlds/UIRes/CppXml.bin and b/Tutorial/GacUI_HelloWorlds/UIRes/CppXml.bin differ diff --git a/Tutorial/GacUI_HelloWorlds/UIRes/MVVM.bin b/Tutorial/GacUI_HelloWorlds/UIRes/MVVM.bin index b28ae8c4..9ae66636 100644 Binary files a/Tutorial/GacUI_HelloWorlds/UIRes/MVVM.bin and b/Tutorial/GacUI_HelloWorlds/UIRes/MVVM.bin differ diff --git a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin index 73460029..0b48e45e 100644 Binary files a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin and b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin differ diff --git a/Tutorial/GacUI_HelloWorlds/WorkflowScript/WorkflowScript.vcxproj b/Tutorial/GacUI_HelloWorlds/WorkflowScript/WorkflowScript.vcxproj index f2892098..a1aaf5c0 100644 --- a/Tutorial/GacUI_HelloWorlds/WorkflowScript/WorkflowScript.vcxproj +++ b/Tutorial/GacUI_HelloWorlds/WorkflowScript/WorkflowScript.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_HelloWorlds/Xml/Xml.vcxproj b/Tutorial/GacUI_HelloWorlds/Xml/Xml.vcxproj index db4ed3be..62721f45 100644 --- a/Tutorial/GacUI_HelloWorlds/Xml/Xml.vcxproj +++ b/Tutorial/GacUI_HelloWorlds/Xml/Xml.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Layout/Alignment/Alignment.vcxproj b/Tutorial/GacUI_Layout/Alignment/Alignment.vcxproj index 763cfcca..79efd164 100644 --- a/Tutorial/GacUI_Layout/Alignment/Alignment.vcxproj +++ b/Tutorial/GacUI_Layout/Alignment/Alignment.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Layout/Flow/Flow.vcxproj b/Tutorial/GacUI_Layout/Flow/Flow.vcxproj index f634ae55..07c5e97c 100644 --- a/Tutorial/GacUI_Layout/Flow/Flow.vcxproj +++ b/Tutorial/GacUI_Layout/Flow/Flow.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Layout/RichTextEmbedding/RichTextEmbedding.vcxproj b/Tutorial/GacUI_Layout/RichTextEmbedding/RichTextEmbedding.vcxproj index 425be0b7..4007ff2c 100644 --- a/Tutorial/GacUI_Layout/RichTextEmbedding/RichTextEmbedding.vcxproj +++ b/Tutorial/GacUI_Layout/RichTextEmbedding/RichTextEmbedding.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Layout/Stack/Stack.vcxproj b/Tutorial/GacUI_Layout/Stack/Stack.vcxproj index 086862bc..14ed4e63 100644 --- a/Tutorial/GacUI_Layout/Stack/Stack.vcxproj +++ b/Tutorial/GacUI_Layout/Stack/Stack.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Layout/Table/Table.vcxproj b/Tutorial/GacUI_Layout/Table/Table.vcxproj index 899bf125..1327a374 100644 --- a/Tutorial/GacUI_Layout/Table/Table.vcxproj +++ b/Tutorial/GacUI_Layout/Table/Table.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Layout/TableSplitter/TableSplitter.vcxproj b/Tutorial/GacUI_Layout/TableSplitter/TableSplitter.vcxproj index cb7e5b4b..a324f935 100644 --- a/Tutorial/GacUI_Layout/TableSplitter/TableSplitter.vcxproj +++ b/Tutorial/GacUI_Layout/TableSplitter/TableSplitter.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Layout/UIRes/Alignment.bin b/Tutorial/GacUI_Layout/UIRes/Alignment.bin index 421c3cd3..57a76ab1 100644 Binary files a/Tutorial/GacUI_Layout/UIRes/Alignment.bin and b/Tutorial/GacUI_Layout/UIRes/Alignment.bin differ diff --git a/Tutorial/GacUI_Layout/UIRes/Flow.bin b/Tutorial/GacUI_Layout/UIRes/Flow.bin index 02881591..95ee12ba 100644 Binary files a/Tutorial/GacUI_Layout/UIRes/Flow.bin and b/Tutorial/GacUI_Layout/UIRes/Flow.bin differ diff --git a/Tutorial/GacUI_Layout/UIRes/RichTextEmbedding.bin b/Tutorial/GacUI_Layout/UIRes/RichTextEmbedding.bin index d5dc2b3b..0efeb97d 100644 Binary files a/Tutorial/GacUI_Layout/UIRes/RichTextEmbedding.bin and b/Tutorial/GacUI_Layout/UIRes/RichTextEmbedding.bin differ diff --git a/Tutorial/GacUI_Layout/UIRes/Stack.bin b/Tutorial/GacUI_Layout/UIRes/Stack.bin index 04c30c9e..f70758dc 100644 Binary files a/Tutorial/GacUI_Layout/UIRes/Stack.bin and b/Tutorial/GacUI_Layout/UIRes/Stack.bin differ diff --git a/Tutorial/GacUI_Layout/UIRes/Table.bin b/Tutorial/GacUI_Layout/UIRes/Table.bin index 4f49eee0..a42f2a68 100644 Binary files a/Tutorial/GacUI_Layout/UIRes/Table.bin and b/Tutorial/GacUI_Layout/UIRes/Table.bin differ diff --git a/Tutorial/GacUI_Layout/UIRes/TableSplitter.bin b/Tutorial/GacUI_Layout/UIRes/TableSplitter.bin index aee3d767..f55b0246 100644 Binary files a/Tutorial/GacUI_Layout/UIRes/TableSplitter.bin and b/Tutorial/GacUI_Layout/UIRes/TableSplitter.bin differ diff --git a/Tutorial/GacUI_Xml/Binding_Bind/Binding_Bind.vcxproj b/Tutorial/GacUI_Xml/Binding_Bind/Binding_Bind.vcxproj index 26f870e5..44124a6c 100644 --- a/Tutorial/GacUI_Xml/Binding_Bind/Binding_Bind.vcxproj +++ b/Tutorial/GacUI_Xml/Binding_Bind/Binding_Bind.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Xml/Binding_Eval/Binding_Eval.vcxproj b/Tutorial/GacUI_Xml/Binding_Eval/Binding_Eval.vcxproj index 2857b7c3..ff8646d5 100644 --- a/Tutorial/GacUI_Xml/Binding_Eval/Binding_Eval.vcxproj +++ b/Tutorial/GacUI_Xml/Binding_Eval/Binding_Eval.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Xml/Binding_Format/Binding_Format.vcxproj b/Tutorial/GacUI_Xml/Binding_Format/Binding_Format.vcxproj index 8b6f46c8..6fbb4343 100644 --- a/Tutorial/GacUI_Xml/Binding_Format/Binding_Format.vcxproj +++ b/Tutorial/GacUI_Xml/Binding_Format/Binding_Format.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Xml/Binding_Uri/Binding_Uri.vcxproj b/Tutorial/GacUI_Xml/Binding_Uri/Binding_Uri.vcxproj index b312ba28..f65dbbc6 100644 --- a/Tutorial/GacUI_Xml/Binding_Uri/Binding_Uri.vcxproj +++ b/Tutorial/GacUI_Xml/Binding_Uri/Binding_Uri.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Xml/Binding_ViewModel/Binding_ViewModel.vcxproj b/Tutorial/GacUI_Xml/Binding_ViewModel/Binding_ViewModel.vcxproj index fbcb7680..a1826224 100644 --- a/Tutorial/GacUI_Xml/Binding_ViewModel/Binding_ViewModel.vcxproj +++ b/Tutorial/GacUI_Xml/Binding_ViewModel/Binding_ViewModel.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Xml/Event_Cpp/Event_Cpp.vcxproj b/Tutorial/GacUI_Xml/Event_Cpp/Event_Cpp.vcxproj index d40f2f63..5649d586 100644 --- a/Tutorial/GacUI_Xml/Event_Cpp/Event_Cpp.vcxproj +++ b/Tutorial/GacUI_Xml/Event_Cpp/Event_Cpp.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Xml/Event_Script/Event_Script.vcxproj b/Tutorial/GacUI_Xml/Event_Script/Event_Script.vcxproj index 94a0f84c..3a4c0731 100644 --- a/Tutorial/GacUI_Xml/Event_Script/Event_Script.vcxproj +++ b/Tutorial/GacUI_Xml/Event_Script/Event_Script.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Xml/Event_ViewModel/Event_ViewModel.vcxproj b/Tutorial/GacUI_Xml/Event_ViewModel/Event_ViewModel.vcxproj index 6524b30e..7b600a21 100644 --- a/Tutorial/GacUI_Xml/Event_ViewModel/Event_ViewModel.vcxproj +++ b/Tutorial/GacUI_Xml/Event_ViewModel/Event_ViewModel.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Xml/Instance_Control/Instance_Control.vcxproj b/Tutorial/GacUI_Xml/Instance_Control/Instance_Control.vcxproj index 744c5f38..26d9453a 100644 --- a/Tutorial/GacUI_Xml/Instance_Control/Instance_Control.vcxproj +++ b/Tutorial/GacUI_Xml/Instance_Control/Instance_Control.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Xml/Instance_MultipleWindows/Instance_MultipleWindows.vcxproj b/Tutorial/GacUI_Xml/Instance_MultipleWindows/Instance_MultipleWindows.vcxproj index 7c25c07a..74f2202f 100644 --- a/Tutorial/GacUI_Xml/Instance_MultipleWindows/Instance_MultipleWindows.vcxproj +++ b/Tutorial/GacUI_Xml/Instance_MultipleWindows/Instance_MultipleWindows.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Xml/Instance_Window/Instance_Window.vcxproj b/Tutorial/GacUI_Xml/Instance_Window/Instance_Window.vcxproj index 32929c60..4251730e 100644 --- a/Tutorial/GacUI_Xml/Instance_Window/Instance_Window.vcxproj +++ b/Tutorial/GacUI_Xml/Instance_Window/Instance_Window.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Xml/Member_Field/Member_Field.vcxproj b/Tutorial/GacUI_Xml/Member_Field/Member_Field.vcxproj index 7d816ffe..0e0d84a2 100644 --- a/Tutorial/GacUI_Xml/Member_Field/Member_Field.vcxproj +++ b/Tutorial/GacUI_Xml/Member_Field/Member_Field.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Xml/Member_Parameter/Member_Parameter.vcxproj b/Tutorial/GacUI_Xml/Member_Parameter/Member_Parameter.vcxproj index ccef6e21..0d0a9ce1 100644 --- a/Tutorial/GacUI_Xml/Member_Parameter/Member_Parameter.vcxproj +++ b/Tutorial/GacUI_Xml/Member_Parameter/Member_Parameter.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Xml/Member_Property/Member_Property.vcxproj b/Tutorial/GacUI_Xml/Member_Property/Member_Property.vcxproj index 8626e71b..ce22aa3b 100644 --- a/Tutorial/GacUI_Xml/Member_Property/Member_Property.vcxproj +++ b/Tutorial/GacUI_Xml/Member_Property/Member_Property.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/Tutorial/GacUI_Xml/UIRes/Binding_Bind.bin b/Tutorial/GacUI_Xml/UIRes/Binding_Bind.bin index 04bdf04b..a74f314f 100644 Binary files a/Tutorial/GacUI_Xml/UIRes/Binding_Bind.bin and b/Tutorial/GacUI_Xml/UIRes/Binding_Bind.bin differ diff --git a/Tutorial/GacUI_Xml/UIRes/Binding_Eval.bin b/Tutorial/GacUI_Xml/UIRes/Binding_Eval.bin index 647a417c..cafa043c 100644 Binary files a/Tutorial/GacUI_Xml/UIRes/Binding_Eval.bin and b/Tutorial/GacUI_Xml/UIRes/Binding_Eval.bin differ diff --git a/Tutorial/GacUI_Xml/UIRes/Binding_Format.bin b/Tutorial/GacUI_Xml/UIRes/Binding_Format.bin index 825efa8e..18feeaef 100644 Binary files a/Tutorial/GacUI_Xml/UIRes/Binding_Format.bin and b/Tutorial/GacUI_Xml/UIRes/Binding_Format.bin differ diff --git a/Tutorial/GacUI_Xml/UIRes/Binding_Uri.bin b/Tutorial/GacUI_Xml/UIRes/Binding_Uri.bin index 157382cd..6bac1b89 100644 Binary files a/Tutorial/GacUI_Xml/UIRes/Binding_Uri.bin and b/Tutorial/GacUI_Xml/UIRes/Binding_Uri.bin differ diff --git a/Tutorial/GacUI_Xml/UIRes/Binding_ViewModel.bin b/Tutorial/GacUI_Xml/UIRes/Binding_ViewModel.bin index 59ba3726..3d3c407a 100644 Binary files a/Tutorial/GacUI_Xml/UIRes/Binding_ViewModel.bin and b/Tutorial/GacUI_Xml/UIRes/Binding_ViewModel.bin differ diff --git a/Tutorial/GacUI_Xml/UIRes/Event_Cpp.bin b/Tutorial/GacUI_Xml/UIRes/Event_Cpp.bin index 589b927e..5fedd21c 100644 Binary files a/Tutorial/GacUI_Xml/UIRes/Event_Cpp.bin and b/Tutorial/GacUI_Xml/UIRes/Event_Cpp.bin differ diff --git a/Tutorial/GacUI_Xml/UIRes/Event_Script.bin b/Tutorial/GacUI_Xml/UIRes/Event_Script.bin index b3047d89..0285bbb7 100644 Binary files a/Tutorial/GacUI_Xml/UIRes/Event_Script.bin and b/Tutorial/GacUI_Xml/UIRes/Event_Script.bin differ diff --git a/Tutorial/GacUI_Xml/UIRes/Event_ViewModel.bin b/Tutorial/GacUI_Xml/UIRes/Event_ViewModel.bin index 4d13ff5c..1fae3bb6 100644 Binary files a/Tutorial/GacUI_Xml/UIRes/Event_ViewModel.bin and b/Tutorial/GacUI_Xml/UIRes/Event_ViewModel.bin differ diff --git a/Tutorial/GacUI_Xml/UIRes/Instance_Control.bin b/Tutorial/GacUI_Xml/UIRes/Instance_Control.bin index 012a2247..02fffb03 100644 Binary files a/Tutorial/GacUI_Xml/UIRes/Instance_Control.bin and b/Tutorial/GacUI_Xml/UIRes/Instance_Control.bin differ diff --git a/Tutorial/GacUI_Xml/UIRes/Instance_MultipleWindows.bin b/Tutorial/GacUI_Xml/UIRes/Instance_MultipleWindows.bin index 6e3c6a99..5144f57e 100644 Binary files a/Tutorial/GacUI_Xml/UIRes/Instance_MultipleWindows.bin and b/Tutorial/GacUI_Xml/UIRes/Instance_MultipleWindows.bin differ diff --git a/Tutorial/GacUI_Xml/UIRes/Instance_Window.bin b/Tutorial/GacUI_Xml/UIRes/Instance_Window.bin index e61d9a8b..7ceb8cd0 100644 Binary files a/Tutorial/GacUI_Xml/UIRes/Instance_Window.bin and b/Tutorial/GacUI_Xml/UIRes/Instance_Window.bin differ diff --git a/Tutorial/GacUI_Xml/UIRes/Member_Field.bin b/Tutorial/GacUI_Xml/UIRes/Member_Field.bin index c78de782..37a32e26 100644 Binary files a/Tutorial/GacUI_Xml/UIRes/Member_Field.bin and b/Tutorial/GacUI_Xml/UIRes/Member_Field.bin differ diff --git a/Tutorial/GacUI_Xml/UIRes/Member_Parameter.bin b/Tutorial/GacUI_Xml/UIRes/Member_Parameter.bin index 6c414959..31a99c31 100644 Binary files a/Tutorial/GacUI_Xml/UIRes/Member_Parameter.bin and b/Tutorial/GacUI_Xml/UIRes/Member_Parameter.bin differ diff --git a/Tutorial/GacUI_Xml/UIRes/Member_Property.bin b/Tutorial/GacUI_Xml/UIRes/Member_Property.bin index ef66cfbf..84946208 100644 Binary files a/Tutorial/GacUI_Xml/UIRes/Member_Property.bin and b/Tutorial/GacUI_Xml/UIRes/Member_Property.bin differ diff --git a/Tutorial/Lib/GacUI/GacUI.vcxproj b/Tutorial/Lib/GacUI/GacUI.vcxproj index b9daa2ae..a79d96fe 100644 --- a/Tutorial/Lib/GacUI/GacUI.vcxproj +++ b/Tutorial/Lib/GacUI/GacUI.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ StaticLibrary true - v120 + v140 Unicode StaticLibrary false - v120 + v140 true Unicode diff --git a/Tutorial/Lib/GacUIComplete/GacUIComplete.vcxproj b/Tutorial/Lib/GacUIComplete/GacUIComplete.vcxproj index b305197a..23c76e83 100644 --- a/Tutorial/Lib/GacUIComplete/GacUIComplete.vcxproj +++ b/Tutorial/Lib/GacUIComplete/GacUIComplete.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ StaticLibrary true - v120 + v140 Unicode StaticLibrary false - v120 + v140 true Unicode diff --git a/Tutorial/Lib/GacUILite/GacUILite.vcxproj b/Tutorial/Lib/GacUILite/GacUILite.vcxproj index b2eff18e..df60ceff 100644 --- a/Tutorial/Lib/GacUILite/GacUILite.vcxproj +++ b/Tutorial/Lib/GacUILite/GacUILite.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ StaticLibrary true - v120 + v140 Unicode StaticLibrary false - v120 + v140 true Unicode