ui/cocoa/toolkit.m

changeset 113
dde28a806552
parent 112
c3f2f16fa4b8
--- a/ui/cocoa/toolkit.m	Sun Oct 19 21:20:08 2025 +0200
+++ b/ui/cocoa/toolkit.m	Mon Nov 10 21:52:51 2025 +0100
@@ -57,6 +57,7 @@
 
 /* ------------------- App Init / Event Loop functions ------------------- */
 
+
 void ui_init(const char *appname, int argc, char **argv) {
     application_name = appname;
     app_argc = argc;
@@ -69,7 +70,9 @@
 
     uic_load_app_properties();
 
-    [NSApplication sharedApplication];
+    NSApplication *app = [NSApplication sharedApplication];
+    //[app setActivationPolicy:NSApplicationActivationPolicyRegular];
+    
     //[NSBundle loadNibNamed:@"MainMenu" owner:NSApp ];
     //[[NSBundle mainBundle] loadNibNamed:@"MainMenu" owner:NSApp topLevelObjects:&topLevelObjects];
     
@@ -178,8 +181,8 @@
 @implementation UiAppCallback
 
 - (id) initWithCallback:(ui_threadfunc)func userdata:(void*)userdata {
-    self->callback = func;
-    self->userdata = userdata;
+    _callback = func;
+    _userdata = userdata;
     return self;
 }
 
@@ -190,7 +193,9 @@
 }
 
 - (void) mainThread:(id)n {
-    callback(userdata);
+    if(_callback) {
+        _callback(_userdata);
+    }
 }
 
 @end

mercurial