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

fixed: name clash SetCursor (message LM_SETCURSOR), and inherited SetCursor (winapi)

Browse Source 
git-svn-id: trunk@5215 -
This commit is contained in:
micha 2004-02-21 13:35:15 +00:00
parent 057ab4eab9
commit c452389ad5
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lcl/interfaces/win32/win32int.pp
View File

@ -79,7 +79,7 @@ Type
Procedure ResizeChild(Sender: TWinControl; Left, Top, Width, Height: Integer); Procedure ResizeChild(Sender: TWinControl; Left, Top, Width, Height: Integer);
Procedure AssignSelf(Window: HWnd; Data: Pointer); Procedure AssignSelf(Window: HWnd; Data: Pointer);
Procedure ReDraw(Child: TObject); Procedure ReDraw(Child: TObject);
Procedure SetCursor(Sender: TObject); Procedure LmSetCursor(Sender: TObject);
Procedure SetLimitText(Window: HWND; Limit: Word); Procedure SetLimitText(Window: HWND; Limit: Word);
Procedure ShowHide(Sender: TObject); Procedure ShowHide(Sender: TObject);
@ -191,6 +191,9 @@ End.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.66 2004/02/21 13:35:15 micha
fixed: name clash SetCursor (message LM_SETCURSOR), and inherited SetCursor (winapi)
Revision 1.65 2004/01/12 08:36:34 micha Revision 1.65 2004/01/12 08:36:34 micha
statusbar interface dependent reimplementation (from vincent) statusbar interface dependent reimplementation (from vincent)

20
lcl/interfaces/win32/win32object.inc
View File

@ -423,7 +423,7 @@ Begin
ShowHide(Sender); ShowHide(Sender);
End; End;
LM_SETCURSOR: LM_SETCURSOR:
SetCursor(Sender); LmSetCursor(Sender);
LM_SETLABEL: LM_SETLABEL:
SetLabel(Sender, Data); SetLabel(Sender, Data);
LM_GETVALUE: LM_GETVALUE:
@ -1774,7 +1774,7 @@ const
IDC_IBEAM, IDC_CROSS, IDC_ARROW, IDC_ARROW, IDC_ARROW); IDC_IBEAM, IDC_CROSS, IDC_ARROW, IDC_ARROW, IDC_ARROW);
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
Method: TWin32Object.SetCursor Method: TWin32Object.LmSetCursor
Params: Sender - the control which invoked this method Params: Sender - the control which invoked this method
Returns: Nothing Returns: Nothing
@ -1782,20 +1782,19 @@ const
WARNING: Sender will be casted to TControl, CLEANUP! WARNING: Sender will be casted to TControl, CLEANUP!
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
Procedure TWin32Object.SetCursor(Sender: TObject); Procedure TWin32Object.LmSetCursor(Sender: TObject);
Var Var
Cursor: PChar; Cursor: PChar;
Res: HCURSOR; Res: HCURSOR;
Begin Begin
Assert(False, 'Trace:TWin32Object.SetCursor - Start'); Assert(False, 'Trace:TWin32Object.LmSetCursor - Start');
Assert(False, Format('Trace:TWin32Object.SetCursor - Sender --> %S', [Sender.ClassName])); Assert(False, Format('Trace:TWin32Object.LmSetCursor - Sender --> %S', [Sender.ClassName]));
Assert(False, 'Trace:TWin32Object.SetCursor - Getting the window'); Assert(False, 'Trace:TWin32Object.LmSetCursor - Getting the cursor');
Assert(False, 'Trace:TWin32Object.SetCursor - Getting the cursor');
Cursor := LclCursorToWin32CursorMap[TControl(Sender).Cursor]; Cursor := LclCursorToWin32CursorMap[TControl(Sender).Cursor];
Assert(False, 'Trace:TWin32Object.SetCursor - Loading the cursor'); Assert(False, 'Trace:TWin32Object.LmSetCursor - Loading the cursor');
Res := LoadCursor(0, Cursor); Res := LoadCursor(0, Cursor);
Assert(False, Format('Trace:Cursor handle --> 0x%X', [Res])); Assert(False, Format('Trace:Cursor handle --> 0x%X', [Res]));
Assert(False, 'Trace:TWin32Object.SetCursor - Exit'); Assert(False, 'Trace:TWin32Object.LmSetCursor - Exit');
End; End;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
@ -3006,6 +3005,9 @@ End;
{ {
$Log$ $Log$
Revision 1.172 2004/02/21 13:35:15 micha
fixed: name clash SetCursor (message LM_SETCURSOR), and inherited SetCursor (winapi)
Revision 1.171 2004/02/21 10:11:36 micha Revision 1.171 2004/02/21 10:11:36 micha
1. pressing the Return key in ObjectInspector when editing a value throws an exception 1. pressing the Return key in ObjectInspector when editing a value throws an exception
2. placing TPairSplitter component on the form produces "Division by zero" 2. placing TPairSplitter component on the form produces "Division by zero"