github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

uppsrc: MSC++ fixes

Browse source
This commit is contained in:
Mirek Fidler 2024-12-20 12:54:55 +01:00
parent 26de556486
commit 622fb9cd71
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Win32Util.cpp
View file

@ -49,7 +49,7 @@ bool IsWin7()
dword GetWindowsBuildVersion()
{
NTSTATUS(WINAPI *RtlGetVersion)(LPOSVERSIONINFOEXW);
LONG(WINAPI *RtlGetVersion)(LPOSVERSIONINFOEXW);
DllFn(RtlGetVersion, "ntdll", "RtlGetVersion");
if(!RtlGetVersion)

10
uppsrc/CtrlLib/LineEdit.cpp
View file

@ -156,7 +156,7 @@ int LineEdit::RectSelectionOp(Event<int, Rect, int64, int64, WString&> op, Event
anchor = (int)GetGPos(rect.top, rect.left);
cursor = (int)GetGPos(rect.bottom, rect.left);
PlaceCaret0();
return cursor;
return (int)cursor;
}
void LineEdit::RectSelectionChar(int c)
@ -168,7 +168,7 @@ void LineEdit::RectSelectionText(const WString& text)
{
if(GetRectSelection().GetWidth())
RemoveRectSelection();
int p = -1; // position after insertion, because of '\t' and double size chars cannot do just left+text.GetCount()
int64 p = -1; // position after insertion, because of '\t' and double size chars cannot do just left+text.GetCount()
RectSelectionOp(
[&](int i, Rect rect, int64 l, int64 h, WString& s) {
int x = GetColumnLine(l).x;
@ -195,7 +195,7 @@ void LineEdit::RectSelectionBackspace()
if(GetRectSelection().GetWidth())
RectSelectionDelete();
else {
int a = anchor;
int64 a = anchor;
RectSelectionLeftRight(-1, false);
if(a != anchor)
RectSelectionDelete();
@ -283,7 +283,7 @@ WString LineEdit::CopyRectSelection()
int LineEdit::PasteRectSelection(const WString& s)
{
Vector<WString> cl = Split(s, '\n', false);
int cursor0 = cursor;
int64 cursor0 = cursor;
if(cl.GetCount() == 1)
RectSelectionText(cl[0]);
else {
@ -299,7 +299,7 @@ int LineEdit::PasteRectSelection(const WString& s)
}
PlaceCaret(pos);
}
return cursor - cursor0;
return int(cursor - cursor0);
}
void LineEdit::PasteColumn(const WString& text)