Merged revisions 7578 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
  r7578 | pierre | 2007-06-05 00:01:20 +0200 (Tue, 05 Jun 2007) | 1 line
  
   * Never disable Ctrl+F9 if it is Continue
........

git-svn-id: branches/fixes_2_2@7592 -

ide/fpconst.pas

@@ -276,6 +276,7 @@ const
 
      cmDebuggerStopped   = 2600;
      cmDisassemble       = 2601;
+     cmContinue          = 2602;
 
      cmSymBrowse         = 2700;
      cmSymGotoSource     = 2701;

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';
@@ -891,7 +892,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,
@@ -1256,7 +1257,8 @@ begin
              cmParameters    : Parameters;
              cmStepOver      : DoStepOver;
              cmTraceInto     : DoTraceInto;
-             cmRun           : DoRun;
+             cmRun,
+             cmContinue      : DoRun;
              cmResetDebugger : DoResetDebugger;
              cmContToCursor  : DoContToCursor;
              cmUntilReturn   : DoContUntilReturn;

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