github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-30 06:12:22 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Fixed to compile in macos

Browse source
This commit is contained in:
Mirek Fidler 2026-06-25 18:18:56 +02:00
parent 7458c14a61
commit 2ce8896560
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/CtrlCore/CocoApp.mm
View file

@ -296,7 +296,7 @@ Rect MakeScreenRect(NSScreen *screen, CGRect r)
return MakeRect(r, Upp::Ctrl::SCL(1));
}
void Ctrl::GetWorkArea(Array<Rect>& rc)
void Ctrl::GetWorkAreas(Array<Rect>& rc)
{
Upp::GuiLock __;
for(NSScreen *screen in [NSScreen screens])
@ -307,7 +307,7 @@ void Ctrl::GetWorkArea(Array<Rect>& rc)
Rect Ctrl::GetVirtualWorkArea()
{
Array<Rect> rc;
GetWorkArea(rc);
GetWorkAreas(rc);
Rect r(0, 0, 0, 0);
for(int i = 0; i < rc.GetCount(); i++)
if(i)
@ -335,7 +335,7 @@ Rect Ctrl::GetVirtualScreenArea()
Rect Ctrl::GetPrimaryWorkArea()
{
Array<Rect> rc;
GetWorkArea(rc);
GetWorkAreas(rc);
return rc.GetCount() ? rc[0] : Rect(0, 0, 0, 0);
}

2
uppsrc/CtrlCore/CocoWin.mm
View file

@ -37,7 +37,7 @@ static Vector<Ptr<Ctrl>> mmtopctrl; // should work without Ptr, but let us be de
bool Ctrl::always_use_bundled_icon = false;
Ctrl *Ctrl::GetOwner()
Ctrl *Ctrl::GetOwnerWnd()
{
GuiLock __;
return top && GetTop()->coco ? GetTop()->coco->owner : NULL;

3
uppsrc/ide/ide.lay
View file

@ -1026,5 +1026,4 @@ LAYOUT(SeqLayout, 764, 544)
ITEM(Upp::Label, dv___18, SetLabel(t_("Prefix")).LeftPosZ(448, 32).TopPosZ(8, 19))
ITEM(Upp::Label, dv___19, SetLabel(t_("Postfix")).LeftPosZ(672, 32).TopPosZ(8, 19))
ITEM(Upp::EditString, postfix, LeftPosZ(708, 48).TopPosZ(8, 19))
END_LAYOUT
END_LAYOUT