X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/86e60e3d907db72ccb60783b2bdab4fc3890f169..916237482fc9d37833845193e8538d2440e20777:/osx.m

diff --git a/osx.m b/osx.m
index e19db27..ec9b6f9 100644
--- a/osx.m
+++ b/osx.m
@@ -167,6 +167,18 @@ void document_add_puzzle(document *doc, const game *game, game_params *par,
 {
 }
 
+/*
+ * setAppleMenu isn't listed in the NSApplication header, but an
+ * NSApp responds to it, so we're adding it here to silence
+ * warnings. (This was removed from the headers in 10.4, so we
+ * only need to include it for 10.4+.)
+ */
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040
+@interface NSApplication(NSAppleMenu)
+- (void)setAppleMenu:(NSMenu *)menu;
+@end
+#endif
+
 /* ----------------------------------------------------------------------
  * Tiny extension to NSMenuItem which carries a payload of a `void
  * *', allowing several menu items to invoke the same message but
@@ -407,13 +419,14 @@ struct frontend {
     NSTextField *status;
 }
 - (id)initWithGame:(const game *)g;
-- dealloc;
+- (void)dealloc;
 - (void)processButton:(int)b x:(int)x y:(int)y;
 - (void)keyDown:(NSEvent *)ev;
 - (void)activateTimer;
 - (void)deactivateTimer;
 - (void)setStatusLine:(char *)text;
 - (void)resizeForNewGameParams;
+- (void)updateTypeMenuTick;
 @end
 
 @implementation MyImageView
@@ -540,7 +553,7 @@ struct frontend {
     /*
      * Create the status bar, which will just be an NSTextField.
      */
-    if (ourgame->wants_statusbar()) {
+    if (midend_wants_statusbar(me)) {
 	status = [[NSTextField alloc] initWithFrame:NSMakeRect(0,0,100,50)];
 	[status setEditable:NO];
 	[status setSelectable:NO];
@@ -590,7 +603,7 @@ struct frontend {
     return self;
 }
 
-- dealloc
+- (void)dealloc
 {
     int i;
     for (i = 0; i < fe.ncolours; i++) {
@@ -598,7 +611,7 @@ struct frontend {
     }
     sfree(fe.colours);
     midend_free(me);
-    return [super dealloc];
+    [super dealloc];
 }
 
 - (void)processButton:(int)b x:(int)x y:(int)y
@@ -713,7 +726,7 @@ struct frontend {
     NSSavePanel *sp = [NSSavePanel savePanel];
 
     if ([sp runModal] == NSFileHandlingPanelOKButton) {
-	const char *name = [[sp filename] cString];
+       const char *name = [[sp filename] UTF8String];
 
         FILE *fp = fopen(name, "w");
 
@@ -754,6 +767,7 @@ struct frontend {
         }
 
 	[self resizeForNewGameParams];
+	[self updateTypeMenuTick];
     }
 }
 - (void)undoMove:(id)sender
@@ -803,6 +817,19 @@ struct frontend {
 {
     while ([typemenu numberOfItems] > 1)
 	[typemenu removeItemAtIndex:0];
+    [[typemenu itemAtIndex:0] setState:NSOffState];
+}
+
+- (void)updateTypeMenuTick
+{
+    int i, total, n;
+
+    total = [typemenu numberOfItems];
+    n = midend_which_preset(me);
+    if (n < 0)
+	n = total - 1;		       /* that's always where "Custom" lives */
+    for (i = 0; i < total; i++)
+	[[typemenu itemAtIndex:i] setState:(i == n ? NSOnState : NSOffState)];
 }
 
 - (void)becomeKeyWindow
@@ -837,6 +864,8 @@ struct frontend {
 	    [typemenu insertItem:item atIndex:0];
 	}
     }
+
+    [self updateTypeMenuTick];
 }
 
 - (void)resignKeyWindow
@@ -882,6 +911,7 @@ struct frontend {
     midend_new_game(me);
 
     [self resizeForNewGameParams];
+    [self updateTypeMenuTick];
 }
 
 - (void)startConfigureSheet:(int)which
@@ -1179,7 +1209,7 @@ struct frontend {
 	      case C_STRING:
 		sfree(i->sval);
 		i->sval = dupstr([[[(id)cfg_controls[k+1] cell]
-				   title] cString]);
+                                  title] UTF8String]);
 		k += 2;
 		break;
 	      case C_BOOLEAN:
@@ -1203,6 +1233,7 @@ struct frontend {
 	} else {
 	    midend_new_game(me);
 	    [self resizeForNewGameParams];
+	    [self updateTypeMenuTick];
 	}
     }
     sfree(cfg_controls);
@@ -1219,9 +1250,7 @@ struct frontend {
 
 - (void)setStatusLine:(char *)text
 {
-    char *rewritten = midend_rewrite_statusbar(me, text);
-    [[status cell] setTitle:[NSString stringWithCString:rewritten]];
-    sfree(rewritten);
+    [[status cell] setTitle:[NSString stringWithCString:text]];
 }
 
 @end
@@ -1588,4 +1617,6 @@ int main(int argc, char **argv)
 
     [NSApp run];
     [pool release];
+
+    return 0;
 }