zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Syntactic fixes by Zach Wily to make the OS X build work under 10.5.

Browse Source 
[originally from svn r7836]
This commit is contained in:
Simon Tatham
2008-01-15 18:04:13 +00:00
parent 5b9a5aa4cb
commit 433e615006
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
osx.m
View File

@ -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 * Tiny extension to NSMenuItem which carries a payload of a `void
* *', allowing several menu items to invoke the same message but * *', allowing several menu items to invoke the same message but
@ -407,7 +419,7 @@ struct frontend {
NSTextField *status; NSTextField *status;
} }
- (id)initWithGame:(const game *)g; - (id)initWithGame:(const game *)g;
- dealloc; - (void)dealloc;
- (void)processButton:(int)b x:(int)x y:(int)y; - (void)processButton:(int)b x:(int)x y:(int)y;
- (void)keyDown:(NSEvent *)ev; - (void)keyDown:(NSEvent *)ev;
- (void)activateTimer; - (void)activateTimer;
@ -590,7 +602,7 @@ struct frontend {
return self; return self;
} }
- dealloc - (void)dealloc
{ {
int i; int i;
for (i = 0; i < fe.ncolours; i++) { for (i = 0; i < fe.ncolours; i++) {
@ -598,7 +610,7 @@ struct frontend {
} }
sfree(fe.colours); sfree(fe.colours);
midend_free(me); midend_free(me);
return [super dealloc]; [super dealloc];
} }
- (void)processButton:(int)b x:(int)x y:(int)y - (void)processButton:(int)b x:(int)x y:(int)y
@ -713,7 +725,7 @@ struct frontend {
NSSavePanel *sp = [NSSavePanel savePanel]; NSSavePanel *sp = [NSSavePanel savePanel];
if ([sp runModal] == NSFileHandlingPanelOKButton) { if ([sp runModal] == NSFileHandlingPanelOKButton) {
const char *name = [[sp filename] cString]; const char *name = [[sp filename] UTF8String];
FILE *fp = fopen(name, "w"); FILE *fp = fopen(name, "w");
@ -1179,7 +1191,7 @@ struct frontend {
case C_STRING: case C_STRING:
sfree(i->sval); sfree(i->sval);
i->sval = dupstr([[[(id)cfg_controls[k+1] cell] i->sval = dupstr([[[(id)cfg_controls[k+1] cell]
title] cString]); title] UTF8String]);
k += 2; k += 2;
break; break;
case C_BOOLEAN: case C_BOOLEAN:
@ -1586,4 +1598,6 @@ int main(int argc, char **argv)
[NSApp run]; [NSApp run];
[pool release]; [pool release];
return 0;
} }