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

jvcllaz: Avoid using Windows-specific units. Some cleanup.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6259 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2018-03-19 08:47:50 +00:00
parent bcc69621fb
commit 9d3f64653b
21 changed files with 44 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/jvcllaz/run/JvCore/JvComponent.pas
View File

@ -35,7 +35,7 @@ unit JvComponent;
interface
uses
Classes, Controls, Forms, LMessages, JvExControls;
Classes, Controls, Forms, JvExControls;
type
TJvGraphicControl = TJvExGraphicControl;

2
components/jvcllaz/run/JvCore/JvExExtCtrls.pas
View File

@ -27,6 +27,8 @@ Known Issues:
// Conversion is done in incremental way: as types / classes / routines
// are needed they are converted.
{$mode objfpc}{$H+}
unit JvExExtCtrls;
{MACROINCLUDE JvExControls.macros}

8
components/jvcllaz/run/JvCore/JvJCLUtils.pas
View File

@ -46,7 +46,7 @@ interface
// the JCL has the same problem with CLX it should not make any difference.
uses
Classes, Graphics, LCLIntf, LCLType, LMessages;
Classes, Graphics, LCLIntf, LCLType;
const
(******************** NOT CONVERTED
@ -8284,11 +8284,11 @@ begin
if hDLL <> 0 then
begin
Result := True;
(* You must get this function explicitly
{ You must get this function explicitly
because earlier versions of the DLL's
don't implement this function.
That makes the lack of implementation
of the function a version marker in itself. *)
of the function a version marker in itself. }
@pDllGetVersion := GetProcAddress(hDLL, PChar('DllGetVersion'));
if Assigned(pDllGetVersion) then
begin
@ -8301,7 +8301,7 @@ begin
pdwMinor := Dvi.dwMinorVersion;
end;
end
else (* If GetProcAddress failed, the DLL is a version previous to the one shipped with IE 3.x. *)
else { If GetProcAddress failed, the DLL is a version previous to the one shipped with IE 3.x. }
begin
pdwMajor := 4;
pdwMinor := 0;

3
components/jvcllaz/run/JvCore/JvJVCLUtils.pas
View File

@ -1541,8 +1541,9 @@ procedure CopyParentImage(Control: TControl; Dest: TCanvas);
var
I, Count, SaveIndex: Integer;
DC: HDC;
R, SelfR, CtlR: TRect;
SelfR, CtlR: TRect;
ViewPortOrg: TPoint;
R: TRect = (Left:0; Top:0; Right:0; Bottom:0);
begin
if (Control = nil) or (Control.Parent = nil) then
Exit;

2
components/jvcllaz/run/JvCore/JvResources.pas
View File

@ -28,7 +28,7 @@ Known Issues:
unit JvResources;
//{.$I jvcl.inc}
{$mode objfpc}{$H+}
interface

4
components/jvcllaz/run/JvCtrls/JvMovableBevel.pas
View File

@ -30,9 +30,7 @@ unit JvMovableBevel;
interface
uses
SysUtils, Classes,
//Windows, Messages,
Controls, Forms, ExtCtrls,
SysUtils, Classes, Controls, Forms, ExtCtrls,
JvExExtCtrls;
type

3
components/jvcllaz/run/JvCustomControls/jvoutlookbar.pas
View File

@ -48,9 +48,6 @@ uses
LCLType, LCLIntf, LMessages, Types, LCLVersion,
SysUtils, Classes, ActnList,
Buttons, Controls, Graphics, ImgList, Forms, StdCtrls, ExtCtrls, Themes,
{$IFDEF HAS_UNIT_SYSTEM_UITYPES}
System.UITypes,
{$ENDIF HAS_UNIT_SYSTEM_UITYPES}
JvJCLUtils, JvComponent;
const

10
components/jvcllaz/run/JvDB/JvDBTreeView.pas
View File

@ -59,9 +59,7 @@ interface
uses
LCLIntf, LCLType, LMessages,
Messages, CommCtrl,
Classes, Controls, ExtCtrls, ComCtrls, DB;
// JvExtComponent;
type
TJvDBTreeNode = class;
@ -106,7 +104,7 @@ type
procedure SetStartMasterValue(Value: string);
function GetDataSource: TDataSource;
procedure SetDataSource(Value: TDataSource);
procedure CMGetDataLink(var Msg: TMessage); message CM_GETDATALINK;
procedure CMGetDataLink(var Msg: TLMessage); message CM_GETDATALINK;
{ wp -- removed
procedure SetMirror(Value: Boolean);
}
@ -577,7 +575,7 @@ begin
Value.FreeNotification(Self);
end;
procedure TJvCustomDBTreeView.CMGetDataLink(var Msg: TMessage);
procedure TJvCustomDBTreeView.CMGetDataLink(var Msg: TLMessage);
begin
Msg.Result := LRESULT(FDataLink);
end;
@ -1397,10 +1395,10 @@ end;
procedure TJvCustomDBTreeView.TimerDnDTimer(Sender: TObject);
begin
if YDragPos < DnDScrollArea then
Perform(WM_VSCROLL, SB_LINEUP, 0)
Perform(LM_VSCROLL, SB_LINEUP, 0)
else
if YDragPos > ClientHeight - DnDScrollArea then
Perform(WM_VSCROLL, SB_LINEDOWN, 0);
Perform(LM_VSCROLL, SB_LINEDOWN, 0);
end;
procedure TJvCustomDBTreeView.DragOver(Source: TObject; X, Y: Integer;

11
components/jvcllaz/run/JvJans/JvMarkupCommon.pas
View File

@ -87,19 +87,8 @@ type
end;
{$IFDEF UNITVERSIONING}
const
UnitVersioning: TUnitVersionInfo = (
RCSfile: '$URL$';
Revision: '$Revision$';
Date: '$Date$';
LogPath: 'JVCL\run'
);
{$ENDIF UNITVERSIONING}
implementation
//=== { TJvHTMLElement } =====================================================
procedure TJvHTMLElement.Breakup(ACanvas: TCanvas; Available: Integer);

2
components/jvcllaz/run/JvJans/JvMarkupViewer.pas
View File

@ -31,7 +31,7 @@ interface
uses
SysUtils, Classes,
Messages, Graphics, Forms, Controls, StdCtrls,
Graphics, Forms, Controls, StdCtrls,
JvMarkupCommon;
type

7
components/jvcllaz/run/JvJans/JvYearGrid.pas
View File

@ -33,15 +33,8 @@ interface
uses
LCLIntf, Types,
{$IFDEF MSWINDOWS}
//ShellAPI,
{$ENDIF MSWINDOWS}
//Windows, Messages,
Graphics, Controls, Forms, Dialogs, Grids, Menus, Clipbrd,
SysUtils, StdCtrls, Classes,
{$IFDEF HAS_UNIT_SYSTEM_UITYPES}
System.UITypes,
{$ENDIF HAS_UNIT_SYSTEM_UITYPES}
JvJVCLUtils, JvTypes;
const

3
components/jvcllaz/run/JvJans/JvYearGridEditForm.pas
View File

@ -30,8 +30,7 @@ unit JvYearGridEditForm;
interface
uses
SysUtils, Classes, Windows, Messages, Graphics, Controls,
Forms, Dialogs, StdCtrls, Buttons, ExtCtrls,
SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, Buttons, ExtCtrls,
JvComponent;
type

5
components/jvcllaz/run/JvPageComps/JvNavigationPane.pas
View File

@ -47,8 +47,9 @@ unit JvNavigationPane;
interface
uses
SysUtils, Classes, Controls, ExtCtrls, Graphics, ImgList, JvButton,
JvComponent, JvExExtCtrls, JvPageList, JvTypes, LCLIntf, LCLType, LMessages, Menus;
LCLIntf, LCLType, LMessages,
SysUtils, Classes, Controls, ExtCtrls, Graphics, ImgList, JvButton, Menus,
JvComponent, JvExExtCtrls, JvPageList, JvTypes;
const
CM_PARENTSTYLEMANAGERCHANGE = CM_BASE + 1;

5
components/jvcllaz/run/JvPageComps/JvPageList.pas
View File

@ -35,8 +35,9 @@ unit JvPageList;
interface
uses
Classes, Controls, Graphics, JvComponent, LCLIntf, LCLType, LMessages,
SysUtils;
LCLIntf, LCLType, LMessages,
SysUtils, Classes, Controls, Graphics,
JvComponent;
type
EPageListError = class(Exception);

19
components/jvcllaz/run/JvRuntimeDesign/jvdesignclip.pas
View File

@ -5,9 +5,6 @@ unit JvDesignClip;
interface
uses
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
LCLProc, LCLType, LResources, LCLIntf, LMessages, Classes;
type
@ -35,15 +32,6 @@ procedure DesignSaveComponentToBinaryStream(InStream: TStream; InComponent: TCom
procedure DesignCopyStreamFromClipboard(InFmt: Cardinal; InS: TStream);
procedure DesignCopyStreamToClipboard(InFmt: Cardinal; InS: TStream);
{$IFDEF UNITVERSIONING}
const
UnitVersioning: TUnitVersionInfo = (
RCSfile: '$URL: https://jvcl.svn.sourceforge.net/svnroot/jvcl/tags/JVCL3_39/run/JvDesignClip.pas $';
Revision: '$Revision: 12515 $';
Date: '$Date: 2009-09-23 09:51:16 +0200 (mer., 23 sept. 2009) $';
LogPath: 'JVCL\run'
);
{$ENDIF UNITVERSIONING}
implementation
@ -214,14 +202,7 @@ end;
initialization
{ The following string should not be localized }
CF_COMPONENTSTREAM := RegisterClipboardFormat('Delphi Components');
{$IFDEF UNITVERSIONING}
RegisterUnitVersion(HInstance, UnitVersioning);
{$ENDIF UNITVERSIONING}
finalization
{$IFDEF UNITVERSIONING}
UnregisterUnitVersion(HInstance);
{$ENDIF UNITVERSIONING}
end.

26
components/jvcllaz/run/JvRuntimeDesign/jvdesignimp.pas
View File

@ -5,12 +5,9 @@ unit JvDesignImp;
interface
uses
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
LCLProc, LCLType, LResources, LCLIntf, LMessages, SysUtils, Classes, Controls, Graphics,
Forms, ExtCtrls, Contnrs, JvDesignUtils,
JvDesignSurface;
LCLProc, LCLType, LResources, LCLIntf, LMessages,
SysUtils, Classes, Controls, Graphics, Forms, ExtCtrls, Contnrs,
JvDesignUtils, JvDesignSurface;
const
cJvDesignDefaultHandleWidth = 8;
@ -178,7 +175,7 @@ type
procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
end;
TJvDesignDesigner = class( TIDesigner)// TComponent, IDesignerHook)
TJvDesignDesigner = class(TIDesigner)// TComponent, IDesignerHook)
private
FMessenger: TJvDesignCustomMessenger;
public
@ -276,15 +273,6 @@ type
procedure DesignComponent(AComponent: TComponent; ADesigning: Boolean); override;
end;
{$IFDEF UNITVERSIONING}
const
UnitVersioning: TUnitVersionInfo = (
RCSfile: '$URL: https://jvcl.svn.sourceforge.net/svnroot/jvcl/trunk/jvcl/run/JvDesignImp.pas $';
Revision: '$Revision: 12931 $';
Date: '$Date: 2010-11-28 15:36:50 +0200 (Κυρ, 28 Νοε 2010) $';
LogPath: 'JVCL\run'
);
{$ENDIF UNITVERSIONING}
implementation
@ -1466,15 +1454,9 @@ begin
end;
initialization
{$IFDEF UNITVERSIONING}
RegisterUnitVersion(HInstance, UnitVersioning);
{$ENDIF UNITVERSIONING}
finalization
FreeShadedBits;
{$IFDEF UNITVERSIONING}
UnregisterUnitVersion(HInstance);
{$ENDIF UNITVERSIONING}
end.

4
components/jvcllaz/run/JvStdCtrls/JvButton.pas
View File

@ -34,7 +34,9 @@ unit JvButton;
interface
uses
Classes, Controls, Graphics, JvComponent, JvConsts, JvTypes, LMessages, Menus;
LMessages,
Classes, Controls, Graphics, Menus,
JvComponent, JvConsts, JvTypes;
type
TJvButtonMouseState = (bsMouseInside, bsMouseDown);

4
components/jvcllaz/run/JvValidators/JvValidators.pas
View File

@ -100,9 +100,9 @@ type
public
{$IFDEF JVVALIDATORS_SUPPORTS_DBCONTROLS}
// return a TDataLink if the control is a DB control or nil if is not
function GetDataLink(AControl:TControl):TDataLink;virtual;
function GetDataLink(AControl:TControl):TDataLink; virtual;
{$ELSE}
function GetDataLink(AControl:TControl):TObject;virtual;
function GetDataLink(AControl:TControl):TObject; virtual;
{$ENDIF JVVALIDATORS_SUPPORTS_DBCONTROLS}
// register a new base validator class. DisplayName is used by the design-time editor.
// A class with an empty DisplayName will not sshow up in the editor

12
components/jvcllaz/run/JvXPCtrls/JvXPBar.pas
View File

@ -51,8 +51,8 @@ unit JvXPBar;
interface
uses
ActnList, Classes, Controls, Graphics, ExtCtrls, Forms, ImgList,
LCLIntf, LCLProc, LCLType, LMessages, LResources, SysUtils,
LCLIntf, LCLProc, LCLType, LMessages, LResources,
SysUtils, Classes, Controls, Graphics, ExtCtrls, Forms, ImgList, ActnList,
JvXPCore, JvXPCoreUtils;
type
@ -224,7 +224,7 @@ type
function GetItem(Index: Integer): TJvXPBarItem;
procedure SetItem(Index: Integer; Value: TJvXPBarItem);
protected
procedure Update(Item: TCollectionItem); override;
procedure Update({%H-}Item: TCollectionItem); override;
function GetOwner: TPersistent; override;
class function GetItemClass: TJvXPBarItemClass; virtual;
public
@ -557,6 +557,8 @@ uses
resourcestring
RsUntitled = 'untitled';
const
RsUntitledFmt = '(%s %d)';
RsHintShortcutFmt = '%s (%s)';
@ -1442,14 +1444,14 @@ begin
FTopSpace := 5;
FFont := TFont.Create;
FFont.Color := dxColor_FontColorXP; //$00840000;
FFont.Color := dxColor_FontColorXP; // $00840000;
FFont.Size := 0; //8;
FFont.OnChange := @FontChange;
FHeaderHeight := 28;
FHeaderRounded := True;
FGradientWidth := 0;
FHeaderFont := TFont.Create;
FHeaderFont.Color := dxColor_HeaderFontColorXP; //$00840000;
FHeaderFont.Color := dxColor_HeaderFontColorXP; // $00840000;
FHeaderFont.Size := 0; //8;
FHeaderFont.Style := [fsBold];
FHeaderFont.OnChange := @FontChange;

3
components/jvcllaz/run/JvXPCtrls/JvXPContainer.pas
View File

@ -33,7 +33,8 @@ unit JvXPContainer;
interface
uses
TypInfo, Classes, LCLIntf, LCLProc, LCLType, Controls, Graphics, StdCtrls, ExtCtrls,
LCLIntf, LCLProc, LCLType,
TypInfo, Classes, Controls, Graphics, StdCtrls, ExtCtrls,
JvXPCore, JvXPCoreUtils;
type

5
components/jvcllaz/run/JvXPCtrls/JvXPCoreUtils.pas
View File

@ -34,8 +34,9 @@ unit JvXPCoreUtils;
interface
uses
Classes, Controls, Graphics, LCLIntf, LCLType, SysUtils,
TypInfo, JvXPCore;
LCLIntf, LCLType, SysUtils,
Classes, Controls, Graphics, TypInfo,
JvXPCore;
function JvXPMethodsEqual(const Method1, Method2: TMethod): Boolean;