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

Patches for 64-bit support.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2975 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
macpgmr
2014-04-28 20:45:29 +00:00
parent 34db575967
commit 32c8b1cb1c
30 changed files with 125 additions and 107 deletions

12
components/orpheus/alltests-linux.sh Executable file

@ -0,0 +1,12 @@
#!/bin/sh
lazbuild -d tests/TestFlexEdit/project1.lpi
lazbuild -d tests/TestLabel/project1.lpi
lazbuild -d tests/TestRLbl/project1.lpi
lazbuild -d tests/TestSimpField/project1.lpi
lazbuild -d tests/TestSpinner/project1.lpi
lazbuild -d tests/TestTable/project1.lpi
lazbuild -d tests/TestTblEdits/project1.lpi
lazbuild -d tests/TestURL/project1.lpi
lazbuild -d tests/TestVLB/project1.lpi
lazbuild -d tests/TestCalendar/project1.lpi

43
components/orpheus/mymisc.pas

@ -47,11 +47,12 @@ unit MyMisc;
interface interface
uses uses
SysUtils,
{$IFDEF MSWINDOWS} Windows, {$ELSE} Types, {$ENDIF} {$IFDEF MSWINDOWS} Windows, {$ELSE} Types, {$ENDIF}
LclIntf, LMessages, LclType, InterfaceBase, LclIntf, LMessages, LclType, InterfaceBase,
{$IFDEF LINUX} FileUtil, {$ENDIF} {$IFDEF LINUX} FileUtil, {$ENDIF}
GraphType, Graphics, Controls, SysUtils; GraphType, Graphics, Controls;
type type
TButtonStyle = (bsAutoDetect, bsWin31, bsNew); TButtonStyle = (bsAutoDetect, bsWin31, bsNew);
@ -72,10 +73,16 @@ type
TWMSysKeyDown = TLMSysKeyDown; TWMSysKeyDown = TLMSysKeyDown;
TWMMouseActivate = packed record TWMMouseActivate = packed record
Msg: Cardinal; Msg: Cardinal;
{$ifdef cpu64} //64
UnusedMsg: Cardinal;
{$endif}
TopLevel: HWND; TopLevel: HWND;
HitTestCode: Word; HitTestCode: Word;
MouseMsg: Word; MouseMsg: Word;
Result: Longint; {$ifdef cpu64} //64
Unused: Longint;
{$endif}
Result: LRESULT; //64
end; end;
TWMMouseMove = TLMMouseMove; TWMMouseMove = TLMMouseMove;
TWMPaste = TLMNoParams; TWMPaste = TLMNoParams;
@ -84,22 +91,29 @@ type
TWMGetText = TLMGetText; TWMGetText = TLMGetText;
TWMGetTextLength = TLMGetTextLength; TWMGetTextLength = TLMGetTextLength;
TWMKillFocus = TLMKillFocus; TWMKillFocus = TLMKillFocus;
TWMSetCursor = packed record TWMSetCursor = TLMSetCursor; //64
Msg: Cardinal; // TWMSetCursor = packed record
CursorWnd: HWND; // Msg: Cardinal;
HitTest: Word; // CursorWnd: HWND;
MouseMsg: Word; // HitTest: Word;
Result: Longint; // MouseMsg: Word;
end; // Result: Longint;
// end;
TWMSetFocus = TLMSetFocus; TWMSetFocus = TLMSetFocus;
TWMGetDlgCode = TLMNoParams; TWMGetDlgCode = TLMNoParams;
TWMSize = TLMSize; TWMSize = TLMSize;
TWMSetFont = packed record TWMSetFont = packed record
Msg: Cardinal; Msg: Cardinal;
{$ifdef cpu64} //64
UnusedMsg: Cardinal;
{$endif}
Font: HFONT; Font: HFONT;
Redraw: WordBool; Redraw: WordBool;
Unused: Word; Unused: Word;
Result: Longint; {$ifdef cpu64} //64
Unused2: Longint;
{$endif}
Result: LRESULT; //64
end; end;
TWMCommand = TLMCommand; TWMCommand = TLMCommand;
TWMDrawItem = TLMDrawItems; TWMDrawItem = TLMDrawItems;
@ -128,9 +142,12 @@ type
TWMPaint = TLMPaint; TWMPaint = TLMPaint;
TWMNCPaint = packed record TWMNCPaint = packed record
Msg: Cardinal; Msg: Cardinal;
{$ifdef cpu64} //64
UnusedMsg: Cardinal;
{$endif}
RGN: HRGN; RGN: HRGN;
Unused: Longint; Unused: LPARAM; //64
Result: Longint; Result: LRESULT; //64
end; end;
TWMHScroll = TLMHScroll; TWMHScroll = TLMHScroll;
TWMVScroll = TLMVScroll; TWMVScroll = TLMVScroll;

8
components/orpheus/o32flxed.pas

@ -487,7 +487,7 @@ var
begin begin
Word((@Text)^) := SizeOf(Text); Word((@Text)^) := SizeOf(Text);
SetString(Result, Text, SendMessage(FlexEdit.Handle, EM_GETLINE, Index, SetString(Result, Text, SendMessage(FlexEdit.Handle, EM_GETLINE, Index,
Longint(@Text))); LPARAM(@Text))); //64
end; end;
{=====} {=====}
@ -500,7 +500,7 @@ begin
begin begin
SendMessage(FlexEdit.Handle, EM_SETSEL, SelStart, SelStart + SendMessage(FlexEdit.Handle, EM_SETSEL, SelStart, SelStart +
SendMessage(FlexEdit.Handle, EM_LINELENGTH, SelStart, 0)); SendMessage(FlexEdit.Handle, EM_LINELENGTH, SelStart, 0));
SendMessage(FlexEdit.Handle, EM_REPLACESEL, 0, Longint(PChar(S))); SendMessage(FlexEdit.Handle, EM_REPLACESEL, 0, LPARAM(PChar(S))); //64
end; end;
end; end;
{=====} {=====}
@ -525,7 +525,7 @@ begin
Line := #13#10 + s; Line := #13#10 + s;
end; end;
SendMessage(FlexEdit.Handle, EM_SETSEL, SelStart, SelStart); SendMessage(FlexEdit.Handle, EM_SETSEL, SelStart, SelStart);
SendMessage(FlexEdit.Handle, EM_REPLACESEL, 0, Longint(PChar(Line))); SendMessage(FlexEdit.Handle, EM_REPLACESEL, 0, LPARAM(PChar(Line))); //64
end; end;
end; end;
{=====} {=====}
@ -543,7 +543,7 @@ begin
if SelEnd < 0 then SelEnd := SelStart + if SelEnd < 0 then SelEnd := SelStart +
SendMessage(FlexEdit.Handle, EM_LINELENGTH, SelStart, 0); SendMessage(FlexEdit.Handle, EM_LINELENGTH, SelStart, 0);
SendMessage(FlexEdit.Handle, EM_SETSEL, SelStart, SelEnd); SendMessage(FlexEdit.Handle, EM_SETSEL, SelStart, SelEnd);
SendMessage(FlexEdit.Handle, EM_REPLACESEL, 0, Longint(Empty)); SendMessage(FlexEdit.Handle, EM_REPLACESEL, 0, LPARAM(Empty)); //64
end; end;
end; end;
{=====} {=====}

3
components/orpheus/o32tcflx.pas

@ -41,8 +41,9 @@ unit o32tcflx;
interface interface
uses uses
SysUtils, Classes,
{$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, Types, LclType, MyMisc, {$ENDIF} {$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, Types, LclType, MyMisc, {$ENDIF}
SysUtils, Graphics, Classes, Controls, Forms, StdCtrls, Graphics, Controls, Forms, StdCtrls,
Menus, OvcTCmmn, OvcTCell, Menus, OvcTCmmn, OvcTCell,
OvcTCStr, O32FlxEd, O32bordr, OvcEf, OvcCmd, O32VlOp1, O32Vldtr; OvcTCStr, O32FlxEd, O32bordr, OvcEf, OvcCmd, O32VlOp1, O32Vldtr;

4
components/orpheus/o32vlop1.pas

@ -227,7 +227,7 @@ begin
if not Assigned(Pointer(GetWindowLong(FHookedControl.Handle, GWL_USERDATA))) then if not Assigned(Pointer(GetWindowLong(FHookedControl.Handle, GWL_USERDATA))) then
FreeMem(MethodPtr); //SetWindowLong not implemented for widgetset FreeMem(MethodPtr); //SetWindowLong not implemented for widgetset
{$ENDIF} {$ENDIF}
SetWindowLong(FHookedControl.Handle, GWL_WNDPROC, LongInt(NewWndProc)); SetWindowLong(FHookedControl.Handle, GWL_WNDPROC, LPARAM(NewWndProc)); //64
end; end;
end; end;
end; end;
@ -248,7 +248,7 @@ begin
if Assigned(MethodPtr) then if Assigned(MethodPtr) then
FreeMem(MethodPtr); FreeMem(MethodPtr);
{$ENDIF} {$ENDIF}
SetWindowLong(FHookedControl.Handle, GWL_WNDPROC, LongInt(PrevWndProc)); SetWindowLong(FHookedControl.Handle, GWL_WNDPROC, LPARAM(PrevWndProc)); //64
end; end;
end; end;
PrevWndProc := nil; PrevWndProc := nil;

2
components/orpheus/orpheus.lpk

@ -31,7 +31,7 @@
"/> "/>
<License Value="MPL 1.1 <License Value="MPL 1.1
"/> "/>
<Version Minor="2" Release="2"/> <Version Minor="3" Release="0"/>
<Files Count="1"> <Files Count="1">
<Item1> <Item1>
<Filename Value="myovcreg.pas"/> <Filename Value="myovcreg.pas"/>

12
components/orpheus/ovcbase.pas

@ -952,7 +952,7 @@ begin
if Assigned(PF) then begin if Assigned(PF) then begin
for I := 0 to Pred(PF.ComponentCount) do begin for I := 0 to Pred(PF.ComponentCount) do begin
if PF.Components[I] = FControl then begin if PF.Components[I] = FControl then begin
SendMessage(FControl.Handle, OM_ASSIGNLABEL, 0, LongInt(Self)); SendMessage(FControl.Handle, OM_ASSIGNLABEL, 0, LPARAM(Self)); //64
PostMessage(FControl.Handle, OM_RECORDLABELPOSITION, 0, 0); PostMessage(FControl.Handle, OM_RECORDLABELPOSITION, 0, 0);
Break; Break;
end; end;
@ -1503,7 +1503,7 @@ end;
procedure TOvcController.DelayNotify(Sender : TObject; NotifyCode : Word); procedure TOvcController.DelayNotify(Sender : TObject; NotifyCode : Word);
begin begin
if Assigned(FOnDelayNotify) then if Assigned(FOnDelayNotify) then
PostMessage(Handle, OM_DELAYNOTIFY, NotifyCode, LongInt(Sender)); PostMessage(Handle, OM_DELAYNOTIFY, NotifyCode, LPARAM(Sender)); //64
end; end;
destructor TOvcController.Destroy; destructor TOvcController.Destroy;
@ -1555,7 +1555,7 @@ begin
else else
H := 0; H := 0;
PostMessage(Handle, OM_POSTEDIT, H, LongInt(Sender)); PostMessage(Handle, OM_POSTEDIT, H, LPARAM(Sender)); //64
end; end;
procedure TOvcController.DoOnPreEdit(Sender : TObject; LosingControl : TWinControl); procedure TOvcController.DoOnPreEdit(Sender : TObject; LosingControl : TWinControl);
@ -1567,7 +1567,7 @@ begin
else else
H := 0; H := 0;
PostMessage(Handle, OM_PREEDIT, H, LongInt(Sender)); PostMessage(Handle, OM_PREEDIT, H, LPARAM(Sender)); //64
end; end;
procedure TOvcController.DoOnTimerTrigger(Sender : TObject; Handle : Integer; procedure TOvcController.DoOnTimerTrigger(Sender : TObject; Handle : Integer;
@ -1682,7 +1682,7 @@ var
{ask the controller to give the focus back to this field} {ask the controller to give the focus back to this field}
if ChangeFocus and not ErrorPending then begin if ChangeFocus and not ErrorPending then begin
PostMessage(Handle, OM_SETFOCUS, 0, LongInt(EF)); PostMessage(Handle, OM_SETFOCUS, 0, LPARAM(EF)); //64
ErrorPending := True; ErrorPending := True;
end; end;
@ -1743,7 +1743,7 @@ begin
{ask the controller to give the focus back to this field} {ask the controller to give the focus back to this field}
if not ErrorPending then begin if not ErrorPending then begin
PostMessage(Handle, OM_SETFOCUS, 0, LongInt(EF)); PostMessage(Handle, OM_SETFOCUS, 0, LPARAM(EF)); //64
ErrorPending := True; ErrorPending := True;
end; end;

9
components/orpheus/ovccmbx.pas

@ -40,8 +40,9 @@ unit ovccmbx;
interface interface
uses uses
SysUtils, Classes,
{$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, LResources, MyMisc, {$ENDIF} {$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, LResources, MyMisc, {$ENDIF}
SysUtils, Classes, Graphics, Controls, Forms, StdCtrls, Graphics, Controls, Forms, StdCtrls,
Buttons, OvcBase, OvcConst, OvcData, OvcMisc, OvcBordr {$IFNDEF LCL}, OvcTimer {$ENDIF}; Buttons, OvcBase, OvcConst, OvcData, OvcMisc, OvcBordr {$IFNDEF LCL}, OvcTimer {$ENDIF};
type type
@ -715,7 +716,7 @@ begin
ItemIndex := SendMessage(Handle, ItemIndex := SendMessage(Handle,
CB_FINDSTRINGEXACT, CB_FINDSTRINGEXACT,
FMRUList.Items.Count - 1, FMRUList.Items.Count - 1,
LongInt(SrchText)); LPARAM(SrchText)); //64
finally finally
FreeMem(SrchText, L); FreeMem(SrchText, L);
end; end;
@ -1001,7 +1002,7 @@ begin
{this will search for the first matching item} {this will search for the first matching item}
Index := SendMessage(Handle, CB_FINDSTRING, Index := SendMessage(Handle, CB_FINDSTRING,
FMRUList.Items.Count - 1, FMRUList.Items.Count - 1,
LongInt(SrchText)); LPARAM(SrchText)); //64
finally finally
FreeMem(SrchText, length(Text) + 1); FreeMem(SrchText, length(Text) + 1);
end; end;
@ -1374,7 +1375,7 @@ begin
ItemIndex := SendMessage(Handle, ItemIndex := SendMessage(Handle,
CB_FINDSTRINGEXACT, CB_FINDSTRINGEXACT,
0, 0,
LongInt(SrchText)); LPARAM(SrchText)); //64
finally finally
FreeMem(SrchText, L); FreeMem(SrchText, L);
end; end;

17
components/orpheus/ovcef.pas

@ -41,9 +41,10 @@ unit ovcef;
interface interface
uses uses
SysUtils, Classes,
{$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, Types, LclType, MyMisc, {$ENDIF} {$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, Types, LclType, MyMisc, {$ENDIF}
Classes, ClipBrd, Controls, Forms, Graphics, Menus, ClipBrd, Controls, Forms, Graphics, Menus,
SysUtils, {$IFDEF VERSION6} Variants, {$ENDIF} {$IFDEF VERSION6} Variants, {$ENDIF}
OvcBase, OvcCaret, OvcColor, OvcConst, OvcCmd, OvcData, OvcExcpt, OvcBase, OvcCaret, OvcColor, OvcConst, OvcCmd, OvcData, OvcExcpt,
OvcIntl, OvcMisc, OvcStr, OvcUser, OvcDate, OvcBordr; OvcIntl, OvcMisc, OvcStr, OvcUser, OvcDate, OvcBordr;
@ -1738,7 +1739,7 @@ begin
{$IFNDEF LCL} {$IFNDEF LCL}
PostMessage(Controller.Handle, om_SetFocus, 0, LongInt(C)); PostMessage(Controller.Handle, om_SetFocus, 0, LongInt(C));
{$ELSE} {$ELSE}
Controller.PostMessage(Controller.Handle, om_SetFocus, 0, LongInt(C)); Controller.PostMessage(Controller.Handle, om_SetFocus, 0, LPARAM(C)); //64
{$ENDIF} {$ENDIF}
end; end;
@ -2814,12 +2815,12 @@ end;
procedure TOvcBaseEntryField.EMSetSel(var Msg : TMessage); procedure TOvcBaseEntryField.EMSetSel(var Msg : TMessage);
begin begin
with Msg do begin with Msg do begin
if lParamLo = $FFFF then if LoWord(LParam) = $FFFF then //64
SetSelection(0, 0) SetSelection(0, 0)
else if (lParamLo = 0) and (lParamHi = $FFFF) then else if (LoWord(LParam) = 0) and (HiWord(LParam) = $FFFF) then //64
SetSelection(0, MaxEditLen) SetSelection(0, MaxEditLen)
else if lParamHi >= lParamLo then else if HiWord(LParam) >= LoWord(LParam) then //64
SetSelection(lParamLo, lParamHi); SetSelection(LoWord(LParam), HiWord(LParam)); //64
end; end;
Invalidate; Invalidate;
end; end;
@ -4158,7 +4159,7 @@ var
Buf : array[0..MaxEditLen] of AnsiChar; Buf : array[0..MaxEditLen] of AnsiChar;
begin begin
StrPCopy(Buf, Value); StrPCopy(Buf, Value);
Msg.lParam := LongInt(@Buf); Msg.lParam := LPARAM(@Buf); //64
efPerformEdit(Msg, ccPaste); efPerformEdit(Msg, ccPaste);
end; end;

11
components/orpheus/ovcmisc.pas

@ -47,9 +47,10 @@ unit ovcmisc;
interface interface
uses uses
SysUtils, Classes,
{$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, MyMisc, {$ENDIF} {$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, MyMisc, {$ENDIF}
Buttons, Classes, Controls, ExtCtrls, Forms, Graphics, Buttons, Controls, ExtCtrls, Forms, Graphics,
SysUtils, {$IFNDEF LCL} Consts, {$ELSE} LclStrConsts, {$ENDIF} OvcData; {$IFNDEF LCL} Consts, {$ELSE} LclStrConsts, {$ENDIF} OvcData;
{ Hdc needs to be an Integer for BCB compatibility } { Hdc needs to be an Integer for BCB compatibility }
{$IFDEF CBuilder} {$IFDEF CBuilder}
@ -658,7 +659,7 @@ type
{ - HWnd changed to TOvcHWnd for BCB Compatibility } { - HWnd changed to TOvcHWnd for BCB Compatibility }
function CheckTaskWindow(Window: TOvcHWnd{HWnd}; function CheckTaskWindow(Window: TOvcHWnd{HWnd};
Data: Longint): WordBool; stdcall; Data: PCheckTaskInfo): WordBool; stdcall; //64
begin begin
Result := True; Result := True;
if PCheckTaskInfo(Data)^.FocusWnd = Window then begin if PCheckTaskInfo(Data)^.FocusWnd = Window then begin
@ -674,9 +675,9 @@ begin
Info.FocusWnd := GetActiveWindow; Info.FocusWnd := GetActiveWindow;
Info.Found := False; Info.Found := False;
{$IFNDEF DARWIN} {$IFNDEF DARWIN}
EnumThreadWindows(GetCurrentThreadID, @CheckTaskWindow, Longint(@Info)); EnumThreadWindows(GetCurrentThreadID, @CheckTaskWindow, LPARAM(@Info)); //64
{$ELSE} {$ELSE}
EnumThreadWindows(LongWord(GetCurrentThreadID), @CheckTaskWindow, Longint(@Info)); EnumThreadWindows(LongWord(GetCurrentThreadID), @CheckTaskWindow, LPARAM(@Info)); //64
{$ENDIF} {$ENDIF}
Result := Info.Found; Result := Info.Found;
end; end;

8
components/orpheus/ovcsf.pas

@ -463,7 +463,7 @@ procedure TOvcCustomSimpleField.efEdit(var Msg : TMessage; Cmd : Word);
end; end;
ccMouse : ccMouse :
if Len > 0 then begin if Len > 0 then begin
efHPos := efGetMousePos(SmallInt(Msg.lParamLo)); efHPos := efGetMousePos(SmallInt(LoWord(Msg.LParam))); //64
{drag highlight initially if shift key is being pressed} {drag highlight initially if shift key is being pressed}
if (GetKeyState(vk_Shift) < 0) then begin if (GetKeyState(vk_Shift) < 0) then begin
SelExtended := True; SelExtended := True;
@ -484,12 +484,12 @@ procedure TOvcCustomSimpleField.efEdit(var Msg : TMessage; Cmd : Word);
end; end;
ccMouseMove : ccMouseMove :
if Len > 0 then begin if Len > 0 then begin
efHPos := efGetMousePos(SmallInt(Msg.lParamLo)); efHPos := efGetMousePos(SmallInt(LoWord(Msg.LParam))); //64
UpdateSel; UpdateSel;
end; end;
ccDblClk : ccDblClk :
if Len > 0 then begin if Len > 0 then begin
efHPos := efGetMousePos(SmallInt(Msg.lParamLo)); efHPos := efGetMousePos(SmallInt(LoWord(Msg.LParam))); //64
WordLeftPrim; WordLeftPrim;
SaveHPos := efHPos; SaveHPos := efHPos;
efSelStart := SaveHPos; efSelStart := SaveHPos;
@ -784,7 +784,7 @@ procedure TOvcCustomSimpleField.efEdit(var Msg : TMessage; Cmd : Word);
ccExtendRight, ccExtendEnd, ccExtWordRight : ccExtendRight, ccExtendEnd, ccExtWordRight :
efSelEnd := 1; efSelEnd := 1;
ccMouseMove : ccMouseMove :
if efGetMousePos(SmallInt(Msg.lParamLo)) > 0 then if efGetMousePos(SmallInt(LoWord(Msg.LParam))) > 0 then //64
efSelEnd := 1 efSelEnd := 1
else else
efSelEnd := 0; efSelEnd := 0;

5
components/orpheus/ovctable.pas

@ -46,8 +46,9 @@ unit ovctable;
interface interface
uses uses
SysUtils, Classes,
{$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, MyMisc, {$ENDIF} {$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, MyMisc, {$ENDIF}
SysUtils, Graphics, Classes, Controls, Forms, StdCtrls, Graphics, Controls, Forms, StdCtrls,
Menus, Dialogs, OvcMisc, OvcData, OvcConst, OvcBase, OvcCmd, OvcTCmmn, Menus, Dialogs, OvcMisc, OvcData, OvcConst, OvcBase, OvcCmd, OvcTCmmn,
OvcTCAry, OvcTSelL, OvcTCell, OvcTCHdr, OvcTGPns, OvcTCAry, OvcTSelL, OvcTCell, OvcTCHdr, OvcTGPns,
OvcTbClr, OvcTbRws, OvcTbCls, OvcDrag; OvcTbClr, OvcTbRws, OvcTbCls, OvcDrag;
@ -5427,7 +5428,7 @@ procedure TOvcCustomTable.ctimQueryColor(var Msg : TMessage);
{--------} {--------}
procedure TOvcCustomTable.ctimQueryFont(var Msg : TMessage); procedure TOvcCustomTable.ctimQueryFont(var Msg : TMessage);
begin begin
Msg.Result := longint(Font); Msg.Result := LRESULT(Font); //64
end; end;
{--------} {--------}
procedure TOvcCustomTable.ctimQueryLockedCols(var Msg : TMessage); procedure TOvcCustomTable.ctimQueryLockedCols(var Msg : TMessage);

3
components/orpheus/ovctcbef.pas

@ -41,8 +41,9 @@ unit ovctcbef;
interface interface
uses uses
SysUtils, Classes,
{$IFNDEF LCL} Windows, {$ELSE} LclIntf, LclType, MyMisc, {$ENDIF} {$IFNDEF LCL} Windows, {$ELSE} LclIntf, LclType, MyMisc, {$ENDIF}
SysUtils, Classes, Graphics, Controls, Forms, Graphics, Controls, Forms,
OvcBase, OvcCmd, OvcEF, OvcCaret, OvcTCmmn, OvcTCell, OvcTable, OvcTCStr; OvcBase, OvcCmd, OvcEF, OvcCaret, OvcTCmmn, OvcTCell, OvcTable, OvcTCStr;
type type

5
components/orpheus/ovctcbmp.pas

@ -41,8 +41,9 @@ unit ovctcbmp;
interface interface
uses uses
{$IFNDEF LCL} Windows, {$ELSE} LclIntf, MyMisc, {$ENDIF} SysUtils, Classes,
SysUtils, Graphics, Classes, OvcTCmmn, OvcTCell; {$IFNDEF LCL} Windows, {$ELSE} LclIntf, LclType, MyMisc, {$ENDIF}
Graphics, OvcTCmmn, OvcTCell;
type type
TOvcTCBaseBitMap = class(TOvcBaseTableCell) TOvcTCBaseBitMap = class(TOvcBaseTableCell)

3
components/orpheus/ovctccbx.pas

@ -47,8 +47,9 @@ unit ovctccbx;
interface interface
uses uses
SysUtils, Classes,
{$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, MyMisc, {$ENDIF} {$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, MyMisc, {$ENDIF}
SysUtils, Graphics, Classes, Controls, Forms, StdCtrls, Graphics, Controls, Forms, StdCtrls,
OvcMisc, OvcTCmmn, OvcTCell, OvcTCStr; OvcMisc, OvcTCmmn, OvcTCell, OvcTCStr;
type type

3
components/orpheus/ovctcedt.pas

@ -41,8 +41,9 @@ unit ovctcedt;
interface interface
uses uses
SysUtils, Classes,
{$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, MyMisc, {$ENDIF} {$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, MyMisc, {$ENDIF}
SysUtils, Classes, Controls, Forms, StdCtrls, Controls, Forms, StdCtrls,
OvcTCmmn, OvcTCell, OvcTCStr, OvcTCmmn, OvcTCell, OvcTCStr,
Graphics; { - for default color definition} Graphics; { - for default color definition}

9
components/orpheus/ovctcell.pas

@ -41,8 +41,9 @@ unit ovctcell;
interface interface
uses uses
SysUtils, Classes,
{$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, MyMisc, {$ENDIF} {$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, MyMisc, {$ENDIF}
SysUtils, Graphics, Classes, Controls, Graphics, Controls,
OvcTCmmn, OvcSpAry, OvcVer; OvcTCmmn, OvcSpAry, OvcVer;
type type
@ -237,7 +238,7 @@ type
function CanStopEditing(SaveValue : boolean) : boolean; {for Orpheus 1.0 compatibility} function CanStopEditing(SaveValue : boolean) : boolean; {for Orpheus 1.0 compatibility}
function FilterTableKey(var Msg : TWMKey) : TOvcTblKeyNeeds; virtual; function FilterTableKey(var Msg : TWMKey) : TOvcTblKeyNeeds; virtual;
{.Z+} {.Z+}
procedure PostMessageToTable(Msg, wParam, lParam : longint); procedure PostMessageToTable(Msg: UINT; wParam: WPARAM; lParam: LPARAM); //64
{.Z-} {.Z-}
procedure SendKeyToTable(var Msg : TWMKey); procedure SendKeyToTable(var Msg : TWMKey);
procedure SaveEditedData(Data : pointer); virtual; procedure SaveEditedData(Data : pointer); virtual;
@ -549,7 +550,7 @@ procedure TOvcBaseTableCell.tcPaint(TableCanvas : TCanvas;
end; end;
end; end;
{--------} {--------}
procedure TOvcBaseTableCell.PostMessageToTable(Msg, wParam, lParam : longint); procedure TOvcBaseTableCell.PostMessageToTable(Msg: UINT; wParam: WPARAM; lParam: LPARAM); //64
begin begin
if Assigned(FTable) and FTable.HandleAllocated then if Assigned(FTable) and FTable.HandleAllocated then
PostMessage(FTable.Handle, Msg, wParam, lParam) PostMessage(FTable.Handle, Msg, wParam, lParam)
@ -710,7 +711,7 @@ procedure TOvcBaseTableCell.SetTable(T : TOvcTableAncestor);
if (not Assigned(T)) or (T is TOvcTableAncestor) then if (not Assigned(T)) or (T is TOvcTableAncestor) then
begin begin
if Assigned(FTable) and FTable.HandleAllocated then if Assigned(FTable) and FTable.HandleAllocated then
SendMessage(FTable.Handle, ctim_RemoveCell, 0, longint(Self)); SendMessage(FTable.Handle, ctim_RemoveCell, 0, LPARAM(Self)); //64
FTable := T; FTable := T;
FOnCfgChanged := nil; FOnCfgChanged := nil;
FReferences := 0; FReferences := 0;

3
components/orpheus/ovctcgly.pas

@ -41,8 +41,9 @@ unit ovctcgly;
interface interface
uses uses
SysUtils, Classes,
{$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, MyMisc, {$ENDIF} {$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, MyMisc, {$ENDIF}
SysUtils, Graphics, Classes, Controls, Graphics, Controls,
OvcTCmmn, OvcTCell, OvcTGRes, OvcTCBmp; OvcTCmmn, OvcTCell, OvcTGRes, OvcTCBmp;
type type

3
components/orpheus/ovctcmmn.pas

@ -41,8 +41,9 @@ unit ovctcmmn;
interface interface
uses uses
SysUtils, Classes,
{$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, MyMisc, {$ENDIF} {$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, MyMisc, {$ENDIF}
SysUtils, Graphics, Forms, StdCtrls, Classes, Controls, Graphics, Forms, StdCtrls, Controls,
OvcBase, OvcData, OvcExcpt; OvcBase, OvcData, OvcExcpt;
{---Enumeration types} {---Enumeration types}

6
components/orpheus/ovcvlb.pas

@ -1107,9 +1107,9 @@ end;
procedure TOvcCustomVirtualListBox.LBSelItemRange(var Msg : TMessage); procedure TOvcCustomVirtualListBox.LBSelItemRange(var Msg : TMessage);
begin begin
if FMultiSelect and (Msg.wParamLo <= lHighIndex) if FMultiSelect and (LoWord(Msg.WParam) <= lHighIndex) //64
and (Msg.wParamHi <= lHighIndex) then begin and (HiWord(Msg.WParam) <= lHighIndex) then begin //64
vlbSelectRangePrim(Msg.lParamLo, Msg.lParamHi, Msg.wParam > 0); vlbSelectRangePrim(LoWord(Msg.LParam), HiWord(Msg.LParam), Msg.wParam > 0); //64
Msg.Result := 0; Msg.Result := 0;
end else end else
Msg.Result := LB_ERR; Msg.Result := LB_ERR;

6
components/orpheus/tests/TestCalendar/unit1.pas

@ -23,11 +23,9 @@ implementation
{$IFNDEF LCL} {$IFNDEF LCL}
{$R *.dfm} {$R *.dfm}
{$ELSE}
{$R *.lfm}
{$ENDIF} {$ENDIF}
initialization
{$IFDEF LCL}
{$I unit1.lrs} {Include form's resource file}
{$ENDIF}
end. end.

7
components/orpheus/tests/TestFlexEdit/unit1.pas

@ -33,6 +33,8 @@ implementation
{$IFNDEF LCL} {$IFNDEF LCL}
{$R *.dfm} {$R *.dfm}
{$ELSE}
{$R *.lfm}
{$ENDIF} {$ENDIF}
procedure TForm1.O32FlexEdit1UserValidation(Sender: TObject; procedure TForm1.O32FlexEdit1UserValidation(Sender: TObject;
@ -72,9 +74,4 @@ begin
{$ENDIF} {$ENDIF}
end; end;
initialization
{$IFDEF LCL}
{$I unit1.lrs} {Include form's resource file}
{$ENDIF}
end. end.

6
components/orpheus/tests/TestLabel/unit1.pas

@ -27,11 +27,9 @@ implementation
{$IFNDEF LCL} {$IFNDEF LCL}
{$R *.dfm} {$R *.dfm}
{$ELSE}
{$R *.lfm}
{$ENDIF} {$ENDIF}
initialization
{$IFDEF LCL}
{$I Unit1.lrs} {Include form's resource file}
{$ENDIF}
end. end.

6
components/orpheus/tests/TestRLbl/unit1.pas

@ -26,11 +26,9 @@ implementation
{$IFNDEF LCL} {$IFNDEF LCL}
{$R *.dfm} {$R *.dfm}
{$ELSE}
{$R *.lfm}
{$ENDIF} {$ENDIF}
initialization
{$IFDEF LCL}
{$I Unit1.lrs} {Include form's resource file}
{$ENDIF}
end. end.

6
components/orpheus/tests/TestSimpField/unit1.pas

@ -32,6 +32,8 @@ implementation
{$IFNDEF LCL} {$IFNDEF LCL}
{$R *.dfm} {$R *.dfm}
{$ELSE}
{$R *.lfm}
{$ENDIF} {$ENDIF}
@ -59,9 +61,5 @@ begin
ErrorCode := oeInvalidNumber; ErrorCode := oeInvalidNumber;
end; end;
initialization
{$IFDEF LCL}
{$I unit1.lrs} {Include form's resource file}
{$ENDIF}
end. end.

7
components/orpheus/tests/TestSpinner/unit1.pas

@ -24,12 +24,9 @@ implementation
{$IFNDEF LCL} {$IFNDEF LCL}
{$R *.dfm} {$R *.dfm}
{$ELSE}
{$R *.lfm}
{$ENDIF} {$ENDIF}
initialization
{$IFDEF LCL}
{$I unit1.lrs} {Include form's resource file}
{$ENDIF}
end. end.

7
components/orpheus/tests/TestTable/unit1.pas

@ -58,6 +58,8 @@ implementation
{$IFNDEF LCL} {$IFNDEF LCL}
{$R *.dfm} {Link Delphi form file} {$R *.dfm} {Link Delphi form file}
{$ELSE}
{$R *.lfm}
{$ENDIF} {$ENDIF}
procedure TForm1.FormCreate(Sender: TObject); procedure TForm1.FormCreate(Sender: TObject);
@ -147,9 +149,4 @@ begin
end; {TForm1.OvcTCComboBox1Change} end; {TForm1.OvcTCComboBox1Change}
initialization
{$IFDEF LCL}
{$I unit1.lrs} {Include form's Lazarus resource file}
{$ENDIF}
end. end.

6
components/orpheus/tests/TestTblEdits/unit1.pas

@ -55,6 +55,8 @@ implementation
{$IFNDEF LCL} {$IFNDEF LCL}
{$R *.dfm} {Link Delphi form file} {$R *.dfm} {Link Delphi form file}
{$ELSE}
{$R *.lfm}
{$ENDIF} {$ENDIF}
procedure TForm1.FormCreate(Sender: TObject); procedure TForm1.FormCreate(Sender: TObject);
@ -131,9 +133,5 @@ begin
end; end;
end; end;
initialization
{$IFDEF LCL}
{$I unit1.lrs} {Include form's Lazarus resource file}
{$ENDIF}
end. end.

6
components/orpheus/tests/TestURL/unit1.pas

@ -23,11 +23,9 @@ implementation
{$IFNDEF LCL} {$IFNDEF LCL}
{$R *.dfm} {$R *.dfm}
{$ELSE}
{$R *.lfm}
{$ENDIF} {$ENDIF}
initialization
{$IFDEF LCL}
{$I unit1.lrs} {Include form's resource file}
{$ENDIF}
end. end.

6
components/orpheus/tests/TestVLB/unit1.pas

@ -28,6 +28,8 @@ implementation
{$IFNDEF LCL} {$IFNDEF LCL}
{$R *.dfm} {$R *.dfm}
{$ELSE}
{$R *.lfm}
{$ENDIF} {$ENDIF}
procedure TForm1.FormCreate(Sender: TObject); procedure TForm1.FormCreate(Sender: TObject);
@ -62,9 +64,5 @@ begin
'You double-clicked item ' + IntToStr(OvcVirtualListBox1.ItemIndex); 'You double-clicked item ' + IntToStr(OvcVirtualListBox1.ItemIndex);
end; end;
initialization
{$IFDEF LCL}
{$I unit1.lrs} {Include form's resource file}
{$ENDIF}
end. end.