From 2ce8896560490e8830dec71f9f86f6af92d896cc Mon Sep 17 00:00:00 2001
From: Mirek Fidler <mirek.fidler@gmail.com>
Date: Thu, 25 Jun 2026 18:18:56 +0200
Subject: [PATCH] Fixed to compile in macos

---
 uppsrc/CtrlCore/CocoApp.mm | 6 +++---
 uppsrc/CtrlCore/CocoWin.mm | 2 +-
 uppsrc/ide/ide.lay         | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/uppsrc/CtrlCore/CocoApp.mm b/uppsrc/CtrlCore/CocoApp.mm
index 708e98351..4dec97d6b 100644
--- a/uppsrc/CtrlCore/CocoApp.mm
+++ b/uppsrc/CtrlCore/CocoApp.mm
@@ -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);
 }
 
diff --git a/uppsrc/CtrlCore/CocoWin.mm b/uppsrc/CtrlCore/CocoWin.mm
index 12331112d..818bbf643 100644
--- a/uppsrc/CtrlCore/CocoWin.mm
+++ b/uppsrc/CtrlCore/CocoWin.mm
@@ -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;
diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay
index 58b21aae8..b5125fe12 100644
--- a/uppsrc/ide/ide.lay
+++ b/uppsrc/ide/ide.lay
@@ -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
\ No newline at end of file