diff --git a/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi b/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi
index ddc538a16..c685723c9 100644
--- a/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi
+++ b/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi
@@ -105,6 +105,7 @@
         <Filename Value="udm.pas"/>
         <ComponentName Value="DM"/>
         <IsPartOfProject Value="True"/>
+        <ResourceBaseClass Value="DataModule"/>
         <ResourceFilename Value="udm.lrs"/>
         <UnitName Value="udm"/>
       </Unit10>
@@ -213,7 +214,7 @@
     </Parsing>
     <Linking>
       <Debugging>
-        <GenerateDebugInfo Value="True"/>
+        <UseLineInfoUnit Value="False"/>
         <StripSymbols Value="True"/>
       </Debugging>
       <LinkSmart Value="True"/>
diff --git a/wst/trunk/type_lib_edtr/ufclassedit.lfm b/wst/trunk/type_lib_edtr/ufclassedit.lfm
index 25607f5f6..73682daf5 100644
--- a/wst/trunk/type_lib_edtr/ufclassedit.lfm
+++ b/wst/trunk/type_lib_edtr/ufclassedit.lfm
@@ -1,25 +1,26 @@
 object fClassEdit: TfClassEdit
-  Left = 616
+  Left = 536
   Height = 547
-  Top = 120
-  Width = 518
+  Top = 127
+  Width = 552
   ActiveControl = PC
   BorderStyle = bsSizeToolWin
   Caption = 'fClassEdit'
   ClientHeight = 547
-  ClientWidth = 518
+  ClientWidth = 552
+  ParentFont = False
   Position = poDesktopCenter
-  LCLVersion = '0.9.25'
+  LCLVersion = '0.9.26.1'
   object Panel1: TPanel
     Height = 50
     Top = 497
-    Width = 518
+    Width = 552
     Align = alBottom
     ClientHeight = 50
-    ClientWidth = 518
+    ClientWidth = 552
     TabOrder = 0
     object Button1: TButton
-      Left = 341
+      Left = 375
       Height = 25
       Top = 10
       Width = 75
@@ -31,7 +32,7 @@ object fClassEdit: TfClassEdit
       TabOrder = 1
     end
     object Button2: TButton
-      Left = 253
+      Left = 287
       Height = 25
       Top = 10
       Width = 75
@@ -42,7 +43,7 @@ object fClassEdit: TfClassEdit
       TabOrder = 0
     end
     object Button6: TButton
-      Left = 429
+      Left = 463
       Height = 25
       Top = 10
       Width = 75
@@ -53,7 +54,7 @@ object fClassEdit: TfClassEdit
   end
   object PC: TPageControl
     Height = 497
-    Width = 518
+    Width = 552
     ActivePage = TabSheet1
     Align = alClient
     TabIndex = 0
@@ -63,7 +64,7 @@ object fClassEdit: TfClassEdit
     object TabSheet1: TTabSheet
       Caption = 'Compound Object'
       ClientHeight = 471
-      ClientWidth = 510
+      ClientWidth = 544
       object Label1: TLabel
         Left = 4
         Height = 14
@@ -84,7 +85,7 @@ object fClassEdit: TfClassEdit
         Left = 92
         Height = 23
         Top = 18
-        Width = 406
+        Width = 440
         Anchors = [akTop, akLeft, akRight]
         TabOrder = 0
       end
@@ -92,15 +93,15 @@ object fClassEdit: TfClassEdit
         Left = 4
         Height = 312
         Top = 98
-        Width = 495
+        Width = 529
         Anchors = [akTop, akLeft, akRight, akBottom]
         Caption = '  Properties  '
         ClientHeight = 294
-        ClientWidth = 491
+        ClientWidth = 525
         TabOrder = 2
         object edtProp: TListView
           Height = 294
-          Width = 491
+          Width = 525
           Align = alClient
           BorderWidth = 2
           Columns = <          
@@ -117,6 +118,7 @@ object fClassEdit: TfClassEdit
               Caption = 'Attribute'
               Width = 60
             end>
+          HideSelection = False
           PopupMenu = PopupMenu1
           RowSelect = True
           TabOrder = 0
@@ -158,31 +160,50 @@ object fClassEdit: TfClassEdit
         Left = 92
         Height = 21
         Top = 58
-        Width = 406
+        Width = 440
         Anchors = [akTop, akLeft, akRight]
         ItemHeight = 13
-        MaxLength = -1
         Style = csDropDownList
         TabOrder = 1
       end
+      object Button7: TButton
+        Left = 372
+        Height = 25
+        Top = 421
+        Width = 70
+        Action = actMoveUp
+        Anchors = [akRight, akBottom]
+        BorderSpacing.InnerBorder = 4
+        TabOrder = 6
+      end
+      object Button8: TButton
+        Left = 452
+        Height = 25
+        Top = 421
+        Width = 70
+        Action = actMoveDown
+        Anchors = [akRight, akBottom]
+        BorderSpacing.InnerBorder = 4
+        TabOrder = 7
+      end
     end
     object tsSourceXSD: TTabSheet
       Caption = 'XSD'
       ClientHeight = 471
-      ClientWidth = 510
+      ClientWidth = 544
       object edtSourceXSD: TSynEdit
         Left = 12
         Height = 432
         Top = 18
-        Width = 480
+        Width = 514
         Anchors = [akTop, akLeft, akRight, akBottom]
         Font.Height = -20
         Font.Name = 'courier'
         Font.Pitch = fpFixed
         ParentColor = False
+        ParentFont = False
         TabOrder = 0
         BookMarkOptions.Xoffset = 42
-        BookMarkOptions.OnChange = nil
         Gutter.DigitCount = 2
         Gutter.ShowLineNumbers = True
         Gutter.Width = 10
@@ -510,18 +531,17 @@ object fClassEdit: TfClassEdit
             ShortCut = 24642
           end>
         ReadOnly = True
-        SelectedColor.OnChange = nil
       end
     end
     object tsDependencies: TTabSheet
       Caption = 'Used by'
       ClientHeight = 471
-      ClientWidth = 510
+      ClientWidth = 544
       object tvDependency: TTreeView
         Left = 20
         Height = 433
         Top = 18
-        Width = 464
+        Width = 498
         Anchors = [akTop, akLeft, akRight, akBottom]
         DefaultItemHeight = 15
         ReadOnly = True
@@ -533,12 +553,12 @@ object fClassEdit: TfClassEdit
     object tsDocumentation: TTabSheet
       Caption = 'Documentation'
       ClientHeight = 471
-      ClientWidth = 510
+      ClientWidth = 544
       object edtDocumentation: TMemo
         Left = 12
         Height = 434
         Top = 18
-        Width = 480
+        Width = 514
         Anchors = [akTop, akLeft, akRight, akBottom]
         ScrollBars = ssAutoBoth
         TabOrder = 0
@@ -578,6 +598,18 @@ object fClassEdit: TfClassEdit
       OnExecute = actApplyExecute
       OnUpdate = actOKUpdate
     end
+    object actMoveUp: TAction
+      Caption = 'Move Up'
+      DisableIfNoHandler = True
+      OnExecute = actMoveUpExecute
+      OnUpdate = actMoveUpUpdate
+    end
+    object actMoveDown: TAction
+      Caption = 'Move Down'
+      DisableIfNoHandler = True
+      OnExecute = actMoveDownExecute
+      OnUpdate = actMoveDownUpdate
+    end
   end
   object PopupMenu1: TPopupMenu
     left = 105
diff --git a/wst/trunk/type_lib_edtr/ufclassedit.lrs b/wst/trunk/type_lib_edtr/ufclassedit.lrs
index 6fc3f0a4c..3d2539d45 100644
--- a/wst/trunk/type_lib_edtr/ufclassedit.lrs
+++ b/wst/trunk/type_lib_edtr/ufclassedit.lrs
@@ -1,126 +1,134 @@
 { Ceci est un fichier ressource généré automatiquement par Lazarus }
 
 LazarusResources.Add('TfClassEdit','FORMDATA',[
-  'TPF0'#11'TfClassEdit'#10'fClassEdit'#4'Left'#3'h'#2#6'Height'#3'#'#2#3'Top'#2
-  +'x'#5'Width'#3#6#2#13'ActiveControl'#7#2'PC'#11'BorderStyle'#7#13'bsSizeTool'
-  +'Win'#7'Caption'#6#10'fClassEdit'#12'ClientHeight'#3'#'#2#11'ClientWidth'#3#6
-  +#2#8'Position'#7#15'poDesktopCenter'#10'LCLVersion'#6#6'0.9.25'#0#6'TPanel'#6
-  +'Panel1'#6'Height'#2'2'#3'Top'#3#241#1#5'Width'#3#6#2#5'Align'#7#8'alBottom'
-  +#12'ClientHeight'#2'2'#11'ClientWidth'#3#6#2#8'TabOrder'#2#0#0#7'TButton'#7
-  +'Button1'#4'Left'#3'U'#1#6'Height'#2#25#3'Top'#2#10#5'Width'#2'K'#7'Anchors'
-  +#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Ca'
-  +'ption'#6#6'Cancel'#11'ModalResult'#2#2#8'TabOrder'#2#1#0#0#7'TButton'#7'But'
-  +'ton2'#4'Left'#3#253#0#6'Height'#2#25#3'Top'#2#10#5'Width'#2'K'#6'Action'#7#5
-  +'actOK'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4
-  +#7'Default'#9#8'TabOrder'#2#0#0#0#7'TButton'#7'Button6'#4'Left'#3#173#1#6'He'
-  +'ight'#2#25#3'Top'#2#10#5'Width'#2'K'#6'Action'#7#8'actApply'#7'Anchors'#11#5
-  +'akTop'#7'akRight'#0#8'TabOrder'#2#2#0#0#0#12'TPageControl'#2'PC'#6'Height'#3
-  +#241#1#5'Width'#3#6#2#10'ActivePage'#7#9'TabSheet1'#5'Align'#7#8'alClient'#8
-  +'TabIndex'#2#0#8'TabOrder'#2#1#8'OnChange'#7#8'PCChange'#13'OnPageChanged'#7
-  +#8'PCChange'#0#9'TTabSheet'#9'TabSheet1'#7'Caption'#6#15'Compound Object'#12
-  +'ClientHeight'#3#215#1#11'ClientWidth'#3#254#1#0#6'TLabel'#6'Label1'#4'Left'
-  +#2#4#6'Height'#2#14#3'Top'#2#18#5'Width'#2#28#7'Caption'#6#4'Name'#11'Parent'
-  +'Color'#8#0#0#6'TLabel'#6'Label2'#4'Left'#2#4#6'Height'#2#14#3'Top'#2';'#5'W'
-  +'idth'#2'C'#7'Caption'#6#14'Inheritts from'#11'ParentColor'#8#0#0#5'TEdit'#7
-  +'edtName'#4'Left'#2'\'#6'Height'#2#23#3'Top'#2#18#5'Width'#3#150#1#7'Anchors'
-  +#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#0#0#0#9'TGroupBox'#9'Group'
-  +'Box1'#4'Left'#2#4#6'Height'#3'8'#1#3'Top'#2'b'#5'Width'#3#239#1#7'Anchors'
-  +#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#14'  Properties'
-  +'  '#12'ClientHeight'#3'&'#1#11'ClientWidth'#3#235#1#8'TabOrder'#2#2#0#9'TLi'
-  +'stView'#7'edtProp'#6'Height'#3'&'#1#5'Width'#3#235#1#5'Align'#7#8'alClient'
-  +#11'BorderWidth'#2#2#7'Columns'#14#1#8'AutoSize'#9#7'Caption'#6#4'Name'#5'Wi'
-  +'dth'#3#210#0#0#1#7'Caption'#6#4'Type'#5'Width'#3#200#0#0#1#7'Caption'#6#9'A'
-  +'ttribute'#5'Width'#2'<'#0#0#9'PopupMenu'#7#10'PopupMenu1'#9'RowSelect'#9#8
-  +'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#10'OnDblClick'#7#15'edtPropDblClic'
-  +'k'#0#0#0#7'TButton'#7'Button3'#4'Left'#2#4#6'Height'#2#25#3'Top'#3#165#1#5
-  +'Width'#2'd'#6'Action'#7#10'actPropAdd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0
-  +#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#3#0#0#7'TButton'#7'Button4'
-  +#4'Left'#2't'#6'Height'#2#25#3'Top'#3#165#1#5'Width'#2'd'#6'Action'#7#11'act'
-  +'PropEdit'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#25'BorderSpacing.InnerBorde'
-  +'r'#2#4#8'TabOrder'#2#4#0#0#7'TButton'#7'Button5'#4'Left'#3#228#0#6'Height'#2
-  +#25#3'Top'#3#165#1#5'Width'#2'd'#6'Action'#7#13'actPropDelete'#7'Anchors'#11
-  +#6'akLeft'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#5#0
-  +#0#9'TComboBox'#9'edtParent'#4'Left'#2'\'#6'Height'#2#21#3'Top'#2':'#5'Width'
-  +#3#150#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#10'ItemHeight'#2#13#9
-  +'MaxLength'#2#255#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#1#0#0#0#9'TTab'
-  +'Sheet'#11'tsSourceXSD'#7'Caption'#6#3'XSD'#12'ClientHeight'#3#215#1#11'Clie'
-  +'ntWidth'#3#254#1#0#8'TSynEdit'#12'edtSourceXSD'#4'Left'#2#12#6'Height'#3#176
-  +#1#3'Top'#2#18#5'Width'#3#224#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
-  +'akBottom'#0#11'Font.Height'#2#236#9'Font.Name'#6#7'courier'#10'Font.Pitch'#7
-  +#7'fpFixed'#11'ParentColor'#8#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2
-  +'*'#24'BookMarkOptions.OnChange'#13#17'Gutter.DigitCount'#2#2#22'Gutter.Show'
-  +'LineNumbers'#9#12'Gutter.Width'#2#10#22'Gutter.ShowCodeFolding'#9#11'Highli'
-  +'ghter'#7#10'SynXMLSyn1'#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'
-  +#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3
-  +'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'('
-  +' '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2
-  +'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%'
-  +'@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2
-  +''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3
-  +'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'
-  +#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3
-  +'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2
-  +'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3
-  +'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2
-  +'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3
-  +'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2
-  +'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3
-  ,'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'
-  +#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'Short'
-  +'Cut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8
-  +'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245
-  +#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Comman'
-  +'d'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160
-  +#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortC'
-  +'ut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8
-  +'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3
-  +#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Comm'
-  +'and'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7
-  +'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0
-  +#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3
-  +'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCu'
-  +'t'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'Sh'
-  +'ortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1
-  +#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3
-  +'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Comman'
-  +'d'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'C'
-  +'ommand'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1
-  +#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'
-  +#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3
-  +'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCu'
-  +'t'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'Sh'
-  +'ortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232
-  +#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'
-  +#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Comma'
-  +'nd'#3#250#0#8'ShortCut'#3'B`'#0#0#8'ReadOnly'#9#22'SelectedColor.OnChange'
-  +#13#0#0#0#9'TTabSheet'#14'tsDependencies'#7'Caption'#6#7'Used by'#12'ClientH'
-  +'eight'#3#215#1#11'ClientWidth'#3#254#1#0#9'TTreeView'#12'tvDependency'#4'Le'
-  +'ft'#2#20#6'Height'#3#177#1#3'Top'#2#18#5'Width'#3#208#1#7'Anchors'#11#5'akT'
-  +'op'#6'akLeft'#7'akRight'#8'akBottom'#0#17'DefaultItemHeight'#2#15#8'ReadOnl'
-  +'y'#9#16'RightClickSelect'#9#8'TabOrder'#2#0#7'Options'#11#17'tvoAutoItemHei'
-  +'ght'#16'tvoHideSelection'#21'tvoKeepCollapsedNodes'#11'tvoReadOnly'#19'tvoR'
-  +'ightClickSelect'#14'tvoShowButtons'#12'tvoShowLines'#11'tvoShowRoot'#11'tvo'
-  +'ToolTips'#0#0#0#0#9'TTabSheet'#15'tsDocumentation'#7'Caption'#6#13'Document'
-  +'ation'#12'ClientHeight'#3#215#1#11'ClientWidth'#3#254#1#0#5'TMemo'#16'edtDo'
-  +'cumentation'#4'Left'#2#12#6'Height'#3#178#1#3'Top'#2#18#5'Width'#3#224#1#7
-  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#10'ScrollBars'#7#10
-  +'ssAutoBoth'#8'TabOrder'#2#0#8'WordWrap'#8#0#0#0#0#11'TActionList'#11'Action'
-  +'List1'#4'left'#3#232#0#3'top'#3#200#0#0#7'TAction'#5'actOK'#7'Caption'#6#2
-  +'OK'#18'DisableIfNoHandler'#9#9'OnExecute'#7#12'actOKExecute'#8'OnUpdate'#7
-  +#11'actOKUpdate'#0#0#7'TAction'#10'actPropAdd'#7'Caption'#6#12'New Property'
-  +#18'DisableIfNoHandler'#9#9'OnExecute'#7#17'actPropAddExecute'#0#0#7'TAction'
-  +#11'actPropEdit'#7'Caption'#6#13'Edit Property'#18'DisableIfNoHandler'#9#9'O'
-  +'nExecute'#7#18'actPropEditExecute'#8'OnUpdate'#7#17'actPropEditUpdate'#0#0#7
-  +'TAction'#13'actPropDelete'#7'Caption'#6#15'Delete Property'#18'DisableIfNoH'
-  +'andler'#9#9'OnExecute'#7#20'actPropDeleteExecute'#8'OnUpdate'#7#17'actPropE'
-  +'ditUpdate'#0#0#7'TAction'#8'actApply'#7'Caption'#6#5'Apply'#18'DisableIfNoH'
-  +'andler'#9#9'OnExecute'#7#15'actApplyExecute'#8'OnUpdate'#7#11'actOKUpdate'#0
-  +#0#0#10'TPopupMenu'#10'PopupMenu1'#4'left'#2'i'#3'top'#3#186#0#0#9'TMenuItem'
-  +#9'MenuItem1'#6'Action'#7#10'actPropAdd'#7'OnClick'#7#17'actPropAddExecute'#0
-  +#0#9'TMenuItem'#9'MenuItem2'#6'Action'#7#11'actPropEdit'#7'OnClick'#7#18'act'
-  +'PropEditExecute'#0#0#9'TMenuItem'#9'MenuItem3'#6'Action'#7#13'actPropDelete'
-  +#7'OnClick'#7#20'actPropDeleteExecute'#0#0#0#10'TSynXMLSyn'#10'SynXMLSyn1'#13
-  +'DefaultFilter'#6'MDocuments XML (*.xml,*.xsd,*.xsl,*.xslt,*.dtd)|*.xml;*.xs'
-  +'d;*.xsl;*.xslt;*.dtd'#7'Enabled'#8#16'WantBracesParsed'#8#4'left'#3#210#0#3
-  +'top'#3#171#0#0#0#0
+  'TPF0'#11'TfClassEdit'#10'fClassEdit'#4'Left'#3#24#2#6'Height'#3'#'#2#3'Top'#2
+  +''#5'Width'#3'('#2#13'ActiveControl'#7#2'PC'#11'BorderStyle'#7#13'bsSizeToo'
+  +'lWin'#7'Caption'#6#10'fClassEdit'#12'ClientHeight'#3'#'#2#11'ClientWidth'#3
+  +'('#2#10'ParentFont'#8#8'Position'#7#15'poDesktopCenter'#10'LCLVersion'#6#8
+  +'0.9.26.1'#0#6'TPanel'#6'Panel1'#6'Height'#2'2'#3'Top'#3#241#1#5'Width'#3'('
+  +#2#5'Align'#7#8'alBottom'#12'ClientHeight'#2'2'#11'ClientWidth'#3'('#2#8'Tab'
+  +'Order'#2#0#0#7'TButton'#7'Button1'#4'Left'#3'w'#1#6'Height'#2#25#3'Top'#2#10
+  +#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBor'
+  +'der'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'ModalResult'#2#2#8'TabOrder'
+  +#2#1#0#0#7'TButton'#7'Button2'#4'Left'#3#31#1#6'Height'#2#25#3'Top'#2#10#5'W'
+  +'idth'#2'K'#6'Action'#7#5'actOK'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'Bord'
+  +'erSpacing.InnerBorder'#2#4#7'Default'#9#8'TabOrder'#2#0#0#0#7'TButton'#7'Bu'
+  +'tton6'#4'Left'#3#207#1#6'Height'#2#25#3'Top'#2#10#5'Width'#2'K'#6'Action'#7
+  +#8'actApply'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'TabOrder'#2#2#0#0#0#12'TP'
+  +'ageControl'#2'PC'#6'Height'#3#241#1#5'Width'#3'('#2#10'ActivePage'#7#9'TabS'
+  +'heet1'#5'Align'#7#8'alClient'#8'TabIndex'#2#0#8'TabOrder'#2#1#8'OnChange'#7
+  +#8'PCChange'#13'OnPageChanged'#7#8'PCChange'#0#9'TTabSheet'#9'TabSheet1'#7'C'
+  +'aption'#6#15'Compound Object'#12'ClientHeight'#3#215#1#11'ClientWidth'#3' '
+  +#2#0#6'TLabel'#6'Label1'#4'Left'#2#4#6'Height'#2#14#3'Top'#2#18#5'Width'#2#28
+  +#7'Caption'#6#4'Name'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#4'Left'#2#4#6
+  +'Height'#2#14#3'Top'#2';'#5'Width'#2'C'#7'Caption'#6#14'Inheritts from'#11'P'
+  +'arentColor'#8#0#0#5'TEdit'#7'edtName'#4'Left'#2'\'#6'Height'#2#23#3'Top'#2
+  +#18#5'Width'#3#184#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrde'
+  +'r'#2#0#0#0#9'TGroupBox'#9'GroupBox1'#4'Left'#2#4#6'Height'#3'8'#1#3'Top'#2
+  +'b'#5'Width'#3#17#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0
+  +#7'Caption'#6#14'  Properties  '#12'ClientHeight'#3'&'#1#11'ClientWidth'#3#13
+  +#2#8'TabOrder'#2#2#0#9'TListView'#7'edtProp'#6'Height'#3'&'#1#5'Width'#3#13#2
+  +#5'Align'#7#8'alClient'#11'BorderWidth'#2#2#7'Columns'#14#1#8'AutoSize'#9#7
+  +'Caption'#6#4'Name'#5'Width'#3#210#0#0#1#7'Caption'#6#4'Type'#5'Width'#3#200
+  +#0#0#1#7'Caption'#6#9'Attribute'#5'Width'#2'<'#0#0#13'HideSelection'#8#9'Pop'
+  +'upMenu'#7#10'PopupMenu1'#9'RowSelect'#9#8'TabOrder'#2#0#9'ViewStyle'#7#8'vs'
+  +'Report'#10'OnDblClick'#7#15'edtPropDblClick'#0#0#0#7'TButton'#7'Button3'#4
+  +'Left'#2#4#6'Height'#2#25#3'Top'#3#165#1#5'Width'#2'd'#6'Action'#7#10'actPro'
+  +'pAdd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2
+  +#4#8'TabOrder'#2#3#0#0#7'TButton'#7'Button4'#4'Left'#2't'#6'Height'#2#25#3'T'
+  +'op'#3#165#1#5'Width'#2'd'#6'Action'#7#11'actPropEdit'#7'Anchors'#11#6'akLef'
+  +'t'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#4#0#0#7'TB'
+  +'utton'#7'Button5'#4'Left'#3#228#0#6'Height'#2#25#3'Top'#3#165#1#5'Width'#2
+  +'d'#6'Action'#7#13'actPropDelete'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#25'B'
+  +'orderSpacing.InnerBorder'#2#4#8'TabOrder'#2#5#0#0#9'TComboBox'#9'edtParent'
+  +#4'Left'#2'\'#6'Height'#2#21#3'Top'#2':'#5'Width'#3#184#1#7'Anchors'#11#5'ak'
+  +'Top'#6'akLeft'#7'akRight'#0#10'ItemHeight'#2#13#5'Style'#7#14'csDropDownLis'
+  +'t'#8'TabOrder'#2#1#0#0#7'TButton'#7'Button7'#4'Left'#3't'#1#6'Height'#2#25#3
+  +'Top'#3#165#1#5'Width'#2'F'#6'Action'#7#9'actMoveUp'#7'Anchors'#11#7'akRight'
+  +#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#6#0#0#7'TButt'
+  +'on'#7'Button8'#4'Left'#3#196#1#6'Height'#2#25#3'Top'#3#165#1#5'Width'#2'F'#6
+  +'Action'#7#11'actMoveDown'#7'Anchors'#11#7'akRight'#8'akBottom'#0#25'BorderS'
+  +'pacing.InnerBorder'#2#4#8'TabOrder'#2#7#0#0#0#9'TTabSheet'#11'tsSourceXSD'#7
+  +'Caption'#6#3'XSD'#12'ClientHeight'#3#215#1#11'ClientWidth'#3' '#2#0#8'TSynE'
+  +'dit'#12'edtSourceXSD'#4'Left'#2#12#6'Height'#3#176#1#3'Top'#2#18#5'Width'#3
+  +#2#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font.Heigh'
+  +'t'#2#236#9'Font.Name'#6#7'courier'#10'Font.Pitch'#7#7'fpFixed'#11'ParentCol'
+  +'or'#8#10'ParentFont'#8#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2'*'#17
+  +'Gutter.DigitCount'#2#2#22'Gutter.ShowLineNumbers'#9#12'Gutter.Width'#2#10#22
+  +'Gutter.ShowCodeFolding'#9#11'Highlighter'#7#10'SynXMLSyn1'#10'Keystrokes'#14
+  +#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1
+  +#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1
+  +#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0
+  +#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1
+  +#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7
+  +'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7
+  +'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7
+  +'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7
+  +'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7
+  ,'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'C'
+  +'ommand'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7
+  +'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'C'
+  +'ommand'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7
+  +'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'C'
+  +'ommand'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7
+  +'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0
+  +#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2
+  +'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCu'
+  +'t'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'S'
+  +'hortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'
+  +#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7
+  +'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'
+  +#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3
+  +'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'Short'
+  +'Cut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8
+  +'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251
+  +#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'
+  +#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Comm'
+  +'and'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7
+  +'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0
+  +#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5'
+  +'@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'
+  +#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'Short'
+  +'Cut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8
+  +'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'
+  +#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3
+  +'d'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Comman'
+  +'d'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'C'
+  +'ommand'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0
+  +#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3
+  +'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'
+  +#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#8'ReadOnly'#9#0#0#0#9'T'
+  +'TabSheet'#14'tsDependencies'#7'Caption'#6#7'Used by'#12'ClientHeight'#3#215
+  +#1#11'ClientWidth'#3' '#2#0#9'TTreeView'#12'tvDependency'#4'Left'#2#20#6'Hei'
+  +'ght'#3#177#1#3'Top'#2#18#5'Width'#3#242#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#8'akBottom'#0#17'DefaultItemHeight'#2#15#8'ReadOnly'#9#16'RightCli'
+  +'ckSelect'#9#8'TabOrder'#2#0#7'Options'#11#17'tvoAutoItemHeight'#16'tvoHideS'
+  +'election'#21'tvoKeepCollapsedNodes'#11'tvoReadOnly'#19'tvoRightClickSelect'
+  +#14'tvoShowButtons'#12'tvoShowLines'#11'tvoShowRoot'#11'tvoToolTips'#0#0#0#0
+  +#9'TTabSheet'#15'tsDocumentation'#7'Caption'#6#13'Documentation'#12'ClientHe'
+  +'ight'#3#215#1#11'ClientWidth'#3' '#2#0#5'TMemo'#16'edtDocumentation'#4'Left'
+  +#2#12#6'Height'#3#178#1#3'Top'#2#18#5'Width'#3#2#2#7'Anchors'#11#5'akTop'#6
+  +'akLeft'#7'akRight'#8'akBottom'#0#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'
+  +#2#0#8'WordWrap'#8#0#0#0#0#11'TActionList'#11'ActionList1'#4'left'#3#232#0#3
+  +'top'#3#200#0#0#7'TAction'#5'actOK'#7'Caption'#6#2'OK'#18'DisableIfNoHandler'
+  +#9#9'OnExecute'#7#12'actOKExecute'#8'OnUpdate'#7#11'actOKUpdate'#0#0#7'TActi'
+  +'on'#10'actPropAdd'#7'Caption'#6#12'New Property'#18'DisableIfNoHandler'#9#9
+  +'OnExecute'#7#17'actPropAddExecute'#0#0#7'TAction'#11'actPropEdit'#7'Caption'
+  +#6#13'Edit Property'#18'DisableIfNoHandler'#9#9'OnExecute'#7#18'actPropEditE'
+  +'xecute'#8'OnUpdate'#7#17'actPropEditUpdate'#0#0#7'TAction'#13'actPropDelete'
+  +#7'Caption'#6#15'Delete Property'#18'DisableIfNoHandler'#9#9'OnExecute'#7#20
+  +'actPropDeleteExecute'#8'OnUpdate'#7#17'actPropEditUpdate'#0#0#7'TAction'#8
+  +'actApply'#7'Caption'#6#5'Apply'#18'DisableIfNoHandler'#9#9'OnExecute'#7#15
+  +'actApplyExecute'#8'OnUpdate'#7#11'actOKUpdate'#0#0#7'TAction'#9'actMoveUp'#7
+  +'Caption'#6#7'Move Up'#18'DisableIfNoHandler'#9#9'OnExecute'#7#16'actMoveUpE'
+  +'xecute'#8'OnUpdate'#7#15'actMoveUpUpdate'#0#0#7'TAction'#11'actMoveDown'#7
+  +'Caption'#6#9'Move Down'#18'DisableIfNoHandler'#9#9'OnExecute'#7#18'actMoveD'
+  +'ownExecute'#8'OnUpdate'#7#17'actMoveDownUpdate'#0#0#0#10'TPopupMenu'#10'Pop'
+  +'upMenu1'#4'left'#2'i'#3'top'#3#186#0#0#9'TMenuItem'#9'MenuItem1'#6'Action'#7
+  +#10'actPropAdd'#7'OnClick'#7#17'actPropAddExecute'#0#0#9'TMenuItem'#9'MenuIt'
+  +'em2'#6'Action'#7#11'actPropEdit'#7'OnClick'#7#18'actPropEditExecute'#0#0#9
+  +'TMenuItem'#9'MenuItem3'#6'Action'#7#13'actPropDelete'#7'OnClick'#7#20'actPr'
+  +'opDeleteExecute'#0#0#0#10'TSynXMLSyn'#10'SynXMLSyn1'#13'DefaultFilter'#6'MD'
+  ,'ocuments XML (*.xml,*.xsd,*.xsl,*.xslt,*.dtd)|*.xml;*.xsd;*.xsl;*.xslt;*.dt'
+  +'d'#7'Enabled'#8#16'WantBracesParsed'#8#4'left'#3#210#0#3'top'#3#171#0#0#0#0
 ]);
diff --git a/wst/trunk/type_lib_edtr/ufclassedit.pas b/wst/trunk/type_lib_edtr/ufclassedit.pas
index de58d4e60..77401bcc4 100644
--- a/wst/trunk/type_lib_edtr/ufclassedit.pas
+++ b/wst/trunk/type_lib_edtr/ufclassedit.pas
@@ -28,6 +28,8 @@ type
 
   TfClassEdit = class(TForm)
     actApply : TAction;
+    actMoveDown: TAction;
+    actMoveUp: TAction;
     actPropDelete: TAction;
     actPropEdit: TAction;
     actPropAdd: TAction;
@@ -40,6 +42,8 @@ type
     Button4: TButton;
     Button5: TButton;
     Button6 : TButton;
+    Button7: TButton;
+    Button8: TButton;
     edtParent: TComboBox;
     edtName: TEdit;
     GroupBox1: TGroupBox;
@@ -61,6 +65,10 @@ type
     tvDependency : TTreeView;
     tsSourceXSD : TTabSheet;
     procedure actApplyExecute(Sender : TObject);
+    procedure actMoveDownExecute(Sender: TObject);
+    procedure actMoveDownUpdate(Sender: TObject);
+    procedure actMoveUpExecute(Sender: TObject);
+    procedure actMoveUpUpdate(Sender: TObject);
     procedure actOKExecute(Sender: TObject);
     procedure actOKUpdate(Sender: TObject);
     procedure actPropAddExecute(Sender: TObject);
@@ -79,8 +87,9 @@ type
   private
     property UpdateType : TEditType read FUpdateType;
   private
+    procedure MovePropertyItem(AItem : TPasProperty; const ANewIndex : Integer);
     procedure PrepareParentCombo();
-    procedure LoadProperty(APropDef : TPasProperty);
+    function LoadProperty(APropDef : TPasProperty; const AIndex : Integer) : TListItem;
     procedure LoadFromObject();
     procedure SaveToObject();
 
@@ -112,7 +121,7 @@ var
 begin
   prp := CreateProperty(FObject,FSymbolTable) as TPasProperty;
   if Assigned(prp) then begin
-    LoadProperty(prp);
+    LoadProperty(prp,-1);
   end;
 end;
 
@@ -133,6 +142,26 @@ begin
     ShowSourceXSD();
 end;
 
+procedure TfClassEdit.actMoveDownExecute(Sender: TObject);
+begin
+  MovePropertyItem(TPasProperty(edtProp.ItemFocused.Data),(edtProp.ItemFocused.Index + 1));
+end;
+
+procedure TfClassEdit.actMoveDownUpdate(Sender: TObject);
+begin
+  TAction(Sender).Enabled := Assigned(edtProp.ItemFocused) and ( edtProp.ItemFocused.Index < Pred(edtProp.Items.Count) );
+end;
+
+procedure TfClassEdit.actMoveUpExecute(Sender: TObject);
+begin
+  MovePropertyItem(TPasProperty(edtProp.ItemFocused.Data),(edtProp.ItemFocused.Index - 1));
+end;
+
+procedure TfClassEdit.actMoveUpUpdate(Sender: TObject);
+begin
+  TAction(Sender).Enabled := Assigned(edtProp.ItemFocused) and ( edtProp.ItemFocused.Index > 0 );
+end;
+
 procedure TfClassEdit.actPropDeleteExecute(Sender: TObject);
 var
   prop : TPasProperty;
@@ -147,13 +176,15 @@ procedure TfClassEdit.actPropEditExecute(Sender: TObject);
 var
   prp : TPasProperty;
   itm : TListItem;
+  oldPos : Integer;
 begin
   itm := edtProp.ItemFocused;
   if Assigned(itm) then begin
     prp := TPasProperty(itm.Data);
     if UpdateProperty(prp,FSymbolTable) then begin
+      oldPos := itm.Index;
       itm.Free();
-      LoadProperty(prp);
+      LoadProperty(prp,oldPos);
     end;
   end;
 end;
@@ -185,6 +216,46 @@ begin
   end;
 end;
 
+procedure TfClassEdit.MovePropertyItem(AItem: TPasProperty; const ANewIndex: Integer);
+
+  function FindNewMemberPosition() : Integer;
+  var
+    k, kcounter : Integer;
+    mlist : TList;
+    pp : TPasProperty;
+  begin
+    Result := 0;
+    kcounter := 0;
+    mlist := FObject.Members;
+    for k := 0 to Pred(mlist.Count) do begin
+      if TPasElement(mlist[k]).InheritsFrom(TPasProperty) then begin
+        Inc(kcounter);
+        if ( kcounter = ANewIndex ) then begin
+          Result := k;
+          Break;
+        end;
+      end;
+    end;
+  end;
+
+var
+  locItem : TListItem;
+  i : Integer;
+begin
+  if ( AItem <> nil ) and
+     ( ( ANewIndex >= 0 ) and ( ANewIndex < edtProp.Items.Count ) )
+  then begin
+    locItem := FindItem(FSymbolTable.GetExternalName(AItem),edtProp.Items);
+    if ( locItem <> nil ) then
+      locItem.Free();
+    FObject.Members.Exchange(FObject.Members.IndexOf(AItem),FindNewMemberPosition());
+    locItem := LoadProperty(AItem,ANewIndex);
+    edtProp.ItemFocused := locItem;
+    edtProp.Selected := locItem;
+    FApplied := True;
+  end;
+end;
+
 procedure InternalFillList(
   ALs : TStrings;
   AContainer : TwstPasTreeContainer
@@ -266,7 +337,7 @@ begin
   end;
 end;
 
-procedure TfClassEdit.LoadProperty(APropDef: TPasProperty);
+function TfClassEdit.LoadProperty(APropDef: TPasProperty; const AIndex : Integer) : TListItem;
 var
   itm : TListItem;
   s, extName : string;
@@ -274,7 +345,10 @@ begin
   extName := FSymbolTable.GetExternalName(APropDef);
   itm := FindItem(extName,edtProp.Items);
   if ( itm = nil ) then begin
-    itm := edtProp.Items.Add();
+    if ( AIndex >= 0 ) and ( AIndex < edtProp.Items.Count ) then
+      itm := edtProp.Items.Insert(AIndex)
+    else
+      itm := edtProp.Items.Add();
   end;
   itm.Caption := extName;
   itm.SubItems.Add(FSymbolTable.GetExternalName(APropDef.VarType));
@@ -285,6 +359,7 @@ begin
   end;
   itm.SubItems.Add(s);
   itm.Data := APropDef;
+  Result := itm;
 end;
 
 procedure TfClassEdit.LoadFromObject();
@@ -303,7 +378,7 @@ begin
     for i := 0 to Pred(FObject.Members.Count) do begin
       if TPasElement(FObject.Members[i]).InheritsFrom(TPasProperty) then begin
         prp := TPasProperty(FObject.Members[i]);
-        LoadProperty(prp);
+        LoadProperty(prp,-1);
       end;
     end;
     if Assigned(FObject.AncestorType) then begin
diff --git a/wst/trunk/type_lib_edtr/ufrecordedit.lfm b/wst/trunk/type_lib_edtr/ufrecordedit.lfm
index 5dd8f4fd9..40a266fe8 100644
--- a/wst/trunk/type_lib_edtr/ufrecordedit.lfm
+++ b/wst/trunk/type_lib_edtr/ufrecordedit.lfm
@@ -2,16 +2,17 @@ object fRecordEdit: TfRecordEdit
   Left = 609
   Height = 542
   Top = 181
-  Width = 517
+  Width = 559
   ActiveControl = PC
   Caption = 'fRecordEdit'
   ClientHeight = 542
-  ClientWidth = 517
+  ClientWidth = 559
+  ParentFont = False
   Position = poDesktopCenter
-  LCLVersion = '0.9.25'
+  LCLVersion = '0.9.26.1'
   object PC: TPageControl
     Height = 492
-    Width = 517
+    Width = 559
     ActivePage = TabSheet1
     Align = alClient
     TabIndex = 0
@@ -21,7 +22,7 @@ object fRecordEdit: TfRecordEdit
     object TabSheet1: TTabSheet
       Caption = 'Record Type'
       ClientHeight = 466
-      ClientWidth = 509
+      ClientWidth = 551
       object Label1: TLabel
         Left = 20
         Height = 14
@@ -34,7 +35,7 @@ object fRecordEdit: TfRecordEdit
         Left = 76
         Height = 23
         Top = 34
-        Width = 409
+        Width = 451
         Anchors = [akTop, akLeft, akRight]
         TabOrder = 0
       end
@@ -42,15 +43,15 @@ object fRecordEdit: TfRecordEdit
         Left = 20
         Height = 320
         Top = 82
-        Width = 465
+        Width = 507
         Anchors = [akTop, akLeft, akRight, akBottom]
         Caption = '  Fields  '
         ClientHeight = 302
-        ClientWidth = 461
+        ClientWidth = 503
         TabOrder = 1
         object edtFields: TListView
           Height = 302
-          Width = 461
+          Width = 503
           Align = alClient
           Columns = <          
             item
@@ -65,7 +66,9 @@ object fRecordEdit: TfRecordEdit
               Caption = 'Attribute'
               Width = 60
             end>
+          HideSelection = False
           PopupMenu = PopupMenu1
+          RowSelect = True
           TabOrder = 0
           ViewStyle = vsReport
         end
@@ -100,21 +103,42 @@ object fRecordEdit: TfRecordEdit
         BorderSpacing.InnerBorder = 4
         TabOrder = 4
       end
+      object Button7: TButton
+        Left = 383
+        Height = 25
+        Top = 418
+        Width = 70
+        Action = actMoveUp
+        Anchors = [akRight, akBottom]
+        BorderSpacing.InnerBorder = 4
+        TabOrder = 5
+      end
+      object Button8: TButton
+        Left = 458
+        Height = 25
+        Top = 418
+        Width = 70
+        Action = actMoveDown
+        Anchors = [akRight, akBottom]
+        BorderSpacing.InnerBorder = 4
+        TabOrder = 6
+      end
     end
     object tsSourceXSD: TTabSheet
       Caption = 'XSD'
       ClientHeight = 466
-      ClientWidth = 509
+      ClientWidth = 551
       object edtSourceXSD: TSynEdit
         Left = 12
         Height = 432
         Top = 18
-        Width = 480
+        Width = 522
         Anchors = [akTop, akLeft, akRight, akBottom]
         Font.Height = -20
         Font.Name = 'courier'
         Font.Pitch = fpFixed
         ParentColor = False
+        ParentFont = False
         TabOrder = 0
         BookMarkOptions.Xoffset = 42
         Gutter.DigitCount = 2
@@ -449,12 +473,12 @@ object fRecordEdit: TfRecordEdit
     object tsDependencies: TTabSheet
       Caption = 'Used by'
       ClientHeight = 466
-      ClientWidth = 509
+      ClientWidth = 551
       object tvDependency: TTreeView
         Left = 20
         Height = 433
         Top = 18
-        Width = 464
+        Width = 506
         Anchors = [akTop, akLeft, akRight, akBottom]
         DefaultItemHeight = 15
         ReadOnly = True
@@ -466,12 +490,12 @@ object fRecordEdit: TfRecordEdit
     object tsDocumentation: TTabSheet
       Caption = 'Documentation'
       ClientHeight = 466
-      ClientWidth = 509
+      ClientWidth = 551
       object edtDocumentation: TMemo
         Left = 12
         Height = 434
         Top = 18
-        Width = 480
+        Width = 522
         Anchors = [akTop, akLeft, akRight, akBottom]
         ScrollBars = ssAutoBoth
         TabOrder = 0
@@ -482,13 +506,13 @@ object fRecordEdit: TfRecordEdit
   object Panel1: TPanel
     Height = 50
     Top = 492
-    Width = 517
+    Width = 559
     Align = alBottom
     ClientHeight = 50
-    ClientWidth = 517
+    ClientWidth = 559
     TabOrder = 1
     object Button1: TButton
-      Left = 253
+      Left = 295
       Height = 25
       Top = 10
       Width = 75
@@ -498,7 +522,7 @@ object fRecordEdit: TfRecordEdit
       TabOrder = 0
     end
     object Button2: TButton
-      Left = 341
+      Left = 383
       Height = 25
       Top = 10
       Width = 75
@@ -510,7 +534,7 @@ object fRecordEdit: TfRecordEdit
       TabOrder = 1
     end
     object Button6: TButton
-      Left = 429
+      Left = 471
       Height = 25
       Top = 10
       Width = 75
@@ -551,6 +575,18 @@ object fRecordEdit: TfRecordEdit
       OnExecute = actApplyExecute
       OnUpdate = actOKUpdate
     end
+    object actMoveDown: TAction
+      Caption = 'Move Down'
+      DisableIfNoHandler = True
+      OnExecute = actMoveDownExecute
+      OnUpdate = actMoveDownUpdate
+    end
+    object actMoveUp: TAction
+      Caption = 'Move Up'
+      DisableIfNoHandler = True
+      OnExecute = actMoveUpExecute
+      OnUpdate = actMoveUpUpdate
+    end
   end
   object PopupMenu1: TPopupMenu
     left = 112
diff --git a/wst/trunk/type_lib_edtr/ufrecordedit.lrs b/wst/trunk/type_lib_edtr/ufrecordedit.lrs
index 5344baf2f..6fb786373 100644
--- a/wst/trunk/type_lib_edtr/ufrecordedit.lrs
+++ b/wst/trunk/type_lib_edtr/ufrecordedit.lrs
@@ -2,118 +2,128 @@
 
 LazarusResources.Add('TfRecordEdit','FORMDATA',[
   'TPF0'#12'TfRecordEdit'#11'fRecordEdit'#4'Left'#3'a'#2#6'Height'#3#30#2#3'Top'
-  +#3#181#0#5'Width'#3#5#2#13'ActiveControl'#7#2'PC'#7'Caption'#6#11'fRecordEdi'
-  +'t'#12'ClientHeight'#3#30#2#11'ClientWidth'#3#5#2#8'Position'#7#15'poDesktop'
-  +'Center'#10'LCLVersion'#6#6'0.9.25'#0#12'TPageControl'#2'PC'#6'Height'#3#236
-  +#1#5'Width'#3#5#2#10'ActivePage'#7#9'TabSheet1'#5'Align'#7#8'alClient'#8'Tab'
-  +'Index'#2#0#8'TabOrder'#2#0#8'OnChange'#7#8'PCChange'#13'OnPageChanged'#7#8
-  +'PCChange'#0#9'TTabSheet'#9'TabSheet1'#7'Caption'#6#11'Record Type'#12'Clien'
-  +'tHeight'#3#210#1#11'ClientWidth'#3#253#1#0#6'TLabel'#6'Label1'#4'Left'#2#20
-  +#6'Height'#2#14#3'Top'#2'"'#5'Width'#2#28#7'Caption'#6#4'Name'#11'ParentColo'
-  +'r'#8#0#0#5'TEdit'#7'edtName'#4'Left'#2'L'#6'Height'#2#23#3'Top'#2'"'#5'Widt'
-  +'h'#3#153#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#0#0#0
-  +#9'TGroupBox'#9'GroupBox1'#4'Left'#2#20#6'Height'#3'@'#1#3'Top'#2'R'#5'Width'
-  +#3#209#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'
-  +#6#10'  Fields  '#12'ClientHeight'#3'.'#1#11'ClientWidth'#3#205#1#8'TabOrder'
-  +#2#1#0#9'TListView'#9'edtFields'#6'Height'#3'.'#1#5'Width'#3#205#1#5'Align'#7
-  +#8'alClient'#7'Columns'#14#1#7'Caption'#6#4'Name'#5'Width'#3#200#0#0#1#7'Cap'
-  +'tion'#6#4'Type'#5'Width'#3#190#0#0#1#7'Caption'#6#9'Attribute'#5'Width'#2'<'
-  +#0#0#9'PopupMenu'#7#10'PopupMenu1'#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'
-  +#0#0#0#7'TButton'#7'Button3'#4'Left'#2#20#6'Height'#2#25#3'Top'#3#162#1#5'Wi'
-  +'dth'#2'd'#6'Action'#7#10'actPropAdd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0
-  +#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#2#0#0#7'TButton'#7'Button4'
-  +#4'Left'#3#132#0#6'Height'#2#25#3'Top'#3#162#1#5'Width'#2'd'#6'Action'#7#11
-  +'actPropEdit'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#25'BorderSpacing.InnerBo'
-  +'rder'#2#4#8'TabOrder'#2#3#0#0#7'TButton'#7'Button5'#4'Left'#3#244#0#6'Heigh'
-  +'t'#2#25#3'Top'#3#162#1#5'Width'#2'd'#6'Action'#7#13'actPropDelete'#7'Anchor'
-  +'s'#11#6'akLeft'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'
-  +#2#4#0#0#0#9'TTabSheet'#11'tsSourceXSD'#7'Caption'#6#3'XSD'#12'ClientHeight'
-  +#3#210#1#11'ClientWidth'#3#253#1#0#8'TSynEdit'#12'edtSourceXSD'#4'Left'#2#12
-  +#6'Height'#3#176#1#3'Top'#2#18#5'Width'#3#224#1#7'Anchors'#11#5'akTop'#6'akL'
-  +'eft'#7'akRight'#8'akBottom'#0#11'Font.Height'#2#236#9'Font.Name'#6#7'courie'
-  +'r'#10'Font.Pitch'#7#7'fpFixed'#11'ParentColor'#8#8'TabOrder'#2#0#23'BookMar'
-  +'kOptions.Xoffset'#2'*'#17'Gutter.DigitCount'#2#2#22'Gutter.ShowLineNumbers'
-  +#9#12'Gutter.Width'#2#10#22'Gutter.ShowCodeFolding'#9#11'Highlighter'#7#10'S'
-  +'ynXMLSyn1'#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Comman'
-  +'d'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Co'
-  +'mmand'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Com'
-  +'mand'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'C'
-  +'ommand'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'C'
-  +'ommand'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'C'
-  +'ommand'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7
-  +'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7
-  +'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7
-  +'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'C'
-  +'ommand'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7
-  +'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'C'
-  +'ommand'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7
-  +'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'C'
-  +'ommand'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7
-  +'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1
-  +#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '
-  +#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3
-  +'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCu'
-  +'t'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8
-  +'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'C'
-  +'ommand'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0
-  +#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3
-  +'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'Short'
-  +'Cut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8
-  +'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['
-  +#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'
-  +#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Com'
-  +'mand'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7
-  +'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0
-  +#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4'
-  ,'@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'
-  +#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'Short'
-  +'Cut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8
-  +'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'
-  +#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3
-  +'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Comman'
-  +'d'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'C'
-  +'ommand'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1
-  +#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C'
-  +'`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCu'
-  +'t'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'Sh'
-  +'ortCut'#3'B`'#0#0#8'ReadOnly'#9#0#0#0#9'TTabSheet'#14'tsDependencies'#7'Cap'
-  +'tion'#6#7'Used by'#12'ClientHeight'#3#210#1#11'ClientWidth'#3#253#1#0#9'TTr'
-  +'eeView'#12'tvDependency'#4'Left'#2#20#6'Height'#3#177#1#3'Top'#2#18#5'Width'
-  +#3#208#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#17'Defaul'
-  +'tItemHeight'#2#15#8'ReadOnly'#9#16'RightClickSelect'#9#8'TabOrder'#2#0#7'Op'
-  +'tions'#11#17'tvoAutoItemHeight'#16'tvoHideSelection'#21'tvoKeepCollapsedNod'
-  +'es'#11'tvoReadOnly'#19'tvoRightClickSelect'#14'tvoShowButtons'#12'tvoShowLi'
-  +'nes'#11'tvoShowRoot'#11'tvoToolTips'#0#0#0#0#9'TTabSheet'#15'tsDocumentatio'
-  +'n'#7'Caption'#6#13'Documentation'#12'ClientHeight'#3#210#1#11'ClientWidth'#3
-  +#253#1#0#5'TMemo'#16'edtDocumentation'#4'Left'#2#12#6'Height'#3#178#1#3'Top'
-  +#2#18#5'Width'#3#224#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBotto'
-  +'m'#0#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#8'WordWrap'#8#0#0#0#0#6
-  +'TPanel'#6'Panel1'#6'Height'#2'2'#3'Top'#3#236#1#5'Width'#3#5#2#5'Align'#7#8
-  +'alBottom'#12'ClientHeight'#2'2'#11'ClientWidth'#3#5#2#8'TabOrder'#2#1#0#7'T'
-  +'Button'#7'Button1'#4'Left'#3#253#0#6'Height'#2#25#3'Top'#2#10#5'Width'#2'K'
-  +#6'Action'#7#5'actOK'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.I'
-  +'nnerBorder'#2#4#8'TabOrder'#2#0#0#0#7'TButton'#7'Button2'#4'Left'#3'U'#1#6
-  +'Height'#2#25#3'Top'#2#10#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0
-  +#25'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'Mod'
-  +'alResult'#2#2#8'TabOrder'#2#1#0#0#7'TButton'#7'Button6'#4'Left'#3#173#1#6'H'
-  +'eight'#2#25#3'Top'#2#10#5'Width'#2'K'#6'Action'#7#8'actApply'#7'Anchors'#11
-  +#5'akTop'#7'akRight'#0#8'TabOrder'#2#2#0#0#0#11'TActionList'#11'ActionList1'
-  +#4'left'#3#128#0#3'top'#3#208#0#0#7'TAction'#5'actOK'#7'Caption'#6#2'OK'#18
-  +'DisableIfNoHandler'#9#9'OnExecute'#7#12'actOKExecute'#8'OnUpdate'#7#11'actO'
-  +'KUpdate'#0#0#7'TAction'#10'actPropAdd'#7'Caption'#6#12'New Property'#18'Dis'
-  +'ableIfNoHandler'#9#9'OnExecute'#7#17'actPropAddExecute'#0#0#7'TAction'#11'a'
-  +'ctPropEdit'#7'Caption'#6#13'Edit Property'#18'DisableIfNoHandler'#9#9'OnExe'
-  +'cute'#7#18'actPropEditExecute'#8'OnUpdate'#7#17'actPropEditUpdate'#0#0#7'TA'
-  +'ction'#13'actPropDelete'#7'Caption'#6#15'Delete Property'#18'DisableIfNoHan'
-  +'dler'#9#9'OnExecute'#7#20'actPropDeleteExecute'#8'OnUpdate'#7#17'actPropEdi'
-  +'tUpdate'#0#0#7'TAction'#8'actApply'#7'Caption'#6#5'Apply'#18'DisableIfNoHan'
-  +'dler'#9#9'OnExecute'#7#15'actApplyExecute'#8'OnUpdate'#7#11'actOKUpdate'#0#0
-  +#0#10'TPopupMenu'#10'PopupMenu1'#4'left'#2'p'#3'top'#3#0#1#0#9'TMenuItem'#9
-  +'MenuItem1'#6'Action'#7#10'actPropAdd'#7'OnClick'#7#17'actPropAddExecute'#0#0
-  +#9'TMenuItem'#9'MenuItem2'#6'Action'#7#11'actPropEdit'#7'OnClick'#7#18'actPr'
-  +'opEditExecute'#0#0#9'TMenuItem'#9'MenuItem3'#6'Action'#7#13'actPropDelete'#7
-  +'OnClick'#7#20'actPropDeleteExecute'#0#0#0#10'TSynXMLSyn'#10'SynXMLSyn1'#13
-  +'DefaultFilter'#6'MDocuments XML (*.xml,*.xsd,*.xsl,*.xslt,*.dtd)|*.xml;*.xs'
-  +'d;*.xsl;*.xslt;*.dtd'#7'Enabled'#8#16'WantBracesParsed'#8#4'left'#3#238#0#3
-  +'top'#3#199#0#0#0#0
+  +#3#181#0#5'Width'#3'/'#2#13'ActiveControl'#7#2'PC'#7'Caption'#6#11'fRecordEd'
+  +'it'#12'ClientHeight'#3#30#2#11'ClientWidth'#3'/'#2#10'ParentFont'#8#8'Posit'
+  +'ion'#7#15'poDesktopCenter'#10'LCLVersion'#6#8'0.9.26.1'#0#12'TPageControl'#2
+  +'PC'#6'Height'#3#236#1#5'Width'#3'/'#2#10'ActivePage'#7#9'TabSheet1'#5'Align'
+  +#7#8'alClient'#8'TabIndex'#2#0#8'TabOrder'#2#0#8'OnChange'#7#8'PCChange'#13
+  +'OnPageChanged'#7#8'PCChange'#0#9'TTabSheet'#9'TabSheet1'#7'Caption'#6#11'Re'
+  +'cord Type'#12'ClientHeight'#3#210#1#11'ClientWidth'#3''''#2#0#6'TLabel'#6'L'
+  +'abel1'#4'Left'#2#20#6'Height'#2#14#3'Top'#2'"'#5'Width'#2#28#7'Caption'#6#4
+  +'Name'#11'ParentColor'#8#0#0#5'TEdit'#7'edtName'#4'Left'#2'L'#6'Height'#2#23
+  +#3'Top'#2'"'#5'Width'#3#195#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8
+  +'TabOrder'#2#0#0#0#9'TGroupBox'#9'GroupBox1'#4'Left'#2#20#6'Height'#3'@'#1#3
+  +'Top'#2'R'#5'Width'#3#251#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'ak'
+  +'Bottom'#0#7'Caption'#6#10'  Fields  '#12'ClientHeight'#3'.'#1#11'ClientWidt'
+  +'h'#3#247#1#8'TabOrder'#2#1#0#9'TListView'#9'edtFields'#6'Height'#3'.'#1#5'W'
+  +'idth'#3#247#1#5'Align'#7#8'alClient'#7'Columns'#14#1#7'Caption'#6#4'Name'#5
+  +'Width'#3#200#0#0#1#7'Caption'#6#4'Type'#5'Width'#3#190#0#0#1#7'Caption'#6#9
+  +'Attribute'#5'Width'#2'<'#0#0#13'HideSelection'#8#9'PopupMenu'#7#10'PopupMen'
+  +'u1'#9'RowSelect'#9#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#0#0#0#7'TButt'
+  +'on'#7'Button3'#4'Left'#2#20#6'Height'#2#25#3'Top'#3#162#1#5'Width'#2'd'#6'A'
+  +'ction'#7#10'actPropAdd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#25'BorderSpac'
+  +'ing.InnerBorder'#2#4#8'TabOrder'#2#2#0#0#7'TButton'#7'Button4'#4'Left'#3#132
+  +#0#6'Height'#2#25#3'Top'#3#162#1#5'Width'#2'd'#6'Action'#7#11'actPropEdit'#7
+  +'Anchors'#11#6'akLeft'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#8'Tab'
+  +'Order'#2#3#0#0#7'TButton'#7'Button5'#4'Left'#3#244#0#6'Height'#2#25#3'Top'#3
+  +#162#1#5'Width'#2'd'#6'Action'#7#13'actPropDelete'#7'Anchors'#11#6'akLeft'#8
+  +'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#4#0#0#7'TButton'
+  +#7'Button7'#4'Left'#3''#1#6'Height'#2#25#3'Top'#3#162#1#5'Width'#2'F'#6'Act'
+  +'ion'#7#9'actMoveUp'#7'Anchors'#11#7'akRight'#8'akBottom'#0#25'BorderSpacing'
+  +'.InnerBorder'#2#4#8'TabOrder'#2#5#0#0#7'TButton'#7'Button8'#4'Left'#3#202#1
+  +#6'Height'#2#25#3'Top'#3#162#1#5'Width'#2'F'#6'Action'#7#11'actMoveDown'#7'A'
+  +'nchors'#11#7'akRight'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#8'Tab'
+  +'Order'#2#6#0#0#0#9'TTabSheet'#11'tsSourceXSD'#7'Caption'#6#3'XSD'#12'Client'
+  +'Height'#3#210#1#11'ClientWidth'#3''''#2#0#8'TSynEdit'#12'edtSourceXSD'#4'Le'
+  +'ft'#2#12#6'Height'#3#176#1#3'Top'#2#18#5'Width'#3#10#2#7'Anchors'#11#5'akTo'
+  +'p'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font.Height'#2#236#9'Font.Name'#6#7
+  +'courier'#10'Font.Pitch'#7#7'fpFixed'#11'ParentColor'#8#10'ParentFont'#8#8'T'
+  +'abOrder'#2#0#23'BookMarkOptions.Xoffset'#2'*'#17'Gutter.DigitCount'#2#2#22
+  +'Gutter.ShowLineNumbers'#9#12'Gutter.Width'#2#10#22'Gutter.ShowCodeFolding'#9
+  +#11'Highlighter'#7#10'SynXMLSyn1'#10'Keystrokes'#14#1#7'Command'#2#3#8'Short'
+  +'Cut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'Sh'
+  +'ortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'Sho'
+  +'rtCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8
+  +'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'S'
+  +'hortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'S'
+  +'hortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8
+  +'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10
+  +#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8
+  +'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8
+  +'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8
+  +'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8
+  +'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8
+  +'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8
+  +'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8
+  +'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0
+  +#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3
+  +'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Comman'
+  +'d'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Co'
+  +'mmand'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'
+  +#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'Short'
+  +'Cut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3
+  +#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Comm'
+  +'and'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7
+  +'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'
+  ,#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3
+  +'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortC'
+  +'ut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8
+  +'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'
+  +#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3
+  +'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Comman'
+  +'d'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'C'
+  +'ommand'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1
+  +#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'
+  +#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3
+  +'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCu'
+  +'t'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'Sh'
+  +'ortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1
+  +#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3
+  +'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Comma'
+  +'nd'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7
+  +'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1
+  +#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#8'ReadOnly'#9#0#0#0#9'TTabSheet'#14
+  +'tsDependencies'#7'Caption'#6#7'Used by'#12'ClientHeight'#3#210#1#11'ClientW'
+  +'idth'#3''''#2#0#9'TTreeView'#12'tvDependency'#4'Left'#2#20#6'Height'#3#177#1
+  +#3'Top'#2#18#5'Width'#3#250#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
+  +'akBottom'#0#17'DefaultItemHeight'#2#15#8'ReadOnly'#9#16'RightClickSelect'#9
+  +#8'TabOrder'#2#0#7'Options'#11#17'tvoAutoItemHeight'#16'tvoHideSelection'#21
+  +'tvoKeepCollapsedNodes'#11'tvoReadOnly'#19'tvoRightClickSelect'#14'tvoShowBu'
+  +'ttons'#12'tvoShowLines'#11'tvoShowRoot'#11'tvoToolTips'#0#0#0#0#9'TTabSheet'
+  +#15'tsDocumentation'#7'Caption'#6#13'Documentation'#12'ClientHeight'#3#210#1
+  +#11'ClientWidth'#3''''#2#0#5'TMemo'#16'edtDocumentation'#4'Left'#2#12#6'Heig'
+  +'ht'#3#178#1#3'Top'#2#18#5'Width'#3#10#2#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#8'akBottom'#0#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#8'Wo'
+  +'rdWrap'#8#0#0#0#0#6'TPanel'#6'Panel1'#6'Height'#2'2'#3'Top'#3#236#1#5'Width'
+  +#3'/'#2#5'Align'#7#8'alBottom'#12'ClientHeight'#2'2'#11'ClientWidth'#3'/'#2#8
+  +'TabOrder'#2#1#0#7'TButton'#7'Button1'#4'Left'#3''''#1#6'Height'#2#25#3'Top'
+  +#2#10#5'Width'#2'K'#6'Action'#7#5'actOK'#7'Anchors'#11#5'akTop'#7'akRight'#0
+  +#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#0#0#0#7'TButton'#7'Button2'
+  +#4'Left'#3''#1#6'Height'#2#25#3'Top'#2#10#5'Width'#2'K'#7'Anchors'#11#5'akT'
+  +'op'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6
+  +#6'Cancel'#11'ModalResult'#2#2#8'TabOrder'#2#1#0#0#7'TButton'#7'Button6'#4'L'
+  +'eft'#3#215#1#6'Height'#2#25#3'Top'#2#10#5'Width'#2'K'#6'Action'#7#8'actAppl'
+  +'y'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'TabOrder'#2#2#0#0#0#11'TActionList'
+  +#11'ActionList1'#4'left'#3#128#0#3'top'#3#208#0#0#7'TAction'#5'actOK'#7'Capt'
+  +'ion'#6#2'OK'#18'DisableIfNoHandler'#9#9'OnExecute'#7#12'actOKExecute'#8'OnU'
+  +'pdate'#7#11'actOKUpdate'#0#0#7'TAction'#10'actPropAdd'#7'Caption'#6#12'New '
+  +'Property'#18'DisableIfNoHandler'#9#9'OnExecute'#7#17'actPropAddExecute'#0#0
+  +#7'TAction'#11'actPropEdit'#7'Caption'#6#13'Edit Property'#18'DisableIfNoHan'
+  +'dler'#9#9'OnExecute'#7#18'actPropEditExecute'#8'OnUpdate'#7#17'actPropEditU'
+  +'pdate'#0#0#7'TAction'#13'actPropDelete'#7'Caption'#6#15'Delete Property'#18
+  +'DisableIfNoHandler'#9#9'OnExecute'#7#20'actPropDeleteExecute'#8'OnUpdate'#7
+  +#17'actPropEditUpdate'#0#0#7'TAction'#8'actApply'#7'Caption'#6#5'Apply'#18'D'
+  +'isableIfNoHandler'#9#9'OnExecute'#7#15'actApplyExecute'#8'OnUpdate'#7#11'ac'
+  +'tOKUpdate'#0#0#7'TAction'#11'actMoveDown'#7'Caption'#6#9'Move Down'#18'Disa'
+  +'bleIfNoHandler'#9#9'OnExecute'#7#18'actMoveDownExecute'#8'OnUpdate'#7#17'ac'
+  +'tMoveDownUpdate'#0#0#7'TAction'#9'actMoveUp'#7'Caption'#6#7'Move Up'#18'Dis'
+  +'ableIfNoHandler'#9#9'OnExecute'#7#16'actMoveUpExecute'#8'OnUpdate'#7#15'act'
+  +'MoveUpUpdate'#0#0#0#10'TPopupMenu'#10'PopupMenu1'#4'left'#2'p'#3'top'#3#0#1
+  +#0#9'TMenuItem'#9'MenuItem1'#6'Action'#7#10'actPropAdd'#7'OnClick'#7#17'actP'
+  +'ropAddExecute'#0#0#9'TMenuItem'#9'MenuItem2'#6'Action'#7#11'actPropEdit'#7
+  +'OnClick'#7#18'actPropEditExecute'#0#0#9'TMenuItem'#9'MenuItem3'#6'Action'#7
+  +#13'actPropDelete'#7'OnClick'#7#20'actPropDeleteExecute'#0#0#0#10'TSynXMLSyn'
+  +#10'SynXMLSyn1'#13'DefaultFilter'#6'MDocuments XML (*.xml,*.xsd,*.xsl,*.xslt'
+  +',*.dtd)|*.xml;*.xsd;*.xsl;*.xslt;*.dtd'#7'Enabled'#8#16'WantBracesParsed'#8
+  +#4'left'#3#238#0#3'top'#3#199#0#0#0#0
 ]);
diff --git a/wst/trunk/type_lib_edtr/ufrecordedit.pas b/wst/trunk/type_lib_edtr/ufrecordedit.pas
index 4fd911ea7..8e7048343 100644
--- a/wst/trunk/type_lib_edtr/ufrecordedit.pas
+++ b/wst/trunk/type_lib_edtr/ufrecordedit.pas
@@ -28,6 +28,8 @@ type
 
   TfRecordEdit = class(TForm)
     actApply : TAction;
+    actMoveUp: TAction;
+    actMoveDown: TAction;
     actPropAdd : TAction;
     actPropEdit : TAction;
     actPropDelete : TAction;
@@ -39,6 +41,8 @@ type
     Button4 : TButton;
     Button5 : TButton;
     Button6 : TButton;
+    Button7: TButton;
+    Button8: TButton;
     edtDocumentation : TMemo;
     edtName : TEdit;
     edtSourceXSD : TSynEdit;
@@ -58,6 +62,10 @@ type
     tsSourceXSD : TTabSheet;
     tvDependency : TTreeView;
     procedure actApplyExecute(Sender : TObject);
+    procedure actMoveDownExecute(Sender: TObject);
+    procedure actMoveDownUpdate(Sender: TObject);
+    procedure actMoveUpExecute(Sender: TObject);
+    procedure actMoveUpUpdate(Sender: TObject);
     procedure actOKExecute(Sender : TObject);
     procedure actOKUpdate(Sender : TObject);
     procedure actPropAddExecute(Sender : TObject);
@@ -74,7 +82,8 @@ type
   private
     property UpdateType : TEditType read FUpdateType;
   private
-    procedure LoadField(AFieldDef : TPasVariable);
+    procedure MovePropertyItem(AItem : TPasVariable; const ANewIndex : Integer);
+    function LoadField(AFieldDef : TPasVariable; const AIndex : Integer) : TListItem;
     procedure LoadFromObject();
     procedure SaveToObject();
     
@@ -109,7 +118,7 @@ var
 begin
   prp := CreateProperty(FObject,FSymbolTable);
   if Assigned(prp) then begin
-    LoadField(prp);
+    LoadField(prp,-1);
   end;
 end;
 
@@ -127,13 +136,15 @@ procedure TfRecordEdit.actPropEditExecute(Sender : TObject);
 var
   prp : TPasVariable;
   itm : TListItem;
+  oldPos : Integer;
 begin
   itm := edtFields.ItemFocused;
   if Assigned(itm) then begin
     prp := TPasVariable(itm.Data);
     if UpdateProperty(prp,FSymbolTable) then begin
+      oldPos := itm.Index;
       itm.Free();
-      LoadField(prp);
+      LoadField(prp,oldPos);
     end;
   end;
 end;
@@ -156,6 +167,46 @@ begin
   end;
 end;
 
+procedure TfRecordEdit.MovePropertyItem(AItem: TPasVariable; const ANewIndex: Integer);
+
+  function FindNewMemberPosition() : Integer;
+  var
+    k, kcounter : Integer;
+    mlist : TList;
+    pp : TPasVariable;
+  begin
+    Result := 0;
+    kcounter := 0;
+    mlist := FObject.Members;
+    for k := 0 to Pred(mlist.Count) do begin
+      if TPasElement(mlist[k]).InheritsFrom(TPasVariable) then begin
+        Inc(kcounter);
+        if ( kcounter = ANewIndex ) then begin
+          Result := k;
+          Break;
+        end;
+      end;
+    end;
+  end;
+
+var
+  locItem : TListItem;
+  i : Integer;
+begin
+  if ( AItem <> nil ) and
+     ( ( ANewIndex >= 0 ) and ( ANewIndex < edtFields.Items.Count ) )
+  then begin
+    locItem := FindItem(FSymbolTable.GetExternalName(AItem),edtFields.Items);
+    if ( locItem <> nil ) then
+      locItem.Free();
+    FObject.Members.Exchange(FObject.Members.IndexOf(AItem),FindNewMemberPosition());
+    locItem := LoadField(AItem,ANewIndex);
+    edtFields.ItemFocused := locItem;
+    edtFields.Selected := locItem;
+    FApplied := True;
+  end;
+end;
+
 procedure TfRecordEdit.actOKExecute(Sender : TObject);
 begin
   ModalResult := mrOk;
@@ -168,7 +219,27 @@ begin
     ShowSourceXSD();
 end;
 
-procedure TfRecordEdit.LoadField(AFieldDef : TPasVariable);
+procedure TfRecordEdit.actMoveDownExecute(Sender: TObject);
+begin
+  MovePropertyItem(TPasVariable(edtFields.ItemFocused.Data),(edtFields.ItemFocused.Index + 1));
+end;
+
+procedure TfRecordEdit.actMoveDownUpdate(Sender: TObject);
+begin
+  TAction(Sender).Enabled := Assigned(edtFields.ItemFocused) and ( edtFields.ItemFocused.Index < Pred(edtFields.Items.Count) );
+end;
+
+procedure TfRecordEdit.actMoveUpExecute(Sender: TObject);
+begin
+  MovePropertyItem(TPasVariable(edtFields.ItemFocused.Data),(edtFields.ItemFocused.Index - 1));
+end;
+
+procedure TfRecordEdit.actMoveUpUpdate(Sender: TObject);
+begin
+  TAction(Sender).Enabled := Assigned(edtFields.ItemFocused) and ( edtFields.ItemFocused.Index > 0 );
+end;
+
+function TfRecordEdit.LoadField(AFieldDef : TPasVariable; const AIndex : Integer) : TListItem;
 var
   itm : TListItem;
   s, extName : string;
@@ -176,7 +247,10 @@ begin
   extName := FSymbolTable.GetExternalName(AFieldDef);
   itm := FindItem(extName,edtFields.Items);
   if ( itm = nil ) then begin
-    itm := edtFields.Items.Add();
+    if ( AIndex >= 0 ) and ( AIndex < edtFields.Items.Count ) then
+      itm := edtFields.Items.Insert(AIndex)
+    else
+      itm := edtFields.Items.Add();
   end;
   itm.Caption := extName;
   itm.SubItems.Add(FSymbolTable.GetExternalName(AFieldDef.VarType));
@@ -187,6 +261,7 @@ begin
   end;
   itm.SubItems.Add(s);
   itm.Data := AFieldDef;
+  Result := itm;
 end;
 
 procedure TfRecordEdit.LoadFromObject();
@@ -204,7 +279,7 @@ begin
     for i := 0 to Pred(FObject.Members.Count) do begin
       if TPasElement(FObject.Members[i]).InheritsFrom(TPasVariable) then begin
         prp := TPasVariable(FObject.Members[i]);
-        LoadField(prp);
+        LoadField(prp,-1);
       end;
     end;
   end else begin