[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [401] trunk/fuse/fusepb

[<fr...@us...>]

Revision: 401
          http://svn.sourceforge.net/fuse-for-macosx/?rev=401&view=rev
Author:   fredm
Date:     2007-06-26 07:05:14 -0700 (Tue, 26 Jun 2007)

Log Message:
-----------
Fix for problem with closing debugger window.

Modified Paths:
--------------
    trunk/fuse/fusepb/controllers/DebuggerController.m
    trunk/fuse/fusepb/models/Emulator.h
    trunk/fuse/fusepb/models/Emulator.m
    trunk/fuse/fusepb/views/DisplayOpenGLView.h
    trunk/fuse/fusepb/views/DisplayOpenGLView.m

Modified: trunk/fuse/fusepb/controllers/DebuggerController.m
===================================================================
--- trunk/fuse/fusepb/controllers/DebuggerController.m	2007-06-26 12:07:47 UTC (rev 400)
+++ trunk/fuse/fusepb/controllers/DebuggerController.m	2007-06-26 14:05:14 UTC (rev 401)
@@ -26,6 +26,7 @@
 
 #import "DebuggerController.h"
 #import "DisplayOpenGLView.h"
+#import "Emulator.h"
 
 #include <config.h>
 
@@ -577,7 +578,7 @@
 int
 ui_debugger_activate( void )
 {
-  [[DebuggerController singleton] debugger_activate:nil];
+  [[Emulator instance] debuggerActivate];
 
   return 0;
 }

Modified: trunk/fuse/fusepb/models/Emulator.h
===================================================================
--- trunk/fuse/fusepb/models/Emulator.h	2007-06-26 12:07:47 UTC (rev 400)
+++ trunk/fuse/fusepb/models/Emulator.h	2007-06-26 14:05:14 UTC (rev 401)
@@ -169,4 +169,6 @@
 -(int) trdosDiskWrite:(trdos_drive_number)which;
 -(ui_confirm_joystick_t) confirmJoystick:(libspectrum_joystick)type inputs:(int)theInputs;
 
+-(void) debuggerActivate;
+
 @end

Modified: trunk/fuse/fusepb/models/Emulator.m
===================================================================
--- trunk/fuse/fusepb/models/Emulator.m	2007-06-26 12:07:47 UTC (rev 400)
+++ trunk/fuse/fusepb/models/Emulator.m	2007-06-26 14:05:14 UTC (rev 401)
@@ -724,4 +724,9 @@
   return [proxy_view confirmJoystick:type inputs:theInputs];
 }
 
+-(void) debuggerActivate
+{
+  [proxy_view debuggerActivate];
+}
+
 @end

Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.h	2007-06-26 12:07:47 UTC (rev 400)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.h	2007-06-26 14:05:14 UTC (rev 401)
@@ -196,6 +196,8 @@
 -(int) trdosDiskWrite:(trdos_drive_number)which;
 -(ui_confirm_joystick_t) confirmJoystick:(libspectrum_joystick)type inputs:(int)theInputs;
 
+-(void) debuggerActivate;
+
 -(void) mouseMoved:(NSEvent *)theEvent;
 -(void) mouseDown:(NSEvent *)theEvent;
 -(void) mouseUp:(NSEvent *)theEvent;

Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m	2007-06-26 12:07:47 UTC (rev 400)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m	2007-06-26 14:05:14 UTC (rev 401)
@@ -25,6 +25,7 @@
 #import "DisplayOpenGLView.h"
 #import "Emulator.h"
 #import "FuseController.h"
+#import "DebuggerController.h"
 
 #include <OpenGL/gl.h>
 #include <OpenGL/glext.h>
@@ -989,6 +990,11 @@
   return [[FuseController singleton] confirmJoystick:type inputs:theInputs];
 }
 
+-(void) debuggerActivate
+{
+  [[DebuggerController singleton] debugger_activate:nil];
+}
+
 -(void) mouseMoved:(NSEvent *)theEvent
 {
   [proxy_emulator mouseMoved:theEvent];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.