comparison src/main/macosx/SDLMain.m @ 1659:14717b52abc0 SDL-1.3

Merge trunk-1.3-3
author Sam Lantinga <slouken@libsdl.org>
date Wed, 17 May 2006 08:18:28 +0000
parents 24247fe40188
children 782fd950bd46 f00b6b19d57e
comparison
equal deleted inserted replaced
1658:e49147870aac 1659:14717b52abc0
250 * 250 *
251 * This message is ignored once the app's mainline has been called. 251 * This message is ignored once the app's mainline has been called.
252 */ 252 */
253 - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename 253 - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
254 { 254 {
255 const char *temparg;
256 size_t arglen;
257 char *arg;
258 char **newargv;
259
255 if (!gFinderLaunch) /* MacOS is passing command line args. */ 260 if (!gFinderLaunch) /* MacOS is passing command line args. */
256 return FALSE; 261 return FALSE;
257 262
258 if (gCalledAppMainline) /* app has started, ignore this document. */ 263 if (gCalledAppMainline) /* app has started, ignore this document. */
259 return FALSE; 264 return FALSE;
260 265
261 const char *temparg = [filename UTF8String]; 266 temparg = [filename UTF8String];
262 size_t arglen = SDL_strlen(temparg) + 1; 267 arglen = SDL_strlen(temparg) + 1;
263 char *arg = (char *) SDL_malloc(arglen); 268 arg = (char *) SDL_malloc(arglen);
264 if (arg == NULL) 269 if (arg == NULL)
265 return FALSE; 270 return FALSE;
266 271
267 char **newargv = (char **) realloc(gArgv, sizeof (char *) * (gArgc + 2)); 272 newargv = (char **) realloc(gArgv, sizeof (char *) * (gArgc + 2));
268 if (newargv == NULL) 273 if (newargv == NULL)
269 { 274 {
270 SDL_free(arg); 275 SDL_free(arg);
271 return FALSE; 276 return FALSE;
272 } 277 }
374 #else 379 #else
375 CustomApplicationMain (argc, argv); 380 CustomApplicationMain (argc, argv);
376 #endif 381 #endif
377 return 0; 382 return 0;
378 } 383 }
384