From 69f0d253be389fa6b32e99e8d28f87fc11400035 Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Mon, 4 Jun 2007 22:01:20 +0000
Subject: [PATCH]  * Never disable Ctrl+F9 if it is Continue

git-svn-id: trunk@7578 -
---
 ide/fpconst.pas |  1 +
 ide/fpide.pas   |  6 ++++--
 ide/fpmrun.inc  | 13 +++++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ide/fpconst.pas b/ide/fpconst.pas
index 45c428bd74..a9f1427b4b 100644
--- a/ide/fpconst.pas
+++ b/ide/fpconst.pas
@@ -276,6 +276,7 @@ const
 
      cmDebuggerStopped   = 2600;
      cmDisassemble       = 2601;
+     cmContinue          = 2602;
 
      cmSymBrowse         = 2700;
      cmSymGotoSource     = 2701;
diff --git a/ide/fpide.pas b/ide/fpide.pas
index d1713dd4ca..e1f994009a 100644
--- a/ide/fpide.pas
+++ b/ide/fpide.pas
@@ -385,6 +385,7 @@ resourcestring  menu_local_gotosource = '~G~oto source';
                 menu_key_run_stepover  = 'F8';
                 menu_key_run_traceinto = 'F7';
                 menu_key_run_conttocursor = 'F4';
+                menu_key_run_untilreturn= 'Alt+F4';
                 menu_key_run_resetdebugger = 'Ctrl+F2';
 
                 menu_key_compile_compile = 'Alt+F9';
@@ -892,7 +893,7 @@ begin
       NewItem(menu_run_stepover,menu_key_run_stepover, kbF8, cmStepOver, hcRun,
       NewItem(menu_run_traceinto,menu_key_run_traceinto, kbF7, cmTraceInto, hcRun,
       NewItem(menu_run_conttocursor,menu_key_run_conttocursor, kbF4, cmContToCursor, hcContToCursor,
-      NewItem(menu_run_untilreturn,'', kbNoKey,cmUntilReturn,hcUntilReturn,
+      NewItem(menu_run_untilreturn,menu_key_run_untilreturn, kbAltF4,cmUntilReturn,hcUntilReturn,
       NewItem(menu_run_rundir,'', kbNoKey, cmRunDir, hcRunDir,
       NewItem(menu_run_parameters,'', kbNoKey, cmParameters, hcParameters,
       NewItem(menu_run_resetdebugger,menu_key_run_resetdebugger, kbCtrlF2, cmResetDebugger, hcResetDebugger,
@@ -1257,7 +1258,8 @@ begin
              cmParameters    : Parameters;
              cmStepOver      : DoStepOver;
              cmTraceInto     : DoTraceInto;
-             cmRun           : DoRun;
+             cmRun,
+             cmContinue      : DoRun;
              cmResetDebugger : DoResetDebugger;
              cmContToCursor  : DoContToCursor;
              cmUntilReturn   : DoContUntilReturn;
diff --git a/ide/fpmrun.inc b/ide/fpmrun.inc
index 6473dec9c5..7fb758c148 100644
--- a/ide/fpmrun.inc
+++ b/ide/fpmrun.inc
@@ -284,14 +284,23 @@ procedure TIDEApp.UpdateRunMenu(DebuggeeRunning : boolean);
 var MenuItem : PMenuItem;
 begin
   MenuItem:=PAdvancedMenuBar(MenuBar)^.GetMenuItem(cmRun);
+  if not assigned(MenuItem) then
+    MenuItem:=PAdvancedMenuBar(MenuBar)^.GetMenuItem(cmContinue);
+
   if assigned(MenuItem) then
     begin
       If assigned(MenuItem^.Name) then
         DisposeStr(MenuItem^.Name);
       if DebuggeeRunning then
-        MenuItem^.Name:=NewStr(menu_run_continue)
+        begin
+          MenuItem^.Name:=NewStr(menu_run_continue);
+          MenuItem^.command:=cmContinue;
+        end
       else
-        MenuItem^.Name:=NewStr(menu_run_run);
+        begin
+          MenuItem^.Name:=NewStr(menu_run_run);
+          MenuItem^.command:=cmRun;
+        end;
     end;
   MenuItem:=PAdvancedMenuBar(MenuBar)^.GetMenuItem(cmResetDebugger);
   if assigned(MenuItem) then