mirror of
https://github.com/vczh-libraries/Release.git
synced 2026-06-03 21:33:57 +08:00
...
This commit is contained in:
+2
-2
@@ -37821,7 +37821,7 @@ GuiGraphicsHost
|
|||||||
}
|
}
|
||||||
else if (VKEY_NUMPAD0 <= info.code && info.code <= VKEY_NUMPAD9)
|
else if (VKEY_NUMPAD0 <= info.code && info.code <= VKEY_NUMPAD9)
|
||||||
{
|
{
|
||||||
if (EnterAltKey('0' + (info.code - VKEY_NUMPAD0)))
|
if (EnterAltKey((wchar_t)(L'0' + (info.code - VKEY_NUMPAD0))))
|
||||||
{
|
{
|
||||||
supressAltKey = info.code;
|
supressAltKey = info.code;
|
||||||
return;
|
return;
|
||||||
@@ -39054,7 +39054,7 @@ GuiColorizedTextElement
|
|||||||
line.contextFinalState = -1;
|
line.contextFinalState = -1;
|
||||||
for (vint j = 0; j < line.dataLength; j++)
|
for (vint j = 0; j < line.dataLength; j++)
|
||||||
{
|
{
|
||||||
line.att[j].colorIndex = index;
|
line.att[j].colorIndex = (vuint32_t)index;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7705,7 +7705,7 @@ WorkflowReferenceNamesVisitor
|
|||||||
+ L"\" of type \""
|
+ L"\" of type \""
|
||||||
+ propertyInfo.typeInfo.typeName.ToString()
|
+ propertyInfo.typeInfo.typeName.ToString()
|
||||||
+ L"\" does not accept a value of type \""
|
+ L"\" does not accept a value of type \""
|
||||||
+ resolvedTypeInfo.typeName.ToKey()
|
+ resolvedTypeInfo.typeName.ToString()
|
||||||
+ L"\" because it only accepts value of the following types: ";
|
+ L"\" because it only accepts value of the following types: ";
|
||||||
|
|
||||||
for (vint i = 0; i < candidatePropertyTypeInfos.Count(); i++)
|
for (vint i = 0; i < candidatePropertyTypeInfos.Count(); i++)
|
||||||
|
|||||||
+21
-21
@@ -81,56 +81,56 @@ WindowsForm
|
|||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
DWORD InternalGetExStyle()
|
LONG_PTR InternalGetExStyle()
|
||||||
{
|
{
|
||||||
return (DWORD)GetWindowLongPtr(handle,GWL_EXSTYLE);
|
return GetWindowLongPtr(handle, GWL_EXSTYLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
void InternalSetExStyle(DWORD exStyle)
|
void InternalSetExStyle(LONG_PTR exStyle)
|
||||||
{
|
{
|
||||||
LONG_PTR result=SetWindowLongPtr(handle,GWL_EXSTYLE,exStyle);
|
LONG_PTR result = SetWindowLongPtr(handle, GWL_EXSTYLE, exStyle);
|
||||||
SetWindowPos(handle,0,0,0,0,0,SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_FRAMECHANGED);
|
SetWindowPos(handle, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_FRAMECHANGED);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GetExStyle(DWORD exStyle)
|
bool GetExStyle(LONG_PTR exStyle)
|
||||||
{
|
{
|
||||||
LONG_PTR Long=InternalGetExStyle();
|
LONG_PTR Long=InternalGetExStyle();
|
||||||
return (Long & exStyle) != 0;
|
return (Long & exStyle) != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetExStyle(DWORD exStyle, bool available)
|
void SetExStyle(LONG_PTR exStyle, bool available)
|
||||||
{
|
{
|
||||||
DWORD Long=InternalGetExStyle();
|
LONG_PTR Long = InternalGetExStyle();
|
||||||
if(available)
|
if(available)
|
||||||
{
|
{
|
||||||
Long|=exStyle;
|
Long |= exStyle;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Long&=~exStyle;
|
Long &= ~exStyle;
|
||||||
}
|
}
|
||||||
InternalSetExStyle((DWORD)Long);
|
InternalSetExStyle(Long);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GetStyle(DWORD style)
|
bool GetStyle(LONG_PTR style)
|
||||||
{
|
{
|
||||||
LONG_PTR Long=GetWindowLongPtr(handle,GWL_STYLE);
|
LONG_PTR Long = GetWindowLongPtr(handle, GWL_STYLE);
|
||||||
return (Long & style) != 0;
|
return (Long & style) != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetStyle(DWORD style, bool available)
|
void SetStyle(LONG_PTR style, bool available)
|
||||||
{
|
{
|
||||||
LONG_PTR Long=GetWindowLongPtr(handle,GWL_STYLE);
|
LONG_PTR Long = GetWindowLongPtr(handle, GWL_STYLE);
|
||||||
if(available)
|
if(available)
|
||||||
{
|
{
|
||||||
Long|=style;
|
Long |= style;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Long&=~style;
|
Long &= ~style;
|
||||||
}
|
}
|
||||||
SetWindowLongPtr(handle,GWL_STYLE,Long);
|
SetWindowLongPtr(handle, GWL_STYLE, Long);
|
||||||
SetWindowPos(handle,0,0,0,0,0,SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_FRAMECHANGED);
|
SetWindowPos(handle, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_FRAMECHANGED);
|
||||||
}
|
}
|
||||||
|
|
||||||
NativeWindowMouseInfo ConvertMouse(WPARAM wParam, LPARAM lParam, bool wheelMessage, bool nonClient)
|
NativeWindowMouseInfo ConvertMouse(WPARAM wParam, LPARAM lParam, bool wheelMessage, bool nonClient)
|
||||||
@@ -816,8 +816,8 @@ WindowsForm
|
|||||||
,customFrameMode(false)
|
,customFrameMode(false)
|
||||||
,supressingAlt(false)
|
,supressingAlt(false)
|
||||||
{
|
{
|
||||||
DWORD exStyle=WS_EX_APPWINDOW | WS_EX_CONTROLPARENT;
|
DWORD exStyle = WS_EX_APPWINDOW | WS_EX_CONTROLPARENT;
|
||||||
DWORD style=WS_BORDER | WS_CAPTION | WS_SIZEBOX | WS_SYSMENU | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_MAXIMIZEBOX | WS_MINIMIZEBOX;
|
DWORD style = WS_BORDER | WS_CAPTION | WS_SIZEBOX | WS_SYSMENU | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_MAXIMIZEBOX | WS_MINIMIZEBOX;
|
||||||
handle=CreateWindowEx(exStyle, className.Buffer(), L"", style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, parent, NULL, hInstance, NULL);
|
handle=CreateWindowEx(exStyle, className.Buffer(), L"", style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, parent, NULL, hInstance, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ namespace demo
|
|||||||
Setup();
|
Setup();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ColorizeTokenContextSensitive(int lineIndex, const wchar_t* text, vint start, vint length, vint& token, int& contextState)override
|
void ColorizeTokenContextSensitive(vint lineIndex, const wchar_t* text, vint start, vint length, vint& token, vint& contextState)override
|
||||||
{
|
{
|
||||||
// 0 < 1 name 2 att > 0
|
// 0 < 1 name 2 att > 0
|
||||||
switch(token)
|
switch(token)
|
||||||
|
|||||||
Reference in New Issue
Block a user