{
}
+/*
+ * 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
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;
fe.window = self;
- me = midend_new(&fe, ourgame, osx_drawing, &fe);
+ me = midend_new(&fe, ourgame, &osx_drawing, &fe);
/*
* If we ever need to open a fresh window using a provided game
* ID, I think the right thing is to move most of this method
/*
* 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];
return self;
}
-- dealloc
+- (void)dealloc
{
int i;
for (i = 0; i < fe.ncolours; i++) {
}
sfree(fe.colours);
midend_free(me);
- return [super dealloc];
+ [super dealloc];
}
- (void)processButton:(int)b x:(int)x y:(int)y
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");
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:
- (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
point.x -= size.width / 2;
if (align & ALIGN_VCENTRE)
point.y -= size.height / 2;
+ else
+ point.y -= size.height;
[string drawAtPoint:point withAttributes:attr];
}
}
static void osx_blitter_load(void *handle, blitter *bl, int x, int y)
{
- frontend *fe = (frontend *)handle;
+ /* frontend *fe = (frontend *)handle; */
if (x == BLITTER_FROMSAVED && y == BLITTER_FROMSAVED) {
x = bl->x;
y = bl->y;
osx_draw_text,
osx_draw_rect,
osx_draw_line,
- osx_draw_poly,
+ osx_draw_polygon,
osx_draw_circle,
osx_draw_update,
osx_clip,
[NSApp run];
[pool release];
+
+ return 0;
}