paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-02 23:40:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDEIntf: Use Classes.TGetStrProc instead of PropEdits.TGetStringProc

Browse Source 
git-svn-id: trunk@23506 -
This commit is contained in:
ask 2010-01-20 15:53:39 +00:00
parent 6a33b4b69e
commit b0d8c7c5df
3 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ideintf/graphpropedits.pas
View File

@ -63,7 +63,7 @@ type
procedure Edit; override; procedure Edit; override;
function GetAttributes: TPropertyAttributes; override; function GetAttributes: TPropertyAttributes; override;
function OrdValueToVisualValue(OrdValue: longint): string; override; function OrdValueToVisualValue(OrdValue: longint): string; override;
procedure GetValues(Proc: TGetStringProc); override; procedure GetValues(Proc: TGetStrProc); override;
procedure SetValue(const NewValue: ansistring); override; procedure SetValue(const NewValue: ansistring); override;
procedure ListMeasureWidth(const CurValue: ansistring; Index: integer; procedure ListMeasureWidth(const CurValue: ansistring; Index: integer;
ACanvas: TCanvas; var AWidth: Integer); override; ACanvas: TCanvas; var AWidth: Integer); override;
@ -118,7 +118,7 @@ type
TFontNamePropertyEditor = class(TStringPropertyEditor) TFontNamePropertyEditor = class(TStringPropertyEditor)
public public
function GetAttributes: TPropertyAttributes; override; function GetAttributes: TPropertyAttributes; override;
procedure GetValues(Proc: TGetStringProc); override; procedure GetValues(Proc: TGetStrProc); override;
end; end;
{ TFontCharsetPropertyEditor { TFontCharsetPropertyEditor
@ -129,7 +129,7 @@ type
public public
function GetAttributes: TPropertyAttributes; override; function GetAttributes: TPropertyAttributes; override;
function OrdValueToVisualValue(OrdValue: longint): string; override; function OrdValueToVisualValue(OrdValue: longint): string; override;
procedure GetValues(Proc: TGetStringProc); override; procedure GetValues(Proc: TGetStrProc); override;
procedure SetValue(const NewValue: ansistring); override; procedure SetValue(const NewValue: ansistring); override;
end; end;
@ -141,7 +141,7 @@ type
function GetImageList: TCustomImageList; virtual; function GetImageList: TCustomImageList; virtual;
public public
function GetAttributes: TPropertyAttributes; override; function GetAttributes: TPropertyAttributes; override;
procedure GetValues(Proc: TGetStringProc); override; procedure GetValues(Proc: TGetStrProc); override;
procedure ListMeasureHeight(const AValue: ansistring; Index:integer; procedure ListMeasureHeight(const AValue: ansistring; Index:integer;
ACanvas:TCanvas; var AHeight: Integer); override; ACanvas:TCanvas; var AHeight: Integer); override;
procedure ListDrawValue(const CurValue: ansistring; Index:integer; procedure ListDrawValue(const CurValue: ansistring; Index:integer;
@ -310,7 +310,7 @@ begin
Result := ColorToString(TColor(OrdValue)); Result := ColorToString(TColor(OrdValue));
end; end;
procedure TColorPropertyEditor.GetValues(Proc: TGetStringProc); procedure TColorPropertyEditor.GetValues(Proc: TGetStrProc);
begin begin
GetColorValues(Proc); GetColorValues(Proc);
end; end;
@ -426,7 +426,7 @@ begin
Result := [paMultiSelect, paValueList, paRevertable]; Result := [paMultiSelect, paValueList, paRevertable];
end; end;
procedure TFontNamePropertyEditor.GetValues(Proc: TGetStringProc); procedure TFontNamePropertyEditor.GetValues(Proc: TGetStrProc);
var var
I: Integer; I: Integer;
begin begin
@ -447,7 +447,7 @@ begin
Result := CharsetToString(OrdValue); Result := CharsetToString(OrdValue);
end; end;
procedure TFontCharsetPropertyEditor.GetValues(Proc: TGetStringProc); procedure TFontCharsetPropertyEditor.GetValues(Proc: TGetStrProc);
begin begin
proc(CharsetToString(ANSI_CHARSET)); proc(CharsetToString(ANSI_CHARSET));
proc(CharsetToString(DEFAULT_CHARSET)); proc(CharsetToString(DEFAULT_CHARSET));
@ -697,7 +697,7 @@ begin
Result := Result + [paHasDefaultValue]; Result := Result + [paHasDefaultValue];
end; end;
procedure TImageIndexPropertyEditor.GetValues(Proc: TGetStringProc); procedure TImageIndexPropertyEditor.GetValues(Proc: TGetStrProc);
var var
Images: TCustomImageList; Images: TCustomImageList;
I: Integer; I: Integer;

2
ideintf/newfield.pas
View File

@ -67,7 +67,7 @@ type
{ Private declarations } { Private declarations }
LinkDataSet: TDataSet; LinkDataSet: TDataSet;
FDesigner: TComponentEditorDesigner; FDesigner: TComponentEditorDesigner;
AddLookupDatasetProc: TGetStringProc; AddLookupDatasetProc: TGetStrProc;
function CreateField(fType: TFieldType; FName: string): TField; function CreateField(fType: TFieldType; FName: string): TField;
procedure SetButtons; procedure SetButtons;
procedure UpdateResultFields; procedure UpdateResultFields;

66
ideintf/propedits.pp
View File

@ -47,6 +47,7 @@ const
type type
TPersistentSelectionList = PropEditUtils.TPersistentSelectionList; TPersistentSelectionList = PropEditUtils.TPersistentSelectionList;
// For backwards compatibility only. Use TGetStrProc directly.
TGetStringProc = Classes.TGetStrProc; TGetStringProc = Classes.TGetStrProc;
{ TPropertyEditor { TPropertyEditor
@ -335,7 +336,7 @@ type
function GetHint(HintType: TPropEditHint; x, y: integer): string; virtual; function GetHint(HintType: TPropEditHint; x, y: integer): string; virtual;
function GetDefaultValue: ansistring; virtual; function GetDefaultValue: ansistring; virtual;
function GetVisualValue: ansistring; function GetVisualValue: ansistring;
procedure GetValues(Proc: TGetStringProc); virtual; procedure GetValues(Proc: TGetStrProc); virtual;
procedure Initialize; virtual; procedure Initialize; virtual;
procedure Revert; virtual; procedure Revert; virtual;
procedure SetValue(const NewValue: ansistring); virtual; procedure SetValue(const NewValue: ansistring); virtual;
@ -429,7 +430,7 @@ type
public public
function GetAttributes: TPropertyAttributes; override; function GetAttributes: TPropertyAttributes; override;
function OrdValueToVisualValue(OrdValue: longint): string; override; function OrdValueToVisualValue(OrdValue: longint): string; override;
procedure GetValues(Proc: TGetStringProc); override; procedure GetValues(Proc: TGetStrProc); override;
procedure SetValue(const NewValue: ansistring); override; procedure SetValue(const NewValue: ansistring); override;
end; end;
@ -441,7 +442,7 @@ type
TBoolPropertyEditor = class(TEnumPropertyEditor) TBoolPropertyEditor = class(TEnumPropertyEditor)
public public
function OrdValueToVisualValue(OrdValue: longint): string; override; function OrdValueToVisualValue(OrdValue: longint): string; override;
procedure GetValues(Proc: TGetStringProc); override; procedure GetValues(Proc: TGetStrProc); override;
procedure SetValue(const NewValue: ansistring); override; procedure SetValue(const NewValue: ansistring); override;
end; end;
@ -527,7 +528,7 @@ type
function GetAttributes: TPropertyAttributes; override; function GetAttributes: TPropertyAttributes; override;
function GetName: shortstring; override; function GetName: shortstring; override;
function GetValue: ansistring; override; function GetValue: ansistring; override;
procedure GetValues(Proc: TGetStringProc); override; procedure GetValues(Proc: TGetStrProc); override;
procedure SetValue(const NewValue: ansistring); override; procedure SetValue(const NewValue: ansistring); override;
function IsNotDefaultValue: boolean; override; function IsNotDefaultValue: boolean; override;
end; end;
@ -579,7 +580,7 @@ type
function GetAttributes: TPropertyAttributes; override; function GetAttributes: TPropertyAttributes; override;
function GetEditLimit: Integer; override; function GetEditLimit: Integer; override;
function GetValue: ansistring; override; function GetValue: ansistring; override;
procedure GetValues(Proc: TGetStringProc); override; procedure GetValues(Proc: TGetStrProc); override;
procedure SetValue(const NewValue: ansistring); override; procedure SetValue(const NewValue: ansistring); override;
function GetFormMethodName: shortstring; virtual; function GetFormMethodName: shortstring; virtual;
function GetTrimmedEventName: shortstring; function GetTrimmedEventName: shortstring;
@ -605,7 +606,7 @@ type
function GetAttributes: TPropertyAttributes; override; function GetAttributes: TPropertyAttributes; override;
function GetEditLimit: Integer; override; function GetEditLimit: Integer; override;
function GetValue: AnsiString; override; function GetValue: AnsiString; override;
procedure GetValues(Proc: TGetStringProc); override; procedure GetValues(Proc: TGetStrProc); override;
procedure SetValue(const NewValue: ansistring); override; procedure SetValue(const NewValue: ansistring); override;
end; end;
@ -705,7 +706,7 @@ type
public public
function GetAttributes: TPropertyAttributes; override; function GetAttributes: TPropertyAttributes; override;
function OrdValueToVisualValue(OrdValue: longint): string; override; function OrdValueToVisualValue(OrdValue: longint): string; override;
procedure GetValues(Proc: TGetStringProc); override; procedure GetValues(Proc: TGetStrProc); override;
procedure SetValue(const NewValue:ansistring); override; procedure SetValue(const NewValue:ansistring); override;
end; end;
@ -776,7 +777,7 @@ type
public public
function GetAttributes: TPropertyAttributes; override; function GetAttributes: TPropertyAttributes; override;
function OrdValueToVisualValue(OrdValue: longint): string; override; function OrdValueToVisualValue(OrdValue: longint): string; override;
procedure GetValues(Proc: TGetStringProc); override; procedure GetValues(Proc: TGetStrProc); override;
procedure SetValue(const NewValue: ansistring); override; procedure SetValue(const NewValue: ansistring); override;
end; end;
@ -866,7 +867,7 @@ type
function GetName:shortstring; override; function GetName:shortstring; override;
procedure GetProperties(Proc: TGetPropEditProc); override; procedure GetProperties(Proc: TGetPropEditProc); override;
function GetValue: ansistring; override; function GetValue: ansistring; override;
procedure GetValues(Proc: TGetStringProc); override; procedure GetValues(Proc: TGetStrProc); override;
procedure SetValue(const NewValue: ansistring); override; procedure SetValue(const NewValue: ansistring); override;
property List: TListPropertyEditor read FList; property List: TListPropertyEditor read FList;
property TheIndex: integer read FIndex; property TheIndex: integer read FIndex;
@ -913,7 +914,7 @@ type
function GetElementValue( function GetElementValue(
Element: TListElementPropertyEditor): ansistring; virtual; Element: TListElementPropertyEditor): ansistring; virtual;
procedure GetElementValues(Element: TListElementPropertyEditor; procedure GetElementValues(Element: TListElementPropertyEditor;
Proc: TGetStringProc); virtual; Proc: TGetStrProc); virtual;
procedure SetElementValue(Element: TListElementPropertyEditor; procedure SetElementValue(Element: TListElementPropertyEditor;
NewValue: ansistring); virtual; NewValue: ansistring); virtual;
public public
@ -949,7 +950,7 @@ type
function GetElementValue( function GetElementValue(
Element: TListElementPropertyEditor): ansistring; override; Element: TListElementPropertyEditor): ansistring; override;
procedure GetElementValues(Element: TListElementPropertyEditor; procedure GetElementValues(Element: TListElementPropertyEditor;
Proc: TGetStringProc); override; Proc: TGetStrProc); override;
procedure SetElementValue(Element: TListElementPropertyEditor; procedure SetElementValue(Element: TListElementPropertyEditor;
NewValue: ansistring); override; NewValue: ansistring); override;
public public
@ -1097,7 +1098,7 @@ type
APersistent: TPersistent; const APropertyPath: string): TMethod of object; APersistent: TPersistent; const APropertyPath: string): TMethod of object;
TPropHookGetMethodName = function(const Method: TMethod; TPropHookGetMethodName = function(const Method: TMethod;
CheckOwner: TObject): String of object; CheckOwner: TObject): String of object;
TPropHookGetMethods = procedure(TypeData:PTypeData; Proc:TGetStringProc) of object; TPropHookGetMethods = procedure(TypeData: PTypeData; Proc: TGetStrProc) of object;
TPropHookMethodExists = function(const Name: String; TypeData: PTypeData; TPropHookMethodExists = function(const Name: String; TypeData: PTypeData;
var MethodIsCompatible,MethodIsPublished,IdentIsMethod: boolean var MethodIsCompatible,MethodIsPublished,IdentIsMethod: boolean
):boolean of object; ):boolean of object;
@ -1110,7 +1111,7 @@ type
TPropHookGetComponent = function(const ComponentPath: String):TComponent of object; TPropHookGetComponent = function(const ComponentPath: String):TComponent of object;
TPropHookGetComponentName = function(AComponent: TComponent):ShortString of object; TPropHookGetComponentName = function(AComponent: TComponent):ShortString of object;
TPropHookGetComponentNames = procedure(TypeData: PTypeData; TPropHookGetComponentNames = procedure(TypeData: PTypeData;
Proc: TGetStringProc) of object; Proc: TGetStrProc) of object;
TPropHookGetRootClassName = function:ShortString of object; TPropHookGetRootClassName = function:ShortString of object;
TPropHookBeforeAddPersistent = function(Sender: TObject; TPropHookBeforeAddPersistent = function(Sender: TObject;
APersistentClass: TPersistentClass; APersistentClass: TPersistentClass;
@ -1130,7 +1131,7 @@ type
TPropHookGetObject = function(const Name:ShortString):TPersistent of object; TPropHookGetObject = function(const Name:ShortString):TPersistent of object;
TPropHookGetObjectName = function(Instance:TPersistent):ShortString of object; TPropHookGetObjectName = function(Instance:TPersistent):ShortString of object;
TPropHookGetObjectNames = procedure(TypeData:PTypeData; TPropHookGetObjectNames = procedure(TypeData:PTypeData;
Proc:TGetStringProc) of object; Proc: TGetStrProc) of object;
TPropHookObjectPropertyChanged = procedure(Sender: TObject; TPropHookObjectPropertyChanged = procedure(Sender: TObject;
NewObject: TPersistent) of object; NewObject: TPersistent) of object;
// modifing // modifing
@ -1202,7 +1203,7 @@ type
APersistent: TPersistent; APersistent: TPersistent;
const APropertyPath: string): TMethod; const APropertyPath: string): TMethod;
function GetMethodName(const Method: TMethod; PropOwner: TObject): String; function GetMethodName(const Method: TMethod; PropOwner: TObject): String;
procedure GetMethods(TypeData: PTypeData; Proc: TGetStringProc); procedure GetMethods(TypeData: PTypeData; Proc: TGetStrProc);
function MethodExists(const Name: String; TypeData: PTypeData; function MethodExists(const Name: String; TypeData: PTypeData;
var MethodIsCompatible,MethodIsPublished,IdentIsMethod: boolean):boolean; var MethodIsCompatible,MethodIsPublished,IdentIsMethod: boolean):boolean;
procedure RenameMethod(const CurName, NewName: String); procedure RenameMethod(const CurName, NewName: String);
@ -1213,7 +1214,7 @@ type
// components // components
function GetComponent(const ComponentPath: string): TComponent; function GetComponent(const ComponentPath: string): TComponent;
function GetComponentName(AComponent: TComponent): ShortString; function GetComponentName(AComponent: TComponent): ShortString;
procedure GetComponentNames(TypeData: PTypeData; const Proc: TGetStringProc); procedure GetComponentNames(TypeData: PTypeData; const Proc: TGetStrProc);
function GetRootClassName: ShortString; function GetRootClassName: ShortString;
function BeforeAddPersistent(Sender: TObject; function BeforeAddPersistent(Sender: TObject;
APersistentClass: TPersistentClass; APersistentClass: TPersistentClass;
@ -1229,7 +1230,7 @@ type
// persistent objects // persistent objects
function GetObject(const Name: ShortString): TPersistent; function GetObject(const Name: ShortString): TPersistent;
function GetObjectName(Instance: TPersistent): ShortString; function GetObjectName(Instance: TPersistent): ShortString;
procedure GetObjectNames(TypeData: PTypeData; const Proc: TGetStringProc); procedure GetObjectNames(TypeData: PTypeData; const Proc: TGetStrProc);
procedure ObjectReferenceChanged(Sender: TObject; NewObject: TPersistent); procedure ObjectReferenceChanged(Sender: TObject; NewObject: TPersistent);
// modifing // modifing
procedure Modified(Sender: TObject); procedure Modified(Sender: TObject);
@ -2549,7 +2550,7 @@ begin
Result:=''; Result:='';
end; end;
procedure TPropertyEditor.GetValues(Proc:TGetStringProc); procedure TPropertyEditor.GetValues(Proc:TGetStrProc);
begin begin
end; end;
@ -3031,7 +3032,7 @@ begin
Result := GetEnumName(GetPropType, L); Result := GetEnumName(GetPropType, L);
end; end;
procedure TEnumPropertyEditor.GetValues(Proc: TGetStringProc); procedure TEnumPropertyEditor.GetValues(Proc: TGetStrProc);
var var
I: Integer; I: Integer;
EnumType: PTypeInfo; EnumType: PTypeInfo;
@ -3067,7 +3068,7 @@ begin
Result := 'True'; Result := 'True';
end; end;
procedure TBoolPropertyEditor.GetValues(Proc: TGetStringProc); procedure TBoolPropertyEditor.GetValues(Proc: TGetStrProc);
begin begin
Proc('False'); Proc('False');
Proc('True'); Proc('True');
@ -3292,7 +3293,7 @@ begin
Result := BooleanIdents[FElement in S]; Result := BooleanIdents[FElement in S];
end; end;
procedure TSetElementPropertyEditor.GetValues(Proc: TGetStringProc); procedure TSetElementPropertyEditor.GetValues(Proc: TGetStrProc);
begin begin
Proc(BooleanIdents[False]); Proc(BooleanIdents[False]);
Proc(BooleanIdents[True]); Proc(BooleanIdents[True]);
@ -3394,7 +3395,7 @@ begin
Result:=List.GetElementValue(Self); Result:=List.GetElementValue(Self);
end; end;
procedure TListElementPropertyEditor.GetValues(Proc: TGetStringProc); procedure TListElementPropertyEditor.GetValues(Proc: TGetStrProc);
begin begin
List.GetElementValues(Self,Proc); List.GetElementValues(Self,Proc);
end; end;
@ -3562,7 +3563,7 @@ begin
end; end;
procedure TListPropertyEditor.GetElementValues( procedure TListPropertyEditor.GetElementValues(
Element: TListElementPropertyEditor; Proc: TGetStringProc); Element: TListElementPropertyEditor; Proc: TGetStrProc);
begin begin
end; end;
@ -3667,7 +3668,7 @@ begin
end; end;
procedure TCollectionPropertyEditor.GetElementValues( procedure TCollectionPropertyEditor.GetElementValues(
Element: TListElementPropertyEditor; Proc: TGetStringProc); Element: TListElementPropertyEditor; Proc: TGetStrProc);
begin begin
inherited GetElementValues(Element, Proc); inherited GetElementValues(Element, Proc);
end; end;
@ -3937,7 +3938,7 @@ begin
Result:=PropertyHook.GetMethodName(GetMethodValue,GetComponent(0)); Result:=PropertyHook.GetMethodName(GetMethodValue,GetComponent(0));
end; end;
procedure TMethodPropertyEditor.GetValues(Proc: TGetStringProc); procedure TMethodPropertyEditor.GetValues(Proc: TGetStrProc);
begin begin
//DebugLn('### TMethodPropertyEditor.GetValues'); //DebugLn('### TMethodPropertyEditor.GetValues');
Proc(oisNone); Proc(oisNone);
@ -4122,7 +4123,7 @@ begin
Result := inherited GetValue; Result := inherited GetValue;
end; end;
procedure TPersistentPropertyEditor.GetValues(Proc: TGetStringProc); procedure TPersistentPropertyEditor.GetValues(Proc: TGetStrProc);
begin begin
Proc(oisNone); Proc(oisNone);
if Assigned(PropertyHook) then if Assigned(PropertyHook) then
@ -4448,7 +4449,7 @@ begin
end; end;
end; end;
procedure TModalResultPropertyEditor.GetValues(Proc: TGetStringProc); procedure TModalResultPropertyEditor.GetValues(Proc: TGetStrProc);
var var
I: Integer; I: Integer;
begin begin
@ -4784,7 +4785,7 @@ begin
Result := CursorToString(TCursor(OrdValue)); Result := CursorToString(TCursor(OrdValue));
end; end;
procedure TCursorPropertyEditor.GetValues(Proc: TGetStringProc); procedure TCursorPropertyEditor.GetValues(Proc: TGetStrProc);
begin begin
GetCursorValues(Proc); GetCursorValues(Proc);
end; end;
@ -5096,8 +5097,7 @@ begin
end; end;
end; end;
procedure TPropertyEditorHook.GetMethods(TypeData:PTypeData; procedure TPropertyEditorHook.GetMethods(TypeData: PTypeData; Proc: TGetStrProc);
Proc:TGetStringProc);
var var
i: Integer; i: Integer;
begin begin
@ -5224,8 +5224,8 @@ begin
end; end;
end; end;
procedure TPropertyEditorHook.GetComponentNames(TypeData:PTypeData; procedure TPropertyEditorHook.GetComponentNames(TypeData: PTypeData;
const Proc:TGetStringProc); const Proc: TGetStrProc);
procedure TraverseComponents(Root: TComponent); procedure TraverseComponents(Root: TComponent);
var var
@ -5444,7 +5444,7 @@ begin
end; end;
procedure TPropertyEditorHook.GetObjectNames(TypeData: PTypeData; procedure TPropertyEditorHook.GetObjectNames(TypeData: PTypeData;
const Proc: TGetStringProc); const Proc: TGetStrProc);
var var
i: Integer; i: Integer;
begin begin