ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/MacOSX/Emulator.mm
(Generate patch)

Comparing BasiliskII/src/MacOSX/Emulator.mm (file contents):
Revision 1.2 by nigel, 2002-05-23T12:48:38Z vs.
Revision 1.3 by nigel, 2002-05-30T12:36:17Z

# Line 151 | Line 151
151  
152   - (IBAction) Interrupt: (id)sender;
153   {
154 <        WarningSheet (@"Interrupt action not yet supported", @"", @"OK", win);
154 >        WarningSheet (@"Interrupt action not yet supported", win);
155   }
156  
157   - (IBAction) PowerKey:  (id)sender;
# Line 216 | Line 216
216          if ( screen == nil || uaeCreated == NO  )
217                  WarningSheet(@"The emulator has not yet started.",
218                                           @"There is no screen output to snapshot",
219 <                                         @"OK", win);
219 >                                         nil, win);
220          else
221          {
222                  NSData  *TIFFdata;
# Line 310 | Line 310 | uint8 lastXPRAM[XPRAM_SIZE];           // Copy of
310   - (void) createThreads
311   {
312   #ifdef USE_PTHREADS
313 <        [NSThread detachNewThreadSelector:(SEL)"" toTarget:nil withObject:nil]; // Make UI threadsafe
313 >        // Make UI threadsafe:
314 >        [NSThread detachNewThreadSelector:(SEL)"" toTarget:nil withObject:nil];
315          //emul   = [[NNThread   alloc] initWithAutoReleasePool];
316   #endif
317          emul   = [[NNThread     alloc] init];
# Line 361 | Line 362 | uint8 lastXPRAM[XPRAM_SIZE];           // Copy of
362          extern uint8            *RAMBaseHost, *ROMBaseHost;
363          NSAutoreleasePool       *pool = [[NSAutoreleasePool alloc] init];
364  
364 – //      [screen allocBitmap];   // Do this first, because InitEmulator() calls VideoInit(), which needs the_bitmap.
365 –
365          InitEmulator();
366  
367          if ( RAMBaseHost == NULL || ROMBaseHost == NULL )
368 <                ErrorSheet(@"Cannot start Emulator.",
369 <                                   @"Emulator memory not allocated", @"OK", win);
368 >                ErrorSheet(@"Cannot start Emulator",
369 >                                   @"Emulator memory not allocated", nil, win);
370          else
371          {
372                  memcpy(lastXPRAM, XPRAM, XPRAM_SIZE);
373  
374                  uaeCreated = YES;               // Enable timers to access emulated Mac's memory
375  
376 <                while ( screen == nil ) // If init sets running, but we are still loading from Nib?
376 >                while ( screen == nil ) // If we are still loading from Nib?
377                          [NSThread sleepUntilDate:[NSDate dateWithTimeIntervalSinceNow: 1.0]];
378  
379   //              [screen readyToDraw];

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines