designer: menu designer: clear current menu on form close (bug #0014181)

git-svn-id: trunk@20933 -

designer/menueditorform.lfm

@@ -3,16 +3,14 @@ object MainMenuEditorForm: TMainMenuEditorForm
   Height = 220
   Top = 155
   Width = 600
-  HorzScrollBar.Page = 599
-  VertScrollBar.Page = 219
   Caption = 'MainMenuEditorForm'
   ClientHeight = 220
   ClientWidth = 600
+  OnClose = FormClose
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  OnPaint = FormPaint
   Position = poScreenCenter
-  LCLVersion = '0.9.25'
+  LCLVersion = '0.9.27'
   object Label_menus: TLabel
     AnchorSideLeft.Control = List_menus
     AnchorSideRight.Side = asrBottom
@@ -31,17 +29,22 @@ object MainMenuEditorForm: TMainMenuEditorForm
     AnchorSideRight.Control = List_menus
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
+    Left = 0
     Height = 220
+    Top = 0
     Width = 408
-    AutoScroll = True
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Right = 6
+    ClientHeight = 216
+    ClientWidth = 404
     TabOrder = 0
     object Panel: TPanel
       AnchorSideLeft.Control = MenuScrollBox
       AnchorSideTop.Control = MenuScrollBox
       AnchorSideBottom.Side = asrBottom
+      Left = 0
       Height = 212
+      Top = 0
       Width = 200
       BevelOuter = bvNone
       TabOrder = 0
@@ -58,6 +61,7 @@ object MainMenuEditorForm: TMainMenuEditorForm
     Width = 180
     Anchors = [akTop, akRight, akBottom]
     BorderSpacing.Around = 6
+    ItemHeight = 0
     OnClick = List_menusClick
     TabOrder = 1
   end

designer/menueditorform.lrs

@@ -1,25 +1,28 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TMainMenuEditorForm','FORMDATA',[
   'TPF0'#19'TMainMenuEditorForm'#18'MainMenuEditorForm'#4'Left'#3'.'#1#6'Height'
-  +#3#220#0#3'Top'#3#155#0#5'Width'#3'X'#2#18'HorzScrollBar.Page'#3'W'#2#18'Ver'
-  +'tScrollBar.Page'#3#219#0#7'Caption'#6#18'MainMenuEditorForm'#12'ClientHeigh'
-  +'t'#3#220#0#11'ClientWidth'#3'X'#2#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'
-  +#7#11'FormDestroy'#7'OnPaint'#7#9'FormPaint'#8'Position'#7#14'poScreenCenter'
-  +#10'LCLVersion'#6#6'0.9.25'#0#6'TLabel'#11'Label_menus'#22'AnchorSideLeft.Co'
-  +'ntrol'#7#10'List_menus'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSi'
-  +'deBottom.Control'#7#10'List_menus'#4'Left'#3#158#1#6'Height'#2#14#3'Top'#2
-  +#10#5'Width'#2'?'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#11'Labe'
-  +'l_menus'#11'ParentColor'#8#0#0#10'TScrollBox'#13'MenuScrollBox'#22'AnchorSi'
-  +'deLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSi'
-  +'deRight.Control'#7#10'List_menus'#24'AnchorSideBottom.Control'#7#5'Owner'#21
-  +'AnchorSideBottom.Side'#7#9'asrBottom'#6'Height'#3#220#0#5'Width'#3#152#1#10
-  +'AutoScroll'#9#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#19
-  +'BorderSpacing.Right'#2#6#8'TabOrder'#2#0#0#6'TPanel'#5'Panel'#22'AnchorSide'
-  +'Left.Control'#7#13'MenuScrollBox'#21'AnchorSideTop.Control'#7#13'MenuScroll'
-  +'Box'#21'AnchorSideBottom.Side'#7#9'asrBottom'#6'Height'#3#212#0#5'Width'#3
-  +#200#0#10'BevelOuter'#7#6'bvNone'#8'TabOrder'#2#0#0#0#0#8'TListBox'#10'List_'
-  +'menus'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
-  +'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'
-  +#7#9'asrBottom'#4'Left'#3#158#1#6'Height'#3#184#0#3'Top'#2#30#5'Width'#3#180
-  +#0#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2
-  +#6#7'OnClick'#7#15'List_menusClick'#8'TabOrder'#2#1#0#0#0
+  +#3#220#0#3'Top'#3#155#0#5'Width'#3'X'#2#7'Caption'#6#18'MainMenuEditorForm'
+  +#12'ClientHeight'#3#220#0#11'ClientWidth'#3'X'#2#7'OnClose'#7#9'FormClose'#8
+  +'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDestroy'#8'Position'#7#14
+  +'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#6'TLabel'#11'Label_menus'#22'A'
+  +'nchorSideLeft.Control'#7#10'List_menus'#20'AnchorSideRight.Side'#7#9'asrBot'
+  +'tom'#24'AnchorSideBottom.Control'#7#10'List_menus'#4'Left'#3#158#1#6'Height'
+  +#2#14#3'Top'#2#10#5'Width'#2'?'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Capt'
+  +'ion'#6#11'Label_menus'#11'ParentColor'#8#0#0#10'TScrollBox'#13'MenuScrollBo'
+  +'x'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owne'
+  +'r'#23'AnchorSideRight.Control'#7#10'List_menus'#24'AnchorSideBottom.Control'
+  +#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3
+  +#220#0#3'Top'#2#0#5'Width'#3#152#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
+  +'t'#8'akBottom'#0#19'BorderSpacing.Right'#2#6#12'ClientHeight'#3#216#0#11'Cl'
+  +'ientWidth'#3#148#1#8'TabOrder'#2#0#0#6'TPanel'#5'Panel'#22'AnchorSideLeft.C'
+  +'ontrol'#7#13'MenuScrollBox'#21'AnchorSideTop.Control'#7#13'MenuScrollBox'#21
+  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3#212#0#3'Top'#2
+  +#0#5'Width'#3#200#0#10'BevelOuter'#7#6'bvNone'#8'TabOrder'#2#0#0#0#0#8'TList'
+  +'Box'#10'List_menus'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRig'
+  +'ht.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSi'
+  +'deBottom.Side'#7#9'asrBottom'#4'Left'#3#158#1#6'Height'#3#184#0#3'Top'#2#30
+  +#5'Width'#3#180#0#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#20'BorderS'
+  +'pacing.Around'#2#6#10'ItemHeight'#2#0#7'OnClick'#7#15'List_menusClick'#8'Ta'
+  +'bOrder'#2#1#0#0#0
 ]);

designer/menueditorform.pas

@@ -49,9 +49,9 @@ type
     Label_menus: TLabel;
     MenuScrollBox: TScrollBox;
     Panel: TPanel;
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
-    procedure FormPaint(Sender: TObject);
     procedure List_menusClick(Sender: TObject);
   private
     FDesignerMainMenu: TDesignerMainMenu;
@@ -126,16 +126,18 @@ begin
   GlobalDesignHook.AddHandlerPersistentAdded(@OnPersistentAdded);
 end;
 
+procedure TMainMenuEditorForm.FormClose(Sender: TObject;
+  var CloseAction: TCloseAction);
+begin
+  SetMenu(nil);
+end;
+
 procedure TMainMenuEditorForm.FormDestroy(Sender: TObject);
 begin
   if GlobalDesignHook <> nil then
     GlobalDesignHook.RemoveAllHandlersForObject(Self);
 end;
 
-procedure TMainMenuEditorForm.FormPaint(Sender: TObject);
-begin
-end;
-
 procedure TMainMenuEditorForm.List_menusClick(Sender: TObject);
 var
   i, j: Integer;