From 58e21fe3cc9129c99d9ded9e6029856286a1c8ba Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sat, 20 May 2006 20:28:06 +0000
Subject: [PATCH] Merged revisions 3604 via svnmerge from
 http://svn.freepascal.org/svn/fpc/trunk

r3604 (daniel)
  * Fix disabled commands on reloading menubar.

git-svn-id: branches/fixes_2_0@3605 -
---
 ide/fpide.pas | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ide/fpide.pas b/ide/fpide.pas
index 9d8654fb4f..54cbd81d8f 100644
--- a/ide/fpide.pas
+++ b/ide/fpide.pas
@@ -31,6 +31,7 @@ type
       IsRunning : boolean;
       constructor Init;
       procedure   InitDesktop; virtual;
+      procedure   LoadMenuBar;
       procedure   InitMenuBar; virtual;
       procedure   reload_menubar;
       procedure   InitStatusLine; virtual;
@@ -302,7 +303,7 @@ begin
   Desktop:=New(PFPDesktop, Init(R));
 end;
 
-procedure TIDEApp.InitMenuBar;
+procedure TIDEApp.LoadMenuBar;
 
 var R: TRect;
     WinPMI : PMenuItem;
@@ -487,6 +488,12 @@ begin
       NewItem(menu_help_about,'',kbNoKey, cmAbout, hcAbout,
       nil))))))))),
     nil)))))))))))));
+end;
+
+procedure TIDEApp.InitMenuBar;
+
+begin
+  LoadMenuBar;
   DisableCommands(EditorCmds+SourceCmds+CompileCmds);
   // Update; Desktop is still nil at that point ...
 end;
@@ -518,7 +525,7 @@ begin
          paste_key:=kbShiftIns;
        end;
    end;
-   initmenubar;
+   loadmenubar;
    insert(menubar);
 end;