Mercurial > hg > toolkit / changeset

--- a/make/xcode/toolkit/toolkit.xcodeproj/project.pbxproj	Mon Jan 13 22:55:37 2025 +0100
+++ b/make/xcode/toolkit/toolkit.xcodeproj/project.pbxproj	Wed Jan 22 21:27:11 2025 +0100
@@ -29,7 +29,6 @@
 		ED6581272CFF1A3000F5402F /* iterator.c in Sources */ = {isa = PBXBuildFile; fileRef = ED6581132CFF1A3000F5402F /* iterator.c */; };
 		ED6581282CFF1A3000F5402F /* string.c in Sources */ = {isa = PBXBuildFile; fileRef = ED6581192CFF1A3000F5402F /* string.c */; };
 		ED6581292CFF1A3000F5402F /* allocator.c in Sources */ = {isa = PBXBuildFile; fileRef = ED6580F92CFF1A3000F5402F /* allocator.c */; };
-		ED65812A2CFF1A3000F5402F /* utils.c in Sources */ = {isa = PBXBuildFile; fileRef = ED65811C2CFF1A3000F5402F /* utils.c */; };
 		ED65812B2CFF1A3000F5402F /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = ED6580FB2CFF1A3000F5402F /* buffer.c */; };
 		ED65812C2CFF1A3000F5402F /* printf.c in Sources */ = {isa = PBXBuildFile; fileRef = ED6581182CFF1A3000F5402F /* printf.c */; };
 		ED65812D2CFF1A3000F5402F /* common.h.orig in Resources */ = {isa = PBXBuildFile; fileRef = ED6581022CFF1A3000F5402F /* common.h.orig */; };
@@ -100,7 +99,6 @@
 		ED6581182CFF1A3000F5402F /* printf.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = printf.c; path = /Users/olaf/Projekte/toolkit/ucx/printf.c; sourceTree = "<absolute>"; };
 		ED6581192CFF1A3000F5402F /* string.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = string.c; path = /Users/olaf/Projekte/toolkit/ucx/string.c; sourceTree = "<absolute>"; };
 		ED65811B2CFF1A3000F5402F /* tree.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tree.c; path = /Users/olaf/Projekte/toolkit/ucx/tree.c; sourceTree = "<absolute>"; };
-		ED65811C2CFF1A3000F5402F /* utils.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = utils.c; path = /Users/olaf/Projekte/toolkit/ucx/utils.c; sourceTree = "<absolute>"; };
 		ED65812F2CFF1A8800F5402F /* toolkit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = toolkit.h; path = /Users/olaf/Projekte/toolkit/ui/cocoa/toolkit.h; sourceTree = "<absolute>"; };
 		ED6581302CFF1A8800F5402F /* toolkit.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = toolkit.m; path = /Users/olaf/Projekte/toolkit/ui/cocoa/toolkit.m; sourceTree = "<absolute>"; };
 		ED6581322CFF1F1900F5402F /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = /Users/olaf/Projekte/toolkit/ui/cocoa/AppDelegate.h; sourceTree = "<absolute>"; };
@@ -225,7 +223,6 @@
 				ED6581182CFF1A3000F5402F /* printf.c */,
 				ED6581192CFF1A3000F5402F /* string.c */,
 				ED65811B2CFF1A3000F5402F /* tree.c */,
-				ED65811C2CFF1A3000F5402F /* utils.c */,
 			);
 			path = ucx;
 			sourceTree = "<group>";
@@ -408,7 +405,6 @@
 				ED6581442CFF3BCE00F5402F /* button.m in Sources */,
 				ED6581452CFF3BCE00F5402F /* Container.m in Sources */,
 				ED6581462CFF3BCE00F5402F /* GridLayout.m in Sources */,
-				ED65812A2CFF1A3000F5402F /* utils.c in Sources */,
 				ED6581392CFF287300F5402F /* EventData.m in Sources */,
 				ED65813A2CFF287300F5402F /* UiJob.m in Sources */,
 				ED65812B2CFF1A3000F5402F /* buffer.c in Sources */,

--- a/ui/cocoa/GridLayout.m	Mon Jan 13 22:55:37 2025 +0100
+++ b/ui/cocoa/GridLayout.m	Wed Jan 22 21:27:11 2025 +0100
@@ -208,7 +208,7 @@
 }
 
 - (void) dealloc {
-    cxListDestroy(_children);
+    cxListFree(_children);
 }
 
 @end

--- a/ui/ui/container.h	Mon Jan 13 22:55:37 2025 +0100
+++ b/ui/ui/container.h	Wed Jan 22 21:27:11 2025 +0100
@@ -293,6 +293,8 @@
 typedef UIWIDGET (*ui_createwidget_func)(UiObject *obj, UiWidgetArgs args, void *userdata);
 #elif defined(UI_MOTIF)
 typedef UIWIDGET (*ui_createwidget_func)(UiObject *obj, UiWidgetArgs args, void *userdata, Widget parent, Arg *a, int n);
+#elif defined(UI_COCOA)
+typedef UIWIDGET (*ui_createwidget_func)(UiObject *obj, UiWidgetArgs args, void *userdata);
 #endif
 UIEXPORT UIWIDGET ui_customwidget_create(UiObject *obj, ui_createwidget_func create_widget, void *userdata, UiWidgetArgs args);