diff --git a/ide/projectopts.pp b/ide/projectopts.pp
index e3ad5a825b..17f2e5202c 100644
--- a/ide/projectopts.pp
+++ b/ide/projectopts.pp
@@ -335,7 +335,7 @@ begin
     Parent:=NoteBook.Page[1];
     Left:=FormsAutoCreatedListBox.Left+5;
     Top:=FormsAutoCreatedListBox.Top+FormsAutoCreatedListBox.Height+5;
-    Width:=300;
+    Width:=400;
     Height:=25;
     Caption:=dlgAutoCreateNewForms;
   end;
@@ -424,7 +424,7 @@ begin
   with FormsAutoCreateNewFormsCheckBox do begin
     Left:=FormsMoveAutoCreatedFormUpBtn.Left;
     Top:=FormsAutoCreatedListBox.Top+FormsAutoCreatedListBox.Height+5;
-    Width:=300;
+    Width:=Parent.ClientWidth-Left;
     Height:=25;
   end;
 end;
diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp
index 16ee64a33a..65e7cdea54 100644
--- a/lcl/comctrls.pp
+++ b/lcl/comctrls.pp
@@ -971,7 +971,14 @@ type
   TNodeState = (nsCut, nsDropHilited, nsFocused, nsSelected, nsMultiSelected,
                 nsExpanded, nsHasChildren);
   TNodeStates = set of TNodeState;
-  TNodeAttachMode = (naAdd, naAddFirst, naAddChild, naAddChildFirst, naInsert);
+  TNodeAttachMode = (
+    naAdd,           // add as last sibling of Destination
+    naAddFirst,      // add as first sibling of Destnation
+    naAddChild,      // add as last child of Destination
+    naAddChildFirst, // add as first child of Destination
+    naInsert,        // insert in front of Destination
+    naInsertBehind   // insert behind Destination
+    );
 
   TAddMode = (taAddFirst, taAdd, taInsert);
 
@@ -982,7 +989,8 @@ type
 
 const
   NodeAttachModeNames: array[TNodeAttachMode] of string =
-    ('naAdd', 'naAddFirst', 'naAddChild', 'naAddChildFirst', 'naInsert');
+    ('naAdd', 'naAddFirst', 'naAddChild', 'naAddChildFirst',
+     'naInsert', 'naInsertBehind');
   AddModeNames: array[TAddMode] of string =
     ('taAddFirst', 'taAdd', 'taInsert');
   LCLStreamID = -7;
@@ -1761,6 +1769,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.78  2003/06/18 11:21:06  mattias
+  fixed taborder=0, implemented TabOrder Editor
+
   Revision 1.77  2003/06/13 21:13:20  mattias
   fixed TTrackBar initial size
 
diff --git a/lcl/include/treeview.inc b/lcl/include/treeview.inc
index 9b784a922f..bb6f491ccf 100644
--- a/lcl/include/treeview.inc
+++ b/lcl/include/treeview.inc
@@ -1141,6 +1141,7 @@ procedure TTreeNode.MoveTo(Destination: TTreeNode; Mode: TNodeAttachMode);
   naAddChild:      add as last child of Destination
   naAddChildFirst: add as first child of Destination
   naInsert:        insert in front of Destination
+  naInsertBehind:  insert behind Destination
 }
 var
   AddMode: TAddMode;
@@ -1149,8 +1150,18 @@ var
   OldOnChanging: TTVChangingEvent;
   OldOnChange: TTVChangedEvent;
 begin
-  if (Destination=nil) and (Mode in [naAddChild,naAddChildFirst,naInsert]) then
+  if (Destination=nil)
+  and (Mode in [naAddChild,naAddChildFirst,naInsert,naInsertBehind]) then
     TreeNodeError('TTreeNode.MoveTo Destination=nil');
+  if Mode=naInsertBehind then begin
+    // convert naInsertBehind
+    if Destination.GetNextSibling=nil then begin
+      Mode:=naAdd;
+    end else begin
+      Mode:=naInsert;
+      Destination:=Destination.GetNextSibling;
+    end;
+  end;
   if (Destination = nil) or not Destination.HasAsParent(Self) then begin
     OldOnChanging := TreeView.OnChanging;
     OldOnChange := TreeView.OnChange;