Mirrors_UI_SDK/GacUI
1
0
Fork 0
mirror of https://github.com/vczh-libraries/Release.git synced 2026-06-02 23:56:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix errors for clang++ 3.4-1ubuntu3

Browse Source
This commit is contained in:
vczh
2015-12-26 21:39:47 -08:00
parent a2c6eab599
commit c2c23874e7
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Import/GacUIReflection.cpp
+11 -11
View File
@@ -3580,7 +3580,7 @@ GuiListViewInstanceLoader
bool bindable; bool bindable;
GlobalStringKey _View, _IconSize; GlobalStringKey _View, _IconSize;
void PrepareAdditionalArgumentsAfterCreation(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List<WString>& errors, Ptr<WfBlockStatement> block)override void PrepareAdditionalArgumentsAfterCreation(const typename BASE_TYPE::TypeInfo& typeInfo, GlobalStringKey variableName, typename BASE_TYPE::ArgumentMap& arguments, collections::List<WString>& errors, Ptr<WfBlockStatement> block)override
{ {
auto view = ListViewViewType::Detail; auto view = ListViewViewType::Detail;
Ptr<WfExpression> iconSize; Ptr<WfExpression> iconSize;
@@ -3667,16 +3667,16 @@ GuiListViewInstanceLoader
_IconSize = GlobalStringKey::Get(L"IconSize"); _IconSize = GlobalStringKey::Get(L"IconSize");
} }
void GetConstructorParameters(const TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override void GetConstructorParameters(const typename BASE_TYPE::TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override
{ {
if (typeInfo.typeName == GetTypeName()) if (typeInfo.typeName == BASE_TYPE::GetTypeName())
{ {
propertyNames.Add(_View); propertyNames.Add(_View);
propertyNames.Add(_IconSize); propertyNames.Add(_IconSize);
} }
} }
Ptr<GuiInstancePropertyInfo> GetPropertyType(const PropertyInfo& propertyInfo)override Ptr<GuiInstancePropertyInfo> GetPropertyType(const typename BASE_TYPE::PropertyInfo& propertyInfo)override
{ {
if (propertyInfo.propertyName == _View) if (propertyInfo.propertyName == _View)
{ {
@@ -3758,7 +3758,7 @@ GuiTreeViewInstanceLoader
bool bindable; bool bindable;
GlobalStringKey _Nodes, _IconSize; GlobalStringKey _Nodes, _IconSize;
void PrepareAdditionalArgumentsAfterCreation(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List<WString>& errors, Ptr<WfBlockStatement> block)override void PrepareAdditionalArgumentsAfterCreation(const typename BASE_TYPE::TypeInfo& typeInfo, GlobalStringKey variableName, typename BASE_TYPE::ArgumentMap& arguments, collections::List<WString>& errors, Ptr<WfBlockStatement> block)override
{ {
vint indexIconSize = arguments.Keys().IndexOf(_IconSize); vint indexIconSize = arguments.Keys().IndexOf(_IconSize);
if (indexIconSize != -1) if (indexIconSize != -1)
@@ -3802,7 +3802,7 @@ GuiTreeViewInstanceLoader
_IconSize = GlobalStringKey::Get(L"IconSize"); _IconSize = GlobalStringKey::Get(L"IconSize");
} }
void GetPropertyNames(const TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override void GetPropertyNames(const typename BASE_TYPE::TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override
{ {
if (!bindable) if (!bindable)
{ {
@@ -3810,16 +3810,16 @@ GuiTreeViewInstanceLoader
} }
} }
void GetConstructorParameters(const TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override void GetConstructorParameters(const typename BASE_TYPE::TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override
{ {
if (typeInfo.typeName == GetTypeName()) if (typeInfo.typeName == BASE_TYPE::GetTypeName())
{ {
propertyNames.Add(_Nodes); propertyNames.Add(_Nodes);
propertyNames.Add(_IconSize); propertyNames.Add(_IconSize);
} }
} }
Ptr<GuiInstancePropertyInfo> GetPropertyType(const PropertyInfo& propertyInfo)override Ptr<GuiInstancePropertyInfo> GetPropertyType(const typename BASE_TYPE::PropertyInfo& propertyInfo)override
{ {
if (propertyInfo.propertyName == _Nodes) if (propertyInfo.propertyName == _Nodes)
{ {
@@ -3837,7 +3837,7 @@ GuiTreeViewInstanceLoader
return IGuiInstanceLoader::GetPropertyType(propertyInfo); return IGuiInstanceLoader::GetPropertyType(propertyInfo);
} }
Ptr<workflow::WfStatement> AssignParameters(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List<WString>& errors)override Ptr<workflow::WfStatement> AssignParameters(const typename BASE_TYPE::TypeInfo& typeInfo, GlobalStringKey variableName, typename BASE_TYPE::ArgumentMap& arguments, collections::List<WString>& errors)override
{ {
auto block = MakePtr<WfBlockStatement>(); auto block = MakePtr<WfBlockStatement>();
@@ -11103,7 +11103,7 @@ WorkflowGenerateCreatingVisitor
serializable = true; serializable = true;
textValue = text->text; textValue = text->text;
} }
else if (ctor = dynamic_cast<GuiConstructorRepr*>(repr)) else if ((ctor = dynamic_cast<GuiConstructorRepr*>(repr)))
{ {
if (ctor->instanceName == GlobalStringKey::Empty) if (ctor->instanceName == GlobalStringKey::Empty)
{ {
Import/GacUIWindows.cpp
+5 -1
View File
@@ -1723,7 +1723,6 @@ NATIVEWINDOW\WINDOWS\DIRECT2D\WINDIRECT2DAPPLICATION.CPP
#pragma comment(lib, "dwrite.lib") #pragma comment(lib, "dwrite.lib")
#pragma comment(lib, "d3d11.lib") #pragma comment(lib, "d3d11.lib")
#include <d3d11_1.h>
namespace vl namespace vl
{ {
@@ -2174,6 +2173,11 @@ ControllerListener
{ {
return direct2DListener->dwrite.Obj(); return direct2DListener->dwrite.Obj();
} }
ID3D11Device* GetD3D11Device()
{
return direct2DListener->d3d11Device.Obj();
}
} }
namespace elements_windows_d2d namespace elements_windows_d2d
Import/GacUIWindows.h
+2
View File
@@ -642,6 +642,7 @@ Interfaces:
#include <d2d1_1.h> #include <d2d1_1.h>
#include <dwrite_1.h> #include <dwrite_1.h>
#include <d3d11_1.h>
namespace vl namespace vl
{ {
@@ -654,6 +655,7 @@ namespace vl
extern bool PresentNativeWindowDirect2DRenderTarget(INativeWindow* window); extern bool PresentNativeWindowDirect2DRenderTarget(INativeWindow* window);
extern ID2D1Factory* GetDirect2DFactory(); extern ID2D1Factory* GetDirect2DFactory();
extern IDWriteFactory* GetDirectWriteFactory(); extern IDWriteFactory* GetDirectWriteFactory();
extern ID3D11Device* GetD3D11Device();
} }
} }
} }