pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

* Code cleanup

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@308 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
blikblum
2008-01-02 20:25:57 +00:00
parent 7be94078d0
commit 9b31b7f638
1 changed files with 75 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
components/virtualtreeview-unstable/VirtualTrees.pas
View File

@ -287,16 +287,6 @@ type
Result: Integer; Result: Integer;
end; end;
// The next two message records are not declared in Delphi 6 and lower.
TWMPrint = packed record
Msg: Cardinal;
DC: HDC;
Flags: Cardinal;
Result: Integer;
end;
TWMPrintClient = TWMPrint;
TLMContextMenu = TLMMouse; TLMContextMenu = TLMMouse;
// Be careful when adding new states as this might change the size of the type which in turn // Be careful when adding new states as this might change the size of the type which in turn
@ -3553,7 +3543,7 @@ type
procedure EnumerateFormats(TreeClass: TVirtualTreeClass; const Formats: TStrings); overload; procedure EnumerateFormats(TreeClass: TVirtualTreeClass; const Formats: TStrings); overload;
function FindFormat(FormatString: string): PClipboardFormatListEntry; overload; function FindFormat(FormatString: string): PClipboardFormatListEntry; overload;
function FindFormat(FormatString: string; var Fmt: Word): TVirtualTreeClass; overload; function FindFormat(FormatString: string; var Fmt: Word): TVirtualTreeClass; overload;
function FindFormat(Fmt: Word; var Description: string): TVirtualTreeClass; overload; function FindFormat(Fmt: Word; out Description: string): TVirtualTreeClass; overload;
end; end;
var var
@ -3756,7 +3746,7 @@ end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
function TClipboardFormatList.FindFormat(Fmt: Word; var Description: string): TVirtualTreeClass; function TClipboardFormatList.FindFormat(Fmt: Word; out Description: string): TVirtualTreeClass;
var var
I: Integer; I: Integer;
@ -3968,9 +3958,9 @@ begin
J := R; J := R;
P := TheArray[(L + R) shr 1]; P := TheArray[(L + R) shr 1];
repeat repeat
while Cardinal(TheArray[I]) < Cardinal(P) do while PtrUInt(TheArray[I]) < PtrUInt(P) do
Inc(I); Inc(I);
while Cardinal(TheArray[J]) > Cardinal(P) do while PtrUInt(TheArray[J]) > PtrUInt(P) do
Dec(J); Dec(J);
if I <= J then if I <= J then
begin begin
@ -4423,7 +4413,7 @@ end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
function GetBitmapBitsFromDeviceContext(DC: HDC; var Width, Height: Integer): Pointer; function GetBitmapBitsFromDeviceContext(DC: HDC; out Width, Height: Integer): Pointer;
// Helper function used to retrieve the bitmap selected into the given device context. If there is a bitmap then // Helper function used to retrieve the bitmap selected into the given device context. If there is a bitmap then
// the function will return a pointer to its bits otherwise nil is returned. // the function will return a pointer to its bits otherwise nil is returned.
@ -4504,7 +4494,7 @@ begin
if Height > 0 then // bottom-up DIB if Height > 0 then // bottom-up DIB
Row := Height - Row - 1; Row := Height - Row - 1;
// Return DWORD aligned address of the requested scanline. // Return DWORD aligned address of the requested scanline.
Integer(Result) := Integer(Bits) + Row * ((Width * 32 + 31) and not 31) div 8; PtrInt(Result) := PtrInt(Bits) + Row * ((Width * 32 + 31) and not 31) div 8;
end; end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
@ -14138,84 +14128,81 @@ var
begin begin
Logger.EnterMethod([lcDrag],'DoDragMsg'); Logger.EnterMethod([lcDrag],'DoDragMsg');
with Self do S := ADragObject;
Formats := nil;
// Let the ancestor handle dock operations.
if S is TDragDockObject then
inherited
else
begin begin
S := ADragObject; // We need an extra check for the control drag object as there might be other objects not derived from
Formats := nil; // this class (e.g. TActionDragObject).
if not (tsUserDragObject in FStates) and (S is TDragControlObject) then
S := (S as TDragControlObject).Control;
case ADragMessage of
dmDragEnter, dmDragLeave, dmDragMove:
begin
if ADragMessage = dmDragEnter then
DoStateChange([tsVCLDragging]);
if ADragMessage = dmDragLeave then
DoStateChange([], [tsVCLDragging]);
// Let the ancestor handle dock operations. if ADragMessage = dmDragMove then
if S is TDragDockObject then with ScreenToClient(APosition) do
inherited DoAutoScroll(X, Y);
else
begin ShiftState := 0;
// We need an extra check for the control drag object as there might be other objects not derived from // Alt key will be queried by the KeysToShiftState function in DragOver.
// this class (e.g. TActionDragObject). if GetKeyState(VK_SHIFT) < 0 then
if not (tsUserDragObject in FStates) and (S is TDragControlObject) then ShiftState := ShiftState or MK_SHIFT;
S := (S as TDragControlObject).Control; if GetKeyState(VK_CONTROL) < 0 then
case ADragMessage of ShiftState := ShiftState or MK_CONTROL;
dmDragEnter, dmDragLeave, dmDragMove:
// Allowed drop effects are simulated for VCL dd.
Result := DROPEFFECT_MOVE or DROPEFFECT_COPY;
DragOver(S, ShiftState, TDragState(ADragMessage), APosition, LongWord(Result));
FLastVCLDragTarget := FDropTargetNode;
FVCLDragEffect := Result;
if (ADragMessage = dmDragLeave) and Assigned(FDropTargetNode) then
begin begin
if ADragMessage = dmDragEnter then InvalidateNode(FDropTargetNode);
DoStateChange([tsVCLDragging]); FDropTargetNode := nil;
if ADragMessage = dmDragLeave then
DoStateChange([], [tsVCLDragging]);
if ADragMessage = dmDragMove then
with ScreenToClient(APosition) do
DoAutoScroll(X, Y);
ShiftState := 0;
// Alt key will be queried by the KeysToShiftState function in DragOver.
if GetKeyState(VK_SHIFT) < 0 then
ShiftState := ShiftState or MK_SHIFT;
if GetKeyState(VK_CONTROL) < 0 then
ShiftState := ShiftState or MK_CONTROL;
// Allowed drop effects are simulated for VCL dd.
Result := DROPEFFECT_MOVE or DROPEFFECT_COPY;
DragOver(S, ShiftState, TDragState(ADragMessage), APosition, LongWord(Result));
FLastVCLDragTarget := FDropTargetNode;
FVCLDragEffect := Result;
if (ADragMessage = dmDragLeave) and Assigned(FDropTargetNode) then
begin
InvalidateNode(FDropTargetNode);
FDropTargetNode := nil;
end;
end; end;
dmDragDrop: end;
dmDragDrop:
begin
ShiftState := 0;
// Alt key will be queried by the KeysToShiftState function in DragOver
if GetKeyState(VK_SHIFT) < 0 then
ShiftState := ShiftState or MK_SHIFT;
if GetKeyState(VK_CONTROL) < 0 then
ShiftState := ShiftState or MK_CONTROL;
// allowed drop effects are simulated for VCL dd,
// replace target node with cached node from other VCL dd messages
if Assigned(FDropTargetNode) then
InvalidateNode(FDropTargetNode);
FDropTargetNode := FLastVCLDragTarget;
P := ScreenToClient(APosition);
DoDragDrop(S, nil, Formats, KeysToShiftState(ShiftState), P, FVCLDragEffect, FLastDropMode);
if Assigned(FDropTargetNode) then
begin begin
ShiftState := 0; InvalidateNode(FDropTargetNode);
// Alt key will be queried by the KeysToShiftState function in DragOver FDropTargetNode := nil;
if GetKeyState(VK_SHIFT) < 0 then
ShiftState := ShiftState or MK_SHIFT;
if GetKeyState(VK_CONTROL) < 0 then
ShiftState := ShiftState or MK_CONTROL;
// allowed drop effects are simulated for VCL dd,
// replace target node with cached node from other VCL dd messages
if Assigned(FDropTargetNode) then
InvalidateNode(FDropTargetNode);
FDropTargetNode := FLastVCLDragTarget;
P := ScreenToClient(APosition);
DoDragDrop(S, nil, Formats, KeysToShiftState(ShiftState), P, FVCLDragEffect, FLastDropMode);
if Assigned(FDropTargetNode) then
begin
InvalidateNode(FDropTargetNode);
FDropTargetNode := nil;
end;
end; end;
dmFindTarget: end;
begin dmFindTarget:
Result := Integer(ControlAtPos(ScreenToClient(APosition), False)); begin
if Result = 0 then Result := Integer(ControlAtPos(ScreenToClient(APosition), False));
Result := Integer(Self); if Result = 0 then
Result := Integer(Self);
// This is a reliable place to check whether VCL drag has // This is a reliable place to check whether VCL drag has
// really begun. // really begun.
if tsVCLDragPending in FStates then if tsVCLDragPending in FStates then
DoStateChange([tsVCLDragging], [tsVCLDragPending, tsEditPending, tsClearPending]); DoStateChange([tsVCLDragging], [tsVCLDragPending, tsEditPending, tsClearPending]);
end; end;
end;
end; end;
end; end;
Logger.ExitMethod([lcDrag],'DoDragMsg'); Logger.ExitMethod([lcDrag],'DoDragMsg');
@ -29981,7 +29968,7 @@ begin
// Create HTML table based on the tree structure. To simplify formatting we use styles defined in a small CSS area. // Create HTML table based on the tree structure. To simplify formatting we use styles defined in a small CSS area.
Buffer.Add('<style type="text/css">'); Buffer.Add('<style type="text/css">');
Buffer.AddnewLine; Buffer.AddNewLine;
WriteStyle('default', Font); WriteStyle('default', Font);
Buffer.AddNewLine; Buffer.AddNewLine;
WriteStyle('header', FHeader.Font); WriteStyle('header', FHeader.Font);