Misc changes

Shane

git-svn-id: trunk@60 -

designer/designer.pp

@@ -34,6 +34,8 @@ type
       y: integer;
     end;
 
+
+
  TDesigner = class(TIDesigner)
   private
     FCustomForm: TCustomForm;
@@ -68,8 +70,11 @@ GridPoints : TGridPoint;
 constructor TDesigner.Create(CustomForm : TCustomForm);
 begin
 inherited Create;
+
+
 FCustomForm := CustomForm;
-ControlSelection := TControlSelection.Create(FCustomForm);
+//The controlselection should NOT be owned by the form.  When it is it shows up in the OI
+ControlSelection := TControlSelection.Create(CustomForm);
 end;
 
 destructor TDesigner.Destroy;

designer/objectinspector.pp

@@ -11,7 +11,6 @@ unit objectinspector;
 
 
   ToDo:
-   - the abstract
    - connect to TFormEditor
    - TCustomComboBox has a bug: it can not store objects
    - MouseDown is always fired two times -> workaround
@@ -21,8 +20,8 @@ unit objectinspector;
    - TCustomComboBox don't know custom draw yet
    - improve TextHeight function
    - combobox can't sort (exception)
-   - TEdit.OnChange and TEdit.OnExit don't work
-   - TEdit has no ReadOnly and Maxlength
+   - TEdit has no Maxlength property
+   - TEdit Readonly property is protected
    - backgroundcolor=clNone
    - DoubleClick on Property
 
@@ -58,6 +57,7 @@ type
     procedure GetLvl;
   public
     Index:integer;
+    LastPaintedValue:string;
     property Editor:TPropertyEditor read FEditor;
     property Top:integer read FTop write FTop;
     property Height:integer read FHeight write FHeight;
@@ -112,6 +112,7 @@ type
     function GetTreeIconX(Index:integer):integer;
     function RowRect(ARow:integer):TRect;
     procedure PaintRow(ARow:integer);
+    procedure DoPaint(PaintOnlyChangedValues:boolean);
 
     procedure SetSelections(const NewSelections:TComponentSelectionList);
 
@@ -138,6 +139,7 @@ type
 
     property Selections:TComponentSelectionList read FComponentList write SetSelections;
     procedure BuildPropertyList;
+    procedure RefreshPropertyValues;
 
     property RowCount:integer read GetRowCount;
     property Rows[Index:integer]:TOIPropertyGridRow read GetRow;
@@ -185,6 +187,7 @@ type
     procedure SetBounds(aLeft,aTop,aWidth,aHeight:integer); override;
     property Selections:TComponentSelectionList read FComponentList write SetSelections;
     procedure RefreshSelections;
+    procedure RefreshPropertyValues;
     procedure FillComponentComboBox;
     property RootComponent:TComponent read FRootComponent write SetRootComponent;
     procedure DoInnerResize;
@@ -357,18 +360,14 @@ begin
   if (FChangingItemIndex=false) and (FCurrentEdit<>nil)
   and (FItemIndex>=0) and (FItemIndex<FRows.Count) then begin
     CurRow:=Rows[FItemIndex];
-      if FCurrentEdit=ValueEdit then
-        NewValue:=ValueEdit.Text
-      else
-        NewValue:=ValueComboBox.Text;
+    if FCurrentEdit=ValueEdit then
+      NewValue:=ValueEdit.Text
+    else
+      NewValue:=ValueComboBox.Text;
     if NewValue<>CurRow.Editor.GetVisualValue then begin
       try
         CurRow.Editor.SetValue(NewValue);
       except
-        if FCurrentEdit=ValueEdit then
-          ValueEdit.Text:=CurRow.Editor.GetVisualValue
-        else
-          ValueComboBox.Text:=CurRow.Editor.GetVisualValue;
       end;
     end;
   end;
@@ -450,7 +449,6 @@ procedure TOIPropertyGrid.SetItemIndex(NewIndex:integer);
 var NewRow:TOIPropertyGridRow;
   NewValue:string;
 begin
-  // XXX
   SetRowValue;
   FChangingItemIndex:=true;
   if (FItemIndex<>NewIndex) then begin
@@ -895,9 +893,10 @@ begin
       CurRow.Editor.PropDrawValue(Canvas,ValueRect,DrawState);
       Font:=OldFont;
     end;
+    CurRow.LastPaintedValue:=CurRow.Editor.GetVisualValue;
     // draw frame
     Pen.Color:=cl3DDkShadow;
-    MoveTo(ValueRect.Left,ValueRect.Bottom-1);
+    MoveTo(ValueRect.Left-1,ValueRect.Bottom-1);
     LineTo(ValueRect.Right,ValueRect.Bottom-1);
     Pen.Color:=cl3DLight;
     MoveTo(ValueRect.Left,ValueRect.Bottom-1);
@@ -905,38 +904,58 @@ begin
   end;
 end;
 
-procedure TOIPropertyGrid.Paint;
+procedure TOIPropertyGrid.DoPaint(PaintOnlyChangedValues:boolean);
 var a:integer;
   SpaceRect:TRect;
 begin
-  inherited Paint;
-  with Canvas do begin
-    // draw properties
+  if not PaintOnlyChangedValues then begin
+    with Canvas do begin
+      // draw properties
+      for a:=0 to FRows.Count-1 do begin
+        PaintRow(a);
+      end;
+      // draw unused space below rows
+      SpaceRect:=Rect(BorderWidth,BorderWidth,TrackBar.Left-1,Height-BorderWidth);
+      if FRows.Count>0 then
+        SpaceRect.Top:=Rows[FRows.Count-1].Bottom-FTopY+BorderWidth;
+// TWinControl(Parent).InvalidateRect(Self,SpaceRect,true);
+      if FBackgroundColor<>clNone then begin
+        Brush.Color:=FBackgroundColor;
+        FillRect(SpaceRect);
+      end;
+      // draw border
+      Pen.Color:=cl3DDkShadow;
+      for a:=0 to BorderWidth-1 do begin
+        MoveTo(a,Self.Height-1-a);
+        LineTo(a,a);
+        LineTo(Self.Width-1-a,a);
+      end;
+      Pen.Color:=cl3DLight;
+      for a:=0 to BorderWidth-1 do begin
+        MoveTo(Self.Width-1-a,a);
+        LineTo(Self.Width-1-a,Self.Height-1-a);
+        LineTo(a,Self.Height-1-a);
+      end;
+    end;
+  end else begin
     for a:=0 to FRows.Count-1 do begin
-      PaintRow(a);
-    end;
-    // draw unused space below rows
-    SpaceRect:=Rect(BorderWidth,BorderWidth,TrackBar.Left-1,Height-BorderWidth);
-    Brush.Color:=FBackgroundColor;
-    if FRows.Count>0 then
-      SpaceRect.Top:=Rows[FRows.Count-1].Bottom-FTopY+BorderWidth;
-    FillRect(SpaceRect);
-    // draw border
-    Pen.Color:=cl3DDkShadow;
-    for a:=0 to BorderWidth-1 do begin
-      MoveTo(a,Self.Height-1-a);
-      LineTo(a,a);
-      LineTo(Self.Width-1-a,a);
-    end;
-    Pen.Color:=cl3DLight;
-    for a:=0 to BorderWidth-1 do begin
-      MoveTo(Self.Width-1-a,a);
-      LineTo(Self.Width-1-a,Self.Height-1-a);
-      LineTo(a,Self.Height-1-a);
+      if Rows[a].Editor.GetVisualValue<>Rows[a].LastPaintedValue then
+        PaintRow(a);
     end;
   end;
 end;
 
+procedure TOIPropertyGrid.Paint;
+begin
+  inherited Paint;
+  DoPaint(false);
+end;
+
+procedure TOIPropertyGrid.RefreshPropertyValues;
+begin
+  DoPaint(true);
+end;
+
 function TOIPropertyGrid.RowRect(ARow:integer):TRect;
 begin
   Result.Left:=BorderWidth;
@@ -1008,6 +1027,7 @@ begin
   FTop:=0;
   FHeight:=FTree.DefaultItemHeight;
   Index:=-1;
+  LastPaintedValue:='';
 end;
 
 destructor TOIPropertyGridRow.Destroy;
@@ -1186,6 +1206,12 @@ begin
   EventGrid.Selections:=FComponentList;
 end;
 
+procedure TObjectinspector.RefreshPropertyValues;
+begin
+  PropertyGrid.RefreshPropertyValues;
+  EventGrid.RefreshPropertyValues;
+end;
+
 procedure TObjectinspector.SetBounds(aLeft,aTop,aWidth,aHeight:integer);
 begin
   inherited SetBounds(aLeft,aTop,aWidth,aHeight);

designer/propedits.pp

@@ -51,7 +51,7 @@ type
   private
     FComponents:TList;
     function GetItems(Index: integer): TComponent;
-    procedure SetItems(Index: integer; const Value: TComponent);
+    procedure SetItems(Index: integer; const CompValue: TComponent);
     function GetCount: integer;
     function GetCapacity:integer;
     procedure SetCapacity(const NewCapacity:integer);
@@ -276,15 +276,15 @@ type
     function GetMethodValueAt(Index:Integer):TMethod;
     function GetOrdValue:Longint;
     function GetOrdValueAt(Index:Integer):Longint;
-    function GetStrValue:string;
-    function GetStrValueAt(Index:Integer):string;
+    function GetStrValue:AnsiString;
+    function GetStrValueAt(Index:Integer):AnsiString;
     function GetVarValue:Variant;
     function GetVarValueAt(Index:Integer):Variant;
     procedure SetFloatValue(NewValue:Extended);
     procedure SetMethodValue(const NewValue:TMethod);
     procedure SetInt64Value(NewValue:Int64);
     procedure SetOrdValue(NewValue:Longint);
-    procedure SetStrValue(const NewValue:string);
+    procedure SetStrValue(const NewValue:AnsiString);
     procedure SetVarValue(const NewValue:Variant);
     procedure Modified;
   public
@@ -324,7 +324,7 @@ type
     //property Designer:IFormDesigner read FDesigner;
     property PrivateDirectory:string read GetPrivateDirectory;
     property PropCount:Integer read FPropCount;
-    property Value2:string read GetValue write SetValue;
+    property FirstValue:string read GetValue write SetValue;
   end;
 
   TPropertyEditorClass=class of TPropertyEditor;
@@ -356,7 +356,7 @@ type
   TCharPropertyEditor = class(TOrdinalPropertyEditor)
   public
     function GetValue: string; override;
-    procedure SetValue(const Value: string); override;
+    procedure SetValue(const NewValue: string); override;
   end;
 
 { TEnumPropertyEditor
@@ -368,7 +368,7 @@ type
     function GetAttributes: TPropertyAttributes; override;
     function GetValue: string; override;
     procedure GetValues(Proc: TGetStringProc); override;
-    procedure SetValue(const Value: string); override;
+    procedure SetValue(const NewValue: string); override;
   end;
 
 { TBoolPropertyEditor
@@ -377,7 +377,7 @@ type
   TBoolPropertyEditor = class(TEnumPropertyEditor)
     function GetValue: string; override;
     procedure GetValues(Proc: TGetStringProc); override;
-    procedure SetValue(const Value: string); override;
+    procedure SetValue(const NewValue: string); override;
   end;
 
 { TInt64PropertyEditor
@@ -388,7 +388,7 @@ type
     function AllEqual: Boolean; override;
     function GetEditLimit: Integer; override;
     function GetValue: string; override;
-    procedure SetValue(const Value: string); override;
+    procedure SetValue(const NewValue: string); override;
   end;
 
 { TFloatPropertyEditor
@@ -399,7 +399,7 @@ type
   public
     function AllEqual: Boolean; override;
     function GetValue: string; override;
-    procedure SetValue(const Value: string); override;
+    procedure SetValue(const NewValue: string); override;
   end;
 
 { TStringPropertyEditor
@@ -411,7 +411,7 @@ type
     function AllEqual: Boolean; override;
     function GetEditLimit: Integer; override;
     function GetValue: string; override;
-    procedure SetValue(const Value: string); override;
+    procedure SetValue(const NewValue: string); override;
   end;
 
 { TNestedPropertyEditor
@@ -441,7 +441,7 @@ type
     function GetName: string; override;
     function GetValue: string; override;
     procedure GetValues(Proc: TGetStringProc); override;
-    procedure SetValue(const Value: string); override;
+    procedure SetValue(const NewValue: string); override;
    end;
 
 { TSetPropertyEditor
@@ -497,7 +497,7 @@ type
     function GetEditLimit: Integer; override;
     function GetValue: string; override;
     procedure GetValues(Proc: TGetStringProc); override;
-    procedure SetValue(const Value: string); override;
+    procedure SetValue(const NewValue: string); override;
   end;
 
 { TComponentNamePropertyEditor
@@ -509,7 +509,7 @@ type
     function GetAttributes: TPropertyAttributes; override;
     function GetEditLimit: Integer; override;
     function GetValue: string; override;
-    procedure SetValue(const Value: string); override;
+    procedure SetValue(const NewValue: string); override;
   end;
 
 { TModalResultPropertyEditor }
@@ -519,7 +519,7 @@ type
     function GetAttributes: TPropertyAttributes; override;
     function GetValue: string; override;
     procedure GetValues(Proc: TGetStringProc); override;
-    procedure SetValue(const Value: string); override;
+    procedure SetValue(const NewValue: string); override;
   end;
 
 { TColorPropertyEditor
@@ -533,11 +533,11 @@ type
     function GetAttributes: TPropertyAttributes; override;
     function GetValue: string; override;
     procedure GetValues(Proc: TGetStringProc); override;
-    procedure SetValue(const Value: string); override;
+    procedure SetValue(const NewValue: string); override;
 
-    procedure ListMeasureWidth(const NewValue:string; Index:integer;
+    procedure ListMeasureWidth(const CurValue:string; Index:integer;
       ACanvas:TCanvas;  var AWidth:Integer);  override;
-    procedure ListDrawValue(const NewValue:string; Index:integer;
+    procedure ListDrawValue(const CurValue:string; Index:integer;
       ACanvas:TCanvas;  const ARect:TRect; AState: TPropEditDrawState); override;
     procedure PropDrawValue(ACanvas:TCanvas; const ARect:TRect;
       AState:TPropEditDrawState); override;
@@ -548,9 +548,9 @@ type
 
   TBrushStylePropertyEditor = class(TEnumPropertyEditor)
   public
-    procedure ListMeasureWidth(const Value: string; Index:integer;
+    procedure ListMeasureWidth(const CurValue: string; Index:integer;
       ACanvas: TCanvas;  var AWidth: Integer); override;
-    procedure ListDrawValue(const Value: string; Index:integer;
+    procedure ListDrawValue(const CurValue: string; Index:integer;
       ACanvas: TCanvas;  const ARect: TRect; AState: TPropEditDrawState); override;
     procedure PropDrawValue(ACanvas: TCanvas; const ARect: TRect;
       AState:TPropEditDrawState); override;
@@ -561,9 +561,9 @@ type
 
   TPenStylePropertyEditor = class(TEnumPropertyEditor)
   public
-    procedure ListMeasureWidth(const Value: string; Index:integer;
+    procedure ListMeasureWidth(const CurValue: string; Index:integer;
       ACanvas: TCanvas;  var AWidth: Integer); override;
-    procedure ListDrawValue(const Value: string; Index:integer;
+    procedure ListDrawValue(const CurValue: string; Index:integer;
       ACanvas: TCanvas;  const ARect: TRect; AState: TPropEditDrawState); override;
     procedure PropDrawValue(ACanvas: TCanvas; const ARect: TRect;
       AState:TPropEditDrawState); override;
@@ -713,6 +713,7 @@ implementation
 uses Dialogs, Math;
 
 //==============================================================================
+// simple error messages
 
 procedure ShowMessageDialog(const s:string);
 var MessageDialog:TMessageDialog;
@@ -792,6 +793,113 @@ const
     nil                    // tkQWord
     );
 
+// XXX ToDo: There is a big in the typinfo.pp. Thus this workaround -------
+
+Procedure SetIndexValues (P: PPRopInfo; Var Index,IValue : Longint);
+begin
+  Index:=((P^.PropProcs shr 6) and 1);
+  If Index<>0 then
+    IValue:=P^.Index
+  else
+    IValue:=0;
+end;
+
+function CallIntegerProc(s : Pointer;Address : Pointer;Value : Integer;
+Index,IValue : Longint) : Integer;  assembler;
+asm
+   movl S,%esi
+   movl Address,%edi
+   // Push value to set
+   movl Value,%eax
+   pushl %eax
+   // ? Indexed procedure
+   movl Index,%eax
+   testl %eax,%eax
+   je .LIPNoPush
+   movl IValue,%eax
+   pushl %eax
+.LIPNoPush:
+   pushl %esi
+   call %edi
+end;
+
+procedure CallSStringProc(s : Pointer;Address : Pointer;
+  const Value : ShortString; Index,IVAlue : Longint);  assembler;
+asm
+   movl S,%esi
+   movl Address,%edi
+   // Push value to set
+   movl Value,%eax
+   pushl %eax
+   // ? Indexed procedure
+   movl Index,%eax
+   testl %eax,%eax
+   // MG: here was a bug (jnz)
+   je .LSSPNoPush
+   movl IValue,%eax
+   pushl %eax
+.LSSPNoPush:
+   // MG: and here was a bug too (push)
+   pushl %esi
+   call %edi
+end;
+
+procedure SetAStrProp(Instance : TObject;PropInfo : PPropInfo;
+  const Value : AnsiString);
+//Dirty trick based on fact that AnsiString is just a pointer,
+//hence can be treated like an integer type.
+var
+  s: AnsiString;
+  Index,Ivalue : Longint;
+begin
+  { Another dirty trick which is necessary to increase the reference
+   counter of Value... }
+  s := Value;
+  Pointer(s) := nil;
+
+  SetIndexValues(PropInfo,Index,IValue);
+  case (PropInfo^.PropProcs shr 2) and 3 of
+    ptfield:
+      PLongint(Pointer(Instance)+Longint(PropInfo^.SetProc))^:=
+        Longint(Pointer(Value)) ;
+    ptstatic:
+      CallIntegerProc(
+        Instance,PropInfo^.SetProc,Longint(Pointer(Value)),Index,IValue);
+    ptvirtual:
+      CallIntegerProc(Instance
+        ,PPointer(Pointer(Instance.ClassType)+Longint(PropInfo^.SetProc))^
+        ,Longint(Pointer(Value)),Index,IValue);
+  end;
+end;
+
+procedure SetSStrProp(Instance : TObject;PropInfo : PPropInfo;
+  const Value : ShortString);
+var Index,IValue: longint;
+begin
+  SetIndexValues(PropInfo,Index,IValue);
+  case (PropInfo^.PropProcs shr 2) and 3 of
+    ptfield:
+      PShortString(Pointer(Instance)+Longint(PropInfo^.SetProc))^:=Value;
+    ptstatic:
+      // MG: here was a bug (Getproc)
+      CallSStringProc(Instance,PropInfo^.SetProc,Value,Index,IValue);
+    ptvirtual:
+      // MG: here was a bug (Getproc)
+      CallSStringProc(Instance,PPointer(Pointer(Instance.ClassType)+Longint(PropInfo^.SetProc))^,Value,Index,IValue);
+  end;
+end;
+
+procedure SetStrProp(Instance : TObject;PropInfo : PPropInfo;
+  const Value : AnsiString);
+begin
+  case Propinfo^.PropType^.Kind of
+    tkSString : SetSStrProp(Instance,PropInfo,Value);
+    tkAString : SetAStrProp(Instance,Propinfo,Value);
+  end;
+end;
+
+
+
 // XXX ToDo: These variables/functions have bugs. Thus I provide my own ------
 
 function StrToInt64(const s:string):int64;
@@ -1218,7 +1326,7 @@ end;
 
 procedure TPropertyEditor.Edit;
 type
-  TGetStrFunc=function(const Value:string):Integer of object;
+  TGetStrFunc=function(const StrValue:string):Integer of object;
 var
   I:Integer;
   Values:TStringList;
@@ -1231,9 +1339,9 @@ begin
     AddValue:=@Values.Add;
     GetValues(TGetStringProc(AddValue));
     if Values.Count > 0 then begin
-      I:=Values.IndexOf(Value2)+1;
+      I:=Values.IndexOf(FirstValue)+1;
       if I=Values.Count then I:=0;
-      Value2:=Values[I];
+      FirstValue:=Values[I];
     end;
   finally
     Values.Free;
@@ -1318,12 +1426,12 @@ begin
   Result:=FPropList^[0].PropInfo^.PropType;
 end;
 
-function TPropertyEditor.GetStrValue:string;
+function TPropertyEditor.GetStrValue:AnsiString;
 begin
   Result:=GetStrValueAt(0);
 end;
 
-function TPropertyEditor.GetStrValueAt(Index:Integer):string;
+function TPropertyEditor.GetStrValueAt(Index:Integer):AnsiString;
 begin
   with FPropList^[Index] do Result:=GetStrProp(Instance,PropInfo);
 end;
@@ -1397,14 +1505,13 @@ end;
 procedure TPropertyEditor.SetPropEntry(Index:Integer;
   AInstance:TPersistent; APropInfo:PPropInfo);
 begin
-  with FPropList^[Index] do
-  begin
+  with FPropList^[Index] do begin
     Instance:=AInstance;
     PropInfo:=APropInfo;
   end;
 end;
 
-procedure TPropertyEditor.SetStrValue(const NewValue:string);
+procedure TPropertyEditor.SetStrValue(const NewValue:AnsiString);
 var
   I:Integer;
 begin
@@ -1603,13 +1710,14 @@ begin
     Result:='#'+IntToStr(Ord(Ch));
 end;
 
-procedure TCharPropertyEditor.SetValue(const Value: string);
+procedure TCharPropertyEditor.SetValue(const NewValue: string);
 var
   L: Longint;
 begin
-  if Length(Value) = 0 then L := 0 else
-    if Length(Value) = 1 then L := Ord(Value[1]) else
-      if Value[1] = '#' then L := StrToInt(Copy(Value, 2, Maxint)) else begin
+  if Length(NewValue) = 0 then L := 0 else
+    if Length(NewValue) = 1 then L := Ord(NewValue[1]) else
+      if NewValue[1] = '#' then L := StrToInt(Copy(NewValue, 2, Maxint)) else
+      begin
         {raise EPropertyError.CreateRes(@SInvalidPropertyValue)};
         exit;
       end;
@@ -1648,11 +1756,11 @@ begin
     for I := MinValue to MaxValue do Proc(GetEnumName(EnumType, I));
 end;
 
-procedure TEnumPropertyEditor.SetValue(const Value: string);
+procedure TEnumPropertyEditor.SetValue(const NewValue: string);
 var
   I: Integer;
 begin
-  I := GetEnumValue(GetPropType, Value);
+  I := GetEnumValue(GetPropType, NewValue);
   if I < 0 then begin
     {raise EPropertyError.CreateRes(@SInvalidPropertyValue)};
     exit;
@@ -1676,16 +1784,16 @@ begin
   Proc('True');
 end;
 
-procedure TBoolPropertyEditor.SetValue(const Value: string);
+procedure TBoolPropertyEditor.SetValue(const NewValue: string);
 var
   I: Integer;
 begin
-  if CompareText(Value, 'False') = 0 then
+  if CompareText(NewValue, 'False') = 0 then
     I := 0
-  else if CompareText(Value, 'True') = 0 then
+  else if CompareText(NewValue, 'True') = 0 then
     I := -1
   else
-    I := StrToInt(Value);
+    I := StrToInt(NewValue);
   SetOrdValue(I);
 end;
 
@@ -1716,9 +1824,9 @@ begin
   Result := IntToStr(GetInt64Value);
 end;
 
-procedure TInt64PropertyEditor.SetValue(const Value: string);
+procedure TInt64PropertyEditor.SetValue(const NewValue: string);
 begin
-  SetInt64Value(StrToInt64(Value));
+  SetInt64Value(StrToInt64(NewValue));
 end;
 
 
@@ -1747,9 +1855,9 @@ begin
     Precisions[GetTypeData(GetPropType)^.FloatType], 0);
 end;
 
-procedure TFloatPropertyEditor.SetValue(const Value: string);
+procedure TFloatPropertyEditor.SetValue(const NewValue: string);
 begin
-  SetFloatValue(StrToFloat(Value));
+  SetFloatValue(StrToFloat(NewValue));
 end;
 
 { TStringPropertyEditor }
@@ -1780,9 +1888,9 @@ begin
   Result := GetStrValue;
 end;
 
-procedure TStringPropertyEditor.SetValue(const Value: string);
+procedure TStringPropertyEditor.SetValue(const NewValue: string);
 begin
-  SetStrValue(Value);
+  SetStrValue(NewValue);
 end;
 
 { TNestedPropertyEditor }
@@ -1851,12 +1959,12 @@ begin
   Proc(BooleanIdents[True]);
 end;
 
-procedure TSetElementPropertyEditor.SetValue(const Value: string);
+procedure TSetElementPropertyEditor.SetValue(const NewValue: string);
 var
   S: TIntegerSet;
 begin
   Integer(S) := GetOrdValue;
-  if CompareText(Value, 'True') = 0 then
+  if CompareText(NewValue, 'True') = 0 then
     Include(S, FElement) else
     Exclude(S, FElement);
   SetOrdValue(Integer(S));
@@ -2104,10 +2212,10 @@ begin
   {Designer.GetComponentNames(GetTypeData(GetPropType), Proc);}
 end;
 
-procedure TComponentPropertyEditor.SetValue(const Value: string);
+procedure TComponentPropertyEditor.SetValue(const NewValue: string);
 {var Component: TComponent;}
 begin
-  {if Value = '' then Component := nil else
+  {if NewValue = '' then Component := nil else
   begin
     Component := Designer.GetComponent(Value);
     if not (Component is GetTypeData(GetPropType)^.ClassType) then
@@ -2134,9 +2242,9 @@ begin
   //writeln('OI: Get ComponentName Len'+IntToStr(length(Result))+',Name='''+Result+'''');
 end;
 
-procedure TComponentNamePropertyEditor.SetValue(const Value: string);
+procedure TComponentNamePropertyEditor.SetValue(const NewValue: string);
 begin
-  inherited SetValue(Value);
+  inherited SetValue(NewValue);
   //writeln('OI: Set ComponentName Len'+IntToStr(length(Value))+',Name='''+Value+'''');
 end;
 
@@ -2181,22 +2289,21 @@ begin
   for I := Low(ModalResults) to High(ModalResults) do Proc(ModalResults[I]);
 end;
 
-procedure TModalResultPropertyEditor.SetValue(const Value: string);
+procedure TModalResultPropertyEditor.SetValue(const NewValue: string);
 var
   I: Integer;
 begin
-  if Value = '' then
-  begin
+  if NewValue = '' then begin
     SetOrdValue(0);
     Exit;
   end;
   for I := Low(ModalResults) to High(ModalResults) do
-    if CompareText(ModalResults[I], Value) = 0 then
+    if CompareText(ModalResults[I], NewValue) = 0 then
     begin
       SetOrdValue(I);
       Exit;
     end;
-  inherited SetValue(Value);
+  inherited SetValue(NewValue);
 end;
 
 { TColorPropertyEditor }
@@ -2275,7 +2382,7 @@ begin
     inherited PropDrawValue(ACanvas, ARect, AState);
 end;
 
-procedure TColorPropertyEditor.ListDrawValue(const NewValue:string;
+procedure TColorPropertyEditor.ListDrawValue(const CurValue:string;
 Index:integer; ACanvas:TCanvas;  const ARect:TRect; AState: TPropEditDrawState);
 
   function ColorToBorderColor(AColor: TColor): TColor;
@@ -2313,7 +2420,7 @@ begin
     Rectangle(ARect.Left, ARect.Top, vRight, vBottom);
 
     // set things up and do the work
-    Brush.Color := StringToColor(NewValue);
+    Brush.Color := StringToColor(CurValue);
     Pen.Color := ColorToBorderColor(ColorToRGB(Brush.Color));
     Rectangle(ARect.Left + 1, ARect.Top + 1, vRight - 1, vBottom - 1);
 
@@ -2321,26 +2428,26 @@ begin
     Brush.Color := vOldBrushColor;
     Pen.Color := vOldPenColor;
   finally
-    inherited ListDrawValue(NewValue, Index, ACanvas,
+    inherited ListDrawValue(CurValue, Index, ACanvas,
                             Rect(vRight, ARect.Top, ARect.Right, ARect.Bottom),
                             AState);
   end;
 end;
 
-procedure TColorPropertyEditor.ListMeasureWidth(const NewValue:string;
+procedure TColorPropertyEditor.ListMeasureWidth(const CurValue:string;
   Index:integer;  ACanvas:TCanvas;  var AWidth:Integer);
 begin
   AWidth := AWidth + ACanvas.TextHeight('M') {* 2};
 end;
 
-procedure TColorPropertyEditor.SetValue(const Value: string);
+procedure TColorPropertyEditor.SetValue(const NewValue: string);
 var
-  NewValue: Longint;
+  CValue: Longint;
 begin
-  if IdentToColor(Value, NewValue) then
-    SetOrdValue(NewValue)
+  if IdentToColor(NewValue, CValue) then
+    SetOrdValue(CValue)
   else
-    inherited SetValue(Value);
+    inherited SetValue(NewValue);
 end;
 
 { TBrushStylePropertyEditor }
@@ -2354,7 +2461,7 @@ begin
     inherited PropDrawValue(ACanvas, ARect, AState);
 end;
 
-procedure TBrushStylePropertyEditor.ListDrawValue(const Value: string;
+procedure TBrushStylePropertyEditor.ListDrawValue(const CurValue: string;
   Index:integer;  ACanvas: TCanvas; const ARect: TRect; AState:TPropEditDrawState);
 var
   vRight, vBottom: Integer;
@@ -2377,7 +2484,7 @@ begin
 
     // set things up
     Pen.Color := clWindowText;
-    Brush.Style := TBrushStyle(GetEnumValue(GetPropInfo^.PropType, Value));
+    Brush.Style := TBrushStyle(GetEnumValue(GetPropInfo^.PropType, CurValue));
 
     // bsClear hack
     if Brush.Style = bsClear then begin
@@ -2395,13 +2502,13 @@ begin
     Brush.Style := vOldBrushStyle;
     Pen.Color := vOldPenColor;
   finally
-    inherited ListDrawValue(Value, Index, ACanvas,
+    inherited ListDrawValue(CurValue, Index, ACanvas,
                             Rect(vRight, ARect.Top, ARect.Right, ARect.Bottom),
                             AState);
   end;
 end;
 
-procedure TBrushStylePropertyEditor.ListMeasureWidth(const Value: string;
+procedure TBrushStylePropertyEditor.ListMeasureWidth(const CurValue: string;
   Index:integer;  ACanvas: TCanvas; var AWidth: Integer);
 begin
   AWidth := AWidth + ACanvas.TextHeight('A') {* 2};
@@ -2418,7 +2525,7 @@ begin
     inherited PropDrawValue(ACanvas, ARect, AState);
 end;
 
-procedure TPenStylePropertyEditor.ListDrawValue(const Value: string;
+procedure TPenStylePropertyEditor.ListDrawValue(const CurValue: string;
   Index:integer;  ACanvas: TCanvas; const ARect: TRect; AState:TPropEditDrawState);
 var
   vRight, vTop, vBottom: Integer;
@@ -2446,7 +2553,7 @@ begin
 
     // set thing up and do work
     Pen.Color := clWindowText;
-    Pen.Style := TPenStyle(GetEnumValue(GetPropInfo^.PropType, Value));
+    Pen.Style := TPenStyle(GetEnumValue(GetPropInfo^.PropType, CurValue));
     MoveTo(ARect.Left + 1, vTop);
     LineTo(vRight - 1, vTop);
     MoveTo(ARect.Left + 1, vTop + 1);
@@ -2457,13 +2564,13 @@ begin
     Pen.Style := vOldPenStyle;
     Pen.Color := vOldPenColor;
   finally
-    inherited ListDrawValue(Value, -1, ACanvas,
+    inherited ListDrawValue(CurValue, -1, ACanvas,
                             Rect(vRight, ARect.Top, ARect.Right, ARect.Bottom),
                             AState);
   end;
 end;
 
-procedure TPenStylePropertyEditor.ListMeasureWidth(const Value: string;
+procedure TPenStylePropertyEditor.ListMeasureWidth(const CurValue: string;
   Index:integer;  ACanvas: TCanvas; var AWidth: Integer);
 begin
   AWidth := AWidth + ACanvas.TextHeight('X') * 2;
@@ -2543,9 +2650,9 @@ begin
 end;
 
 procedure TComponentSelectionList.SetItems(Index: integer;
-  const Value: TComponent);
+  const CompValue: TComponent);
 begin
-  FComponents[Index]:=Value;
+  FComponents[Index]:=CompValue;
 end;
 
 function TComponentSelectionList.GetCapacity:integer;

designer/test_unit.pp

@@ -58,17 +58,21 @@ type
     FMyEnum:TMyEnum;
     FMySet:TMySet;
     FMyFont:TFont;
-    FMyString:string;
+    FMyAnsiString:AnsiString;
+    FMyShortString:ShortString;
     FMyBool:boolean;
     FMyBrush:TBrush;
     FMyPen:TPen;
+    procedure SetMyAnsiString(const NewValue:AnsiString);
+    procedure SetMyShortString(const NewValue:ShortString);
   published
     property MyInteger:integer read FMyInteger write FMyInteger;
     property MyCardinal:cardinal read FMyCardinal write FMyCardinal;
     property MyEnum:TMyEnum read FMyEnum write FMyEnum;
     property MySet:TMySet read FMySet write FMySet;
     property MyFont:TFont read FMyFont write FMyFont;
-    property MyString:string read FMyString write FMyString;
+    property MyAnsiString:AnsiString read FMyAnsiString write SetMyAnsiString;
+    property MyShortString:ShortString read FMyShortString write SetMyShortString;
     property MyBool:Boolean read FMyBool write FMyBool;
     property MyBrush:TBrush read FMyBrush write FMyBrush;
     property MyPen:TPen read FMyPen write FMyPen;
@@ -80,8 +84,17 @@ var
 
 implementation
 
+procedure TForm1.SetMyAnsiString(const NewValue:AnsiString);
+begin
+  FMyAnsiString:=NewValue;
+end;
 
-constructor TForm1.Create(AOwner: TComponent);	
+procedure TForm1.SetMyShortString(const NewValue:ShortString);
+begin
+  FMyShortString:=NewValue;
+end;
+
+constructor TForm1.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
   FMySet:=[MyEnum1];
@@ -125,7 +138,7 @@ end;
 
 procedure TForm1.OIRefreshButtonClick(Sender : TObject);
 begin
-  OI.RefreshSelections;
+  OI.RefreshPropertyValues;
 end;
 
 procedure TForm1.EditToComboButtonClick(Sender : TObject);

ide/customformeditor.pp

@@ -25,7 +25,7 @@ unit CustomFormEditor;
 interface
 
 uses
-  classes, abstractformeditor, controls,propedits,Typinfo,ObjectInspector;
+  classes, abstractformeditor, controls,propedits,Typinfo,ObjectInspector,forms;
 
 Const OrdinalTypes = [tkInteger,tkChar,tkENumeration,tkbool];
 
@@ -42,6 +42,7 @@ TSetProc = Procedure (const Value) of Object;
 TGetProc = Function : Variant of Object;
 
 
+
   TComponentInterface = class(TIComponentInterface)
       private
         FControl : TComponent;