Implement OnChange, OnEnter and OnExit properly in ListFilterEdit.

git-svn-id: trunk@31649 -
This commit is contained in:
juha 2011-07-10 09:42:39 +00:00
parent 338fee2342
commit 2ba28e0f3f

View File

@ -71,9 +71,6 @@ type
TListFilterEdit = class(TCustomEditButton) TListFilterEdit = class(TCustomEditButton)
procedure ListBoxDrawItem(Control: TWinControl; procedure ListBoxDrawItem(Control: TWinControl;
Index: Integer; ARect: TRect; State: TOwnerDrawState); Index: Integer; ARect: TRect; State: TOwnerDrawState);
procedure FilterEditChange(Sender: TObject);
procedure FilterEditEnter(Sender: TObject);
procedure FilterEditExit(Sender: TObject);
procedure OnIdle(Sender: TObject; var Done: Boolean); procedure OnIdle(Sender: TObject; var Done: Boolean);
private private
fFilter: string; fFilter: string;
@ -107,6 +104,9 @@ type
protected protected
function GetDefaultGlyph: TBitmap; override; function GetDefaultGlyph: TBitmap; override;
function GetDefaultGlyphName: String; override; function GetDefaultGlyphName: String; override;
procedure Change; override;
procedure DoEnter; override;
procedure DoExit; override;
procedure DoButtonClick (Sender: TObject); override; procedure DoButtonClick (Sender: TObject); override;
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
@ -161,15 +161,15 @@ type
property TabOrder; property TabOrder;
property TabStop; property TabStop;
property Visible; property Visible;
// property OnChange; property OnChange;
property OnClick; property OnClick;
property OnDblClick; property OnDblClick;
property OnDragDrop; property OnDragDrop;
property OnDragOver; property OnDragOver;
property OnEditingDone; property OnEditingDone;
property OnEndDrag; property OnEndDrag;
// property OnEnter; property OnEnter;
// property OnExit; property OnExit;
property OnKeyDown; property OnKeyDown;
property OnKeyPress; property OnKeyPress;
property OnKeyUp; property OnKeyUp;
@ -507,9 +507,6 @@ begin
fFilenameMap:=TStringToStringTree.Create(True); fFilenameMap:=TStringToStringTree.Create(True);
fImageIndexDirectory := -1; fImageIndexDirectory := -1;
Button.Enabled:=False; Button.Enabled:=False;
OnChange:=@FilterEditChange;
OnEnter:=@FilterEditEnter;
OnExit:=@FilterEditExit;
fIsFirstUpdate:=True; fIsFirstUpdate:=True;
end; end;
@ -547,20 +544,23 @@ begin
fFilteredListbox.Items[Index]); fFilteredListbox.Items[Index]);
end; end;
procedure TListFilterEdit.FilterEditChange(Sender: TObject); procedure TListFilterEdit.Change;
begin begin
Filter:=Text; Filter:=Text;
inherited;
end; end;
procedure TListFilterEdit.FilterEditEnter(Sender: TObject); procedure TListFilterEdit.DoEnter;
begin begin
if Text=lisCEFilter then if Text=lisCEFilter then
Text:=''; Text:='';
inherited;
end; end;
procedure TListFilterEdit.FilterEditExit(Sender: TObject); procedure TListFilterEdit.DoExit;
begin begin
Filter:=Text; Filter:=Text;
inherited;
end; end;
procedure TListFilterEdit.DoButtonClick(Sender: TObject); procedure TListFilterEdit.DoButtonClick(Sender: TObject);