diff --git a/debugger/debuggerdlg.pp b/debugger/debuggerdlg.pp
index b556d4453a..be6562b112 100644
--- a/debugger/debuggerdlg.pp
+++ b/debugger/debuggerdlg.pp
@@ -37,17 +37,18 @@ unit DebuggerDlg;
 interface
 
 uses
-  Forms, Debugger;
+  Classes, Forms, IDEProcs, Debugger, EnvironmentOpts;
 
 type
   TDebuggerDlgClass = class of TDebuggerDlg;
   
   TDebuggerDlg = class(TForm)
-  private                        
+  private
     FDebugger: TDebugger;
   protected                                              
     procedure SetDebugger(const ADebugger: TDebugger); virtual;
-  public 
+    procedure DoClose(var Action: TCloseAction); override;
+  public
     destructor Destroy; override;
     property Debugger: TDebugger read FDebugger write SetDebugger;
   end;
@@ -62,14 +63,22 @@ begin
   inherited;
 end;
 
-procedure TDebuggerDlg.SetDebugger(const ADebugger: TDebugger); 
+procedure TDebuggerDlg.SetDebugger(const ADebugger: TDebugger);
 begin
   FDebugger := ADebugger; 
 end;
 
+procedure TDebuggerDlg.DoClose(var Action: TCloseAction);
+begin
+  inherited DoClose(Action);
+  EnvironmentOptions.IDEWindowLayoutList.ItemByForm(Self).GetCurrentPosition;
+end;
 
 { =============================================================================
   $Log$
+  Revision 1.3  2003/05/18 10:42:58  mattias
+  implemented deleting empty submenus
+
   Revision 1.2  2002/05/10 06:57:48  lazarus
   MG: updated licenses
 
diff --git a/debugger/watchesdlg.pp b/debugger/watchesdlg.pp
index a1833da973..3fc2d6d4ef 100644
--- a/debugger/watchesdlg.pp
+++ b/debugger/watchesdlg.pp
@@ -39,7 +39,7 @@ interface
 
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, LResources, StdCtrls,
-  Buttons, Extctrls, Menus, ComCtrls, Debugger, DebuggerDlg;
+  Buttons, Extctrls, Menus, ComCtrls, Debugger, DebuggerDlg, WatchPropertyDlg;
 
 type
   TWatchesDlg = class(TDebuggerDlg)
@@ -81,14 +81,13 @@ type
 
 implementation
 
-uses
-  WatchPropertyDlg;
 
 { TWatchesDlg }
 
 constructor TWatchesDlg.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
+  Name:='WatchesDlg';
   FWatchesNotification := TDBGWatchesNotification.Create;
   FWatchesNotification.AddReference;
   FWatchesNotification.OnAdd := @WatchAdd;
@@ -264,6 +263,9 @@ end.
 
 { =============================================================================
   $Log$
+  Revision 1.5  2003/05/18 10:42:58  mattias
+  implemented deleting empty submenus
+
   Revision 1.4  2002/05/30 22:45:57  lazarus
   MWE:
     - Removed menucreation from loaded since streaming works
diff --git a/ide/main.pp b/ide/main.pp
index 8311618d09..0f7f0d0e44 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -38,8 +38,6 @@ interface
 
 {$I ide.inc}
 
-{ $DEFINE UseNewMenuEditor}
-
 uses
 {$IFDEF IDE_MEM_CHECK}
   MemCheck,
@@ -8564,7 +8562,7 @@ var
   l: TNonModalIDEWindow;
 begin
   if (ALayout=nil) or (ALayout.Form=nil) then exit;
-//writeln('AAA TMainIDE.OnApplyWindowLayout ',ALayout.Form.Name,' ',ALayout.Form.Classname,' ',IDEWindowPlacementNames[ALayout.WindowPlacement],' ',ALayout.CustomCoordinatesAreValid,' ',ALayout.Left,' ',ALayout.Top,' ',ALayout.Width,' ',ALayout.Height);
+  // writeln('AAA TMainIDE.OnApplyWindowLayout ',ALayout.Form.Name,' ',ALayout.Form.Classname,' ',IDEWindowPlacementNames[ALayout.WindowPlacement],' ',ALayout.CustomCoordinatesAreValid,' ',ALayout.Left,' ',ALayout.Top,' ',ALayout.Width,' ',ALayout.Height);
   if (ALayout.WindowPlacement in [iwpCustomPosition,iwpRestoreWindowGeometry])
   and (ALayout.CustomCoordinatesAreValid) then begin
     // explicit position
@@ -8639,6 +8637,9 @@ end.
 
 { =============================================================================
   $Log$
+  Revision 1.567  2003/05/18 10:42:57  mattias
+  implemented deleting empty submenus
+
   Revision 1.566  2003/05/14 07:12:35  mattias
   fixed hiding destroyed components