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

* Enable WMCancelMode, Issue 26216

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3214 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
blikblum
2014-06-22 14:45:42 +00:00
parent 979d97ffd0
commit f445c638b8
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/virtualtreeview-new/branches/4.8/VirtualTrees.pas
View File

@ -2488,7 +2488,7 @@ type
procedure TVMGetItemRect(var Message: TLMessage); message TVM_GETITEMRECT; procedure TVMGetItemRect(var Message: TLMessage); message TVM_GETITEMRECT;
procedure TVMGetNextItem(var Message: TLMessage); message TVM_GETNEXTITEM; procedure TVMGetNextItem(var Message: TLMessage); message TVM_GETNEXTITEM;
{$endif} {$endif}
procedure WMCancelMode(var Message: TLMNoParams); message LM_CANCELMODE; procedure WMCancelMode(var Message: TLMessage); message LM_CANCELMODE;
procedure WMChangeState(var Message: TLMessage); message WM_CHANGESTATE; procedure WMChangeState(var Message: TLMessage); message WM_CHANGESTATE;
procedure WMChar(var Message: TLMChar); message LM_CHAR; procedure WMChar(var Message: TLMChar); message LM_CHAR;
procedure WMContextMenu(var Message: TLMContextMenu); message LM_CONTEXTMENU; procedure WMContextMenu(var Message: TLMContextMenu); message LM_CONTEXTMENU;
@ -15276,7 +15276,7 @@ end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
procedure TBaseVirtualTree.WMCancelMode(var Message: TLMNoParams); procedure TBaseVirtualTree.WMCancelMode(var Message: TLMessage);
begin begin
{$ifdef DEBUG_VTV}Logger.EnterMethod([lcMessages],'WMCancelMode');{$endif} {$ifdef DEBUG_VTV}Logger.EnterMethod([lcMessages],'WMCancelMode');{$endif}
@ -15290,8 +15290,7 @@ begin
DoStateChange([], [tsClearPending, tsEditPending, tsOLEDragPending, tsVCLDragPending, tsDrawSelecting, DoStateChange([], [tsClearPending, tsEditPending, tsOLEDragPending, tsVCLDragPending, tsDrawSelecting,
tsDrawSelPending, tsIncrementalSearching]); tsDrawSelPending, tsIncrementalSearching]);
//lcl does not has a inherited procedure inherited WMCancelMode(Message);
//inherited WMCancelMode(Message);
{$ifdef DEBUG_VTV}Logger.ExitMethod([lcMessages],'WMCancelMode');{$endif} {$ifdef DEBUG_VTV}Logger.ExitMethod([lcMessages],'WMCancelMode');{$endif}
end; end;

12
components/virtualtreeview-new/trunk/VirtualTrees.pas
View File

@ -2098,6 +2098,9 @@ type
TGetNextNodeProc = function(Node: PVirtualNode; ConsiderChildrenAbove: Boolean = False): PVirtualNode of object; TGetNextNodeProc = function(Node: PVirtualNode; ConsiderChildrenAbove: Boolean = False): PVirtualNode of object;
// ----- TBaseVirtualTree // ----- TBaseVirtualTree
{ TBaseVirtualTree }
TBaseVirtualTree = class(TCustomControl) TBaseVirtualTree = class(TCustomControl)
private private
//FBorderStyle: TBorderStyle; //FBorderStyle: TBorderStyle;
@ -2521,7 +2524,7 @@ type
procedure TVMGetItemRect(var Message: TLMessage); message TVM_GETITEMRECT; procedure TVMGetItemRect(var Message: TLMessage); message TVM_GETITEMRECT;
procedure TVMGetNextItem(var Message: TLMessage); message TVM_GETNEXTITEM; procedure TVMGetNextItem(var Message: TLMessage); message TVM_GETNEXTITEM;
{$endif} {$endif}
procedure WMCancelMode(var Message: TLMNoParams); message LM_CANCELMODE; procedure WMCancelMode(var Message: TLMessage); message LM_CANCELMODE;
procedure WMChangeState(var Message: TLMessage); message WM_CHANGESTATE; procedure WMChangeState(var Message: TLMessage); message WM_CHANGESTATE;
procedure WMChar(var Message: TLMChar); message LM_CHAR; procedure WMChar(var Message: TLMChar); message LM_CHAR;
procedure WMContextMenu(var Message: TLMContextMenu); message LM_CONTEXTMENU; procedure WMContextMenu(var Message: TLMContextMenu); message LM_CONTEXTMENU;
@ -15499,7 +15502,7 @@ end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
procedure TBaseVirtualTree.WMCancelMode(var Message: TLMNoParams); procedure TBaseVirtualTree.WMCancelMode(var Message: TLMessage);
begin begin
{$ifdef DEBUG_VTV}Logger.EnterMethod([lcMessages],'WMCancelMode');{$endif} {$ifdef DEBUG_VTV}Logger.EnterMethod([lcMessages],'WMCancelMode');{$endif}
@ -15513,8 +15516,7 @@ begin
DoStateChange([], [tsClearPending, tsEditPending, tsOLEDragPending, tsVCLDragPending, tsDrawSelecting, DoStateChange([], [tsClearPending, tsEditPending, tsOLEDragPending, tsVCLDragPending, tsDrawSelecting,
tsDrawSelPending, tsIncrementalSearching]); tsDrawSelPending, tsIncrementalSearching]);
//lcl does not has a inherited procedure inherited WMCancelMode(Message);
//inherited WMCancelMode(Message);
{$ifdef DEBUG_VTV}Logger.ExitMethod([lcMessages],'WMCancelMode');{$endif} {$ifdef DEBUG_VTV}Logger.ExitMethod([lcMessages],'WMCancelMode');{$endif}
end; end;
@ -20689,7 +20691,7 @@ end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
function TBaseVirtualTree.GetOperationCanceled; function TBaseVirtualTree.GetOperationCanceled: Boolean;
begin begin
Result := FOperationCanceled and (FOperationCount > 0); Result := FOperationCanceled and (FOperationCount > 0);