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

* Enabled ContexMenu/PopupMenu

Browse Source 
* Code cleanup

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@184 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
blikblum
2007-06-18 23:21:14 +00:00
parent 2b755d51cf
commit 1143b36810
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2098,13 +2098,15 @@ TBaseVirtualTree = class(TCustomControl)
procedure WMCancelMode(var Message: TLMNoParams); message LM_CANCELMODE; procedure WMCancelMode(var Message: TLMNoParams); 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;
procedure WMCopy(var Message: TLMNoParams); message LM_COPYTOCLIP; procedure WMCopy(var Message: TLMNoParams); message LM_COPYTOCLIP;
procedure WMCut(var Message: TLMNoParams); message LM_CUTTOCLIP; procedure WMCut(var Message: TLMNoParams); message LM_CUTTOCLIP;
procedure WMEnable(var Message: TLMNoParams); message LM_ENABLE; procedure WMEnable(var Message: TLMNoParams); message LM_ENABLE;
procedure WMEraseBkgnd(var Message: TLMEraseBkgnd); message LM_ERASEBKGND; procedure WMEraseBkgnd(var Message: TLMEraseBkgnd); message LM_ERASEBKGND;
procedure WMGetDlgCode(var Message: TLMNoParams); message LM_GETDLGCODE; procedure WMGetDlgCode(var Message: TLMNoParams); message LM_GETDLGCODE;
{$ifdef EnableAccessible}
procedure WMGetObject(var Message: TLMessage);{ message WM_GETOBJECT;} procedure WMGetObject(var Message: TLMessage);{ message WM_GETOBJECT;}
{$endif}
procedure WMHScroll(var Message: TLMHScroll); message LM_HSCROLL; procedure WMHScroll(var Message: TLMHScroll); message LM_HSCROLL;
procedure WMKeyDown(var Message: TLMKeyDown); message LM_KEYDOWN; procedure WMKeyDown(var Message: TLMKeyDown); message LM_KEYDOWN;
procedure WMKeyUp(var Message: TLMKeyUp); message LM_KEYUP; procedure WMKeyUp(var Message: TLMKeyUp); message LM_KEYUP;
@ -15704,9 +15706,8 @@ procedure TBaseVirtualTree.WMContextMenu(var Message: TLMContextMenu);
begin begin
Logger.EnterMethod([lcMessages],'WMContextMenu'); Logger.EnterMethod([lcMessages],'WMContextMenu');
DoStateChange([], [tsClearPending, tsEditPending, tsOLEDragPending, tsVCLDragPending]); DoStateChange([], [tsClearPending, tsEditPending, tsOLEDragPending, tsVCLDragPending]);
//todo: remove comment after LCL update if not (tsPopupMenuShown in FStates) then
//if not (tsPopupMenuShown in FStates) then inherited WMContextMenu(Message);
// inherited WMContextMenu(Messages);
Logger.ExitMethod([lcMessages],'WMContextMenu'); Logger.ExitMethod([lcMessages],'WMContextMenu');
end; end;
@ -15745,12 +15746,8 @@ end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
procedure TBaseVirtualTree.WMEraseBkgnd(var Message: TLMEraseBkgnd); procedure TBaseVirtualTree.WMEraseBkgnd(var Message: TLMEraseBkgnd);
var
R: TRect;
begin begin
Logger.EnterMethod([lcEraseBkgnd],'WMEraseBkgnd'); Logger.EnterMethod([lcEraseBkgnd],'WMEraseBkgnd');
//Windows.GetUpdateRect(Handle,R,True);
//Logger.Send([lcPaint],'UpdateRect',R);
Message.Result := 1; Message.Result := 1;
Logger.ExitMethod([lcEraseBkgnd],'WMEraseBkgnd'); Logger.ExitMethod([lcEraseBkgnd],'WMEraseBkgnd');
end; end;
@ -15768,11 +15765,12 @@ end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
{$ifdef EnableAccessible}
procedure TBaseVirtualTree.WMGetObject(var Message: TLMessage); procedure TBaseVirtualTree.WMGetObject(var Message: TLMessage);
begin begin
Logger.EnterMethod([lcMessages],'WMGetObject'); Logger.EnterMethod([lcMessages],'WMGetObject');
{$ifdef EnableAccessible}
GetAccessibilityFactory; GetAccessibilityFactory;
// Create the IAccessibles for the tree view and tree view items, if necessary. // Create the IAccessibles for the tree view and tree view items, if necessary.
@ -15789,12 +15787,10 @@ begin
Message.Result := LresultFromObject(IID_IAccessible, Message.WParam, FAccessible) Message.Result := LresultFromObject(IID_IAccessible, Message.WParam, FAccessible)
else else
Message.Result := 0; Message.Result := 0;
{$else}
Message.Result := 0;
{$endif}
Logger.ExitMethod([lcMessages],'WMGetObject'); Logger.ExitMethod([lcMessages],'WMGetObject');
end; end;
{$endif}
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
procedure TBaseVirtualTree.WMHScroll(var Message: TLMHScroll); procedure TBaseVirtualTree.WMHScroll(var Message: TLMHScroll);
@ -17033,7 +17029,6 @@ procedure TBaseVirtualTree.WMTimer(var Message: TLMTimer);
begin begin
Logger.EnterMethod([lcMessages,lcTimer],'WMTimer'); Logger.EnterMethod([lcMessages,lcTimer],'WMTimer');
{$ifdef EnableTimer}
with Message do with Message do
begin begin
Logger.Send([lcTimer],'TimerId',TimerId); Logger.Send([lcTimer],'TimerId',TimerId);
@ -17068,7 +17063,6 @@ begin
end; end;
end; end;
end; end;
{$endif}
Logger.ExitMethod([lcMessages,lcTimer],'WMTimer'); Logger.ExitMethod([lcMessages,lcTimer],'WMTimer');
end; end;
@ -23144,8 +23138,6 @@ begin
DoStateChange([], [tsWheelPanning, tsWheelScrolling]); DoStateChange([], [tsWheelPanning, tsWheelScrolling]);
FPanningWindow.Stop; FPanningWindow.Stop;
Cursor := crDefault;
end; end;
end; end;