From 7d184408a75c5bfd73828b1e542c9db6df6dc941 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Wed, 22 Jun 2016 07:59:17 +0000 Subject: [PATCH] tvplanit: Remove all "uses messages" (implies "uses Windows") git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4798 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/tvplanit/source/vpabout.pas | 4 ++-- components/tvplanit/source/vpalarmdlg.pas | 4 ++-- components/tvplanit/source/vpbase.pas | 13 ++++++------- components/tvplanit/source/vpbaseds.pas | 18 +++++++++--------- components/tvplanit/source/vpbufds.pas | 2 +- components/tvplanit/source/vpcalendar.pas | 16 ++++++++-------- components/tvplanit/source/vpcanvasutils.pas | 12 +++--------- .../tvplanit/source/vpcontactbuttons.pas | 10 +++++----- .../tvplanit/source/vpcontacteditdlg.pas | 6 +++--- components/tvplanit/source/vpcontactgrid.pas | 4 ++-- components/tvplanit/source/vpdata.pas | 2 +- components/tvplanit/source/vpdatepropedit.pas | 6 +++--- components/tvplanit/source/vpdayview.pas | 10 +++++----- components/tvplanit/source/vpdbds.pas | 2 +- components/tvplanit/source/vpdlg.pas | 2 +- components/tvplanit/source/vpedelem.pas | 6 +++--- components/tvplanit/source/vpedfmt.pas | 8 ++++---- components/tvplanit/source/vpedshape.pas | 6 +++--- components/tvplanit/source/vpevnteditdlg.pas | 4 ++-- components/tvplanit/source/vpexception.pas | 4 ++-- components/tvplanit/source/vpflxds.pas | 4 ++-- components/tvplanit/source/vpflxdsed1.pas | 2 +- components/tvplanit/source/vplocalize.pas | 15 +++------------ components/tvplanit/source/vpmisc.pas | 6 +++--- components/tvplanit/source/vpmonthview.pas | 6 +++--- components/tvplanit/source/vpnabed.pas | 4 ++-- components/tvplanit/source/vpnavbar.pas | 6 +++--- components/tvplanit/source/vpprtfmt.pas | 16 ++-------------- components/tvplanit/source/vpprtfmtcbox.pas | 12 +++++------- components/tvplanit/source/vpprtfmted.pas | 11 +++++------ components/tvplanit/source/vpreg.pas | 2 +- components/tvplanit/source/vpreseditdlg.pas | 4 ++-- components/tvplanit/source/vpselresdlg.pas | 4 ++-- components/tvplanit/source/vptaskeditdlg.pas | 4 ++-- components/tvplanit/source/vptasklist.pas | 6 +++--- components/tvplanit/source/vptimerpool.pas | 12 ++++++------ components/tvplanit/source/vpwavdlg.pas | 4 ++-- components/tvplanit/source/vpweekview.pas | 6 +++--- 38 files changed, 116 insertions(+), 147 deletions(-) diff --git a/components/tvplanit/source/vpabout.pas b/components/tvplanit/source/vpabout.pas index da376cd72..b2b188378 100644 --- a/components/tvplanit/source/vpabout.pas +++ b/components/tvplanit/source/vpabout.pas @@ -26,7 +26,7 @@ {* *} {* ***** END LICENSE BLOCK ***** *} -{$I Vp.INC} +{$I vp.inc} unit VpAbout; @@ -36,7 +36,7 @@ uses {$IFDEF LCL} LMessages, LCLProc, LCLType, LCLIntf, {$ELSE} - Windows,Messages, + Windows, Messages, {$ENDIF} Forms, Graphics, Controls, Dialogs, StdCtrls, ExtCtrls, {$IFDEF VERSION6} diff --git a/components/tvplanit/source/vpalarmdlg.pas b/components/tvplanit/source/vpalarmdlg.pas index 5dccce5dc..0ada6b1c2 100644 --- a/components/tvplanit/source/vpalarmdlg.pas +++ b/components/tvplanit/source/vpalarmdlg.pas @@ -26,7 +26,7 @@ {* *} {* ***** END LICENSE BLOCK ***** *} -{$I Vp.INC} +{$I vp.inc} unit VpAlarmDlg; { Alarm Notification Dialog } @@ -37,7 +37,7 @@ uses {$IFDEF LCL} LMessages, LCLProc, LCLType, LCLIntf, LResources, {$ELSE} - Windows,Messages, + Windows, Messages, {$ENDIF} SysUtils, Classes, Graphics, Controls, Forms, Dialogs, VpDlg, VpData, ExtCtrls, StdCtrls, VpBase, VpEvntEditDlg, VpBaseDS, VpConst, diff --git a/components/tvplanit/source/vpbase.pas b/components/tvplanit/source/vpbase.pas index bb5d62bac..e6985de83 100644 --- a/components/tvplanit/source/vpbase.pas +++ b/components/tvplanit/source/vpbase.pas @@ -26,7 +26,7 @@ {* *} {* ***** END LICENSE BLOCK ***** *} -{$I Vp.INC} +{$I vp.inc} unit VpBase; @@ -36,9 +36,8 @@ uses {$IFDEF LCL} LMessages, LCLProc, LCLType, LResources, {$ELSE} - Windows, + Windows, Messages. {$ENDIF} - Messages, Classes, Graphics, Controls, Dialogs, Forms, StdCtrls, ExtCtrls, SysUtils, VpConst, VpSR; @@ -149,8 +148,8 @@ type FAutoScroll: Boolean; function GetVersion : string; procedure SetVersion(const Value: string); - procedure CMVisibleChanged(var Msg: TMessage); message CM_VISIBLECHANGED; - {$IFNDEF LCL} + procedure CMVisibleChanged(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); message CM_VISIBLECHANGED; + {$IFDEF DELPHI} procedure WMMouseWheel(var Msg : TMessage); message WM_MOUSEWHEEL; procedure DoOnMouseWheel(Shift: TShiftState; Delta, XPos, YPos: SmallInt); dynamic; {$ENDIF} @@ -429,7 +428,7 @@ begin end; {=====} -procedure TVpCustomControl.CMVisibleChanged(var Msg: TMessage); +procedure TVpCustomControl.CMVisibleChanged(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); begin inherited; if csLoading in ComponentState then @@ -455,7 +454,7 @@ begin end; {=====} -{$IFNDEF LCL} +{$IFDEF DELPHI} procedure TVpCustomControl.WMMouseWheel(var Msg: TMessage); begin with Msg do diff --git a/components/tvplanit/source/vpbaseds.pas b/components/tvplanit/source/vpbaseds.pas index 95577fba3..0a306ab5c 100644 --- a/components/tvplanit/source/vpbaseds.pas +++ b/components/tvplanit/source/vpbaseds.pas @@ -26,7 +26,7 @@ {* *} {* ***** END LICENSE BLOCK ***** *} -{$I Vp.INC} +{$I vp.inc} unit VpBaseDS; { Base DataStore classes } @@ -37,10 +37,10 @@ uses {$IFDEF LCL} LMessages, LCLProc, LCLIntf, {$ELSE} - Windows, + Windows, Messages, {$ENDIF} Classes, Dialogs, SysUtils, Graphics, Controls, StdCtrls, ExtCtrls, - Messages, VpBase, VpData, Forms, VpPrtFmt, VpLocalize, VpException; + VpBase, VpData, Forms, VpPrtFmt, VpLocalize, VpException; type TVpResourceUpdate = (ruOnChange, ruOnExit, ruOnDropDownClose); @@ -144,7 +144,7 @@ type OldItemIndex : Integer; FResourceUpdateStyle : TVpResourceUpdate; - procedure VpDataStoreChanged (var Msg : TMessage); message Vp_DataStoreChanged; + procedure VpDataStoreChanged (var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); message Vp_DataStoreChanged; procedure SetDataStore (const Value : TVpCustomDataStore); function GetAbout : string; procedure SetAbout (const Value : string); @@ -313,8 +313,8 @@ type function CheckCreateResource : Boolean; procedure SetDataStore (const Value : TVpCustomDataStore); virtual; procedure SetControlLink (const Value : TVpControlLink); - procedure CMEnter(var Msg : TMessage); message CM_ENTER; - procedure CMExit(var Msg : TMessage); message CM_EXIT; + procedure CMEnter(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); message CM_ENTER; + procedure CMExit(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); message CM_EXIT; public constructor Create (AOwner : TComponent); override; destructor Destroy; override; @@ -947,7 +947,7 @@ end; {$ENDIF} {=====} -procedure TVpResourceCombo.VpDataStoreChanged (var Msg : TMessage); +procedure TVpResourceCombo.VpDataStoreChanged(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); begin LoadItems; end; @@ -1175,13 +1175,13 @@ begin end; {=====} -procedure TVpLinkableControl.CMEnter(var Msg : TMessage); +procedure TVpLinkableControl.CMEnter(var Msg : {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); begin invalidate; end; {=====} -procedure TVpLinkableControl.CMExit(var Msg : TMessage); +procedure TVpLinkableControl.CMExit(var Msg : {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); begin invalidate; end; diff --git a/components/tvplanit/source/vpbufds.pas b/components/tvplanit/source/vpbufds.pas index 1556b6e08..dcac80890 100644 --- a/components/tvplanit/source/vpbufds.pas +++ b/components/tvplanit/source/vpbufds.pas @@ -1,6 +1,6 @@ { Visual PlanIt datastore for a TBufDataset } -{$I Vp.INC} +{$I vp.inc} unit VpBufDS; diff --git a/components/tvplanit/source/vpcalendar.pas b/components/tvplanit/source/vpcalendar.pas index b5c9fe704..9047253e0 100644 --- a/components/tvplanit/source/vpcalendar.pas +++ b/components/tvplanit/source/vpcalendar.pas @@ -40,9 +40,9 @@ uses {$ENDIF} LMessages, LCLProc, LCLType, LCLIntf, LazUTF8, {$ELSE} - Windows, + Windows, Messages, {$ENDIF} - Buttons, Classes, Controls, Forms, Graphics, Menus, Messages, + Buttons, Classes, Controls, Forms, Graphics, Menus, SysUtils, VpBase, VpSR, VpConst, VpMisc, VpBaseDS, VpCanvasUtils, VpException; @@ -205,9 +205,9 @@ type {-calcualte new sizes for rows and columns} {VCL control methods} - procedure CMEnter(var Msg: TMessage); message CM_ENTER; - procedure CMExit(var Msg: TMessage); message CM_EXIT; - procedure CMFontChanged(var Msg: TMessage); message CM_FONTCHANGED; + procedure CMEnter(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); message CM_ENTER; + procedure CMExit(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); message CM_EXIT; + procedure CMFontChanged(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); message CM_FONTCHANGED; {windows message methods} procedure WMEraseBkgnd(var Msg: TWMEraseBkgnd); message WM_ERASEBKGND; @@ -726,7 +726,7 @@ begin end; {=====} -procedure TVpCustomCalendar.CMEnter(var Msg: TMessage); +procedure TVpCustomCalendar.CMEnter(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); var R : TRect; begin @@ -740,7 +740,7 @@ begin end; {=====} -procedure TVpCustomCalendar.CMExit(var Msg: TMessage); +procedure TVpCustomCalendar.CMExit(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); var R : TRect; begin @@ -752,7 +752,7 @@ begin end; {=====} -procedure TVpCustomCalendar.CMFontChanged(var Msg: TMessage); +procedure TVpCustomCalendar.CMFontChanged(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); begin inherited; diff --git a/components/tvplanit/source/vpcanvasutils.pas b/components/tvplanit/source/vpcanvasutils.pas index b4d104088..f7f47b319 100644 --- a/components/tvplanit/source/vpcanvasutils.pas +++ b/components/tvplanit/source/vpcanvasutils.pas @@ -85,16 +85,10 @@ uses {$IFDEF LCL} LMessages,LCLProc,LCLType,LCLIntf,FileUtil, {$ELSE} - Windows, + Windows, //Messages, {$ENDIF} - Classes, - SysUtils, - Graphics, - Controls, - Messages, - VpException, - VpSR, - VpBase; + Classes, SysUtils, Graphics, Controls, + VpException, VpSR, VpBase; type TVpPaletteArray = array [0..255] of TPALETTEENTRY; diff --git a/components/tvplanit/source/vpcontactbuttons.pas b/components/tvplanit/source/vpcontactbuttons.pas index 4b91b6b9c..afbea1976 100644 --- a/components/tvplanit/source/vpcontactbuttons.pas +++ b/components/tvplanit/source/vpcontactbuttons.pas @@ -31,7 +31,7 @@ { providing this component, and allowing us to include it. } { Thanks Steve! } -{$I Vp.INC} +{$I vp.inc} unit VpContactButtons; @@ -39,18 +39,18 @@ interface uses {$IFDEF LCL} - LMessages, LCLProc, LCLType, LCLIntf, + LCLProc, LCLType, LCLIntf, {$ELSE} Windows, {$ENDIF} - Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, + SysUtils, Classes, Graphics, Controls, Forms, Dialogs, VpBase, VpContactGrid, VpMisc; const - VP_MIN_BUTTONS = 2; + VP_MIN_BUTTONS = 2; VP_LETTERS_IN_ALPHABET = 26; VP_MAX_BUTTONS = VP_LETTERS_IN_ALPHABET + 1; - VP_LETTER_A = Ord('a'); + VP_LETTER_A = Ord('a'); type TVpButtonRec = packed record diff --git a/components/tvplanit/source/vpcontacteditdlg.pas b/components/tvplanit/source/vpcontacteditdlg.pas index c8c26b2a8..30723c2d5 100644 --- a/components/tvplanit/source/vpcontacteditdlg.pas +++ b/components/tvplanit/source/vpcontacteditdlg.pas @@ -34,11 +34,11 @@ interface uses {$IFDEF LCL} - LMessages, LCLProc, LCLType, LCLIntf, LResources, + LCLProc, LCLType, LCLIntf, LResources, {$ELSE} - Windows, + Windows, Messages, {$ENDIF} - Messages, SysUtils, + SysUtils, {$IFDEF VERSION6} Variants, {$ENDIF} Classes, Graphics, Controls, Forms, Dialogs, VpData, ExtCtrls, StdCtrls, VpException, VpMisc, VpBase, VpSR, VpDlg, VpBaseDS, ComCtrls; diff --git a/components/tvplanit/source/vpcontactgrid.pas b/components/tvplanit/source/vpcontactgrid.pas index b589a951c..7551a8da5 100644 --- a/components/tvplanit/source/vpcontactgrid.pas +++ b/components/tvplanit/source/vpcontactgrid.pas @@ -34,9 +34,9 @@ interface uses {$IFDEF LCL} - LMessages,LCLProc,LCLType,LCLIntf, + LMessages, LCLProc, LCLType, LCLIntf, {$ELSE} - Windows,Messages, + Windows, Messages, {$ENDIF} Classes, Graphics, Controls, ComCtrls, ExtCtrls, StdCtrls, VpBase, VpBaseDS, VpMisc, VpData, VpConst, VpSR, VpCanvasUtils, Menus; diff --git a/components/tvplanit/source/vpdata.pas b/components/tvplanit/source/vpdata.pas index f61219b5f..222f38819 100644 --- a/components/tvplanit/source/vpdata.pas +++ b/components/tvplanit/source/vpdata.pas @@ -35,7 +35,7 @@ interface uses {$IFDEF LCL} - LMessages, LCLProc, LCLType, + LCLProc, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/tvplanit/source/vpdatepropedit.pas b/components/tvplanit/source/vpdatepropedit.pas index e4b69c859..af639ea66 100644 --- a/components/tvplanit/source/vpdatepropedit.pas +++ b/components/tvplanit/source/vpdatepropedit.pas @@ -32,11 +32,11 @@ interface uses {$IFDEF LCL} - LMessages, LCLProc, LCLType, LCLIntf, + LCLProc, LCLType, LCLIntf, {$ELSE} - Windows, + Windows, Messages. {$ENDIF} - Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, + SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, //VpEdPop, VpDateEdit, VpBase, VpBaseDS, VpCalendar; diff --git a/components/tvplanit/source/vpdayview.pas b/components/tvplanit/source/vpdayview.pas index d3de2f624..b8354354f 100644 --- a/components/tvplanit/source/vpdayview.pas +++ b/components/tvplanit/source/vpdayview.pas @@ -49,7 +49,7 @@ provide multi-line editing capabilities. } -{$I Vp.INC} +{$I vp.inc} {.$DEFINE DEBUGDV} { Causes the DayView to operate in debug mode } @@ -68,9 +68,9 @@ uses {$IFDEF LCL} LMessages, LCLProc, LCLType, LCLIntf, {$ELSE} - Windows, + Windows, Messages, {$ENDIF} - Messages, Classes, Graphics, Controls, ComCtrls, ExtCtrls, StdCtrls, + Classes, Graphics, Controls, ComCtrls, ExtCtrls, StdCtrls, Buttons, VpBase, VpBaseDS, VpMisc, VpData, VpSR, VpConst, VpCanvasUtils, Menus; @@ -392,7 +392,7 @@ type function CountOverlappingEvents(Event: TVpEvent; const EArray: TVpDvEventArray): Integer; function GetMaxOLEvents(Event: TVpEvent; const EArray: TVpDvEventArray): Integer; { message handlers } - procedure VpDayViewInit(var Msg: TMessage); message Vp_DayViewInit; + procedure VpDayViewInit(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); message Vp_DayViewInit; {$IFNDEF LCL} procedure WMLButtonDblClk(var Msg : TWMLButtonDblClk); message WM_LBUTTONDBLCLK; procedure WMSize(var Msg: TWMSize); message WM_SIZE; @@ -3995,7 +3995,7 @@ end; {=====} {.$IFNDEF LCL} -procedure TVpDayView.VpDayViewInit(var Msg: TMessage); +procedure TVpDayView.VpDayViewInit(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); begin if csLoading in ComponentState then begin PostMessage(Handle, Vp_DayViewInit, 0, 0); diff --git a/components/tvplanit/source/vpdbds.pas b/components/tvplanit/source/vpdbds.pas index f3c2c3405..4dec17f74 100644 --- a/components/tvplanit/source/vpdbds.pas +++ b/components/tvplanit/source/vpdbds.pas @@ -33,7 +33,7 @@ interface uses {$IFDEF LCL} - LMessages,LCLProc,LCLType,LCLIntf, + LCLProc, LCLType, LCLIntf, {$ELSE} Windows, {$ENDIF} diff --git a/components/tvplanit/source/vpdlg.pas b/components/tvplanit/source/vpdlg.pas index 3e15f534f..4938e5f9e 100644 --- a/components/tvplanit/source/vpdlg.pas +++ b/components/tvplanit/source/vpdlg.pas @@ -26,7 +26,7 @@ {* *} {* ***** END LICENSE BLOCK ***** *} -{$I Vp.INC} +{$I vp.inc} unit VpDlg; {dialog components base classes} diff --git a/components/tvplanit/source/vpedelem.pas b/components/tvplanit/source/vpedelem.pas index ff80c8339..e3e721ba4 100644 --- a/components/tvplanit/source/vpedelem.pas +++ b/components/tvplanit/source/vpedelem.pas @@ -34,11 +34,11 @@ interface uses {$IFDEF LCL} - LMessages, LCLProc, LCLType, LCLIntf, + LCLProc, LCLType, LCLIntf, {$ELSE} - Windows, + Windows, Messages, {$ENDIF} - Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, + SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, VpBase, VpSR, VpPrtFmt, ComCtrls; diff --git a/components/tvplanit/source/vpedfmt.pas b/components/tvplanit/source/vpedfmt.pas index b6685b886..84c397315 100644 --- a/components/tvplanit/source/vpedfmt.pas +++ b/components/tvplanit/source/vpedfmt.pas @@ -26,7 +26,7 @@ {* *} {* ***** END LICENSE BLOCK ***** *} -{$I Vp.INC} +{$I vp.inc} unit VpEdFmt; @@ -34,11 +34,11 @@ interface uses {$IFDEF LCL} - LMessages, LCLProc, LCLType, LCLIntf, + LCLProc, LCLType, LCLIntf, {$ELSE} - Windows, + Windows, Messages, {$ENDIF} - Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, + SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, TypInfo, ComCtrls, VpPrtFmt; diff --git a/components/tvplanit/source/vpedshape.pas b/components/tvplanit/source/vpedshape.pas index 4429eba41..dab997e5d 100644 --- a/components/tvplanit/source/vpedshape.pas +++ b/components/tvplanit/source/vpedshape.pas @@ -26,7 +26,7 @@ {* *} {* ***** END LICENSE BLOCK ***** *} -{$I Vp.INC} +{$I vp.inc} unit VpEdShape; @@ -34,9 +34,9 @@ interface uses {$IFDEF LCL} - LMessages, LCLProc, LCLType, LCLIntf, + LCLProc, LCLType, LCLIntf, {$ELSE} - Windows,Messages,ColorGrd, + Windows, Messages, ColorGrd, {$ENDIF} SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, TypInfo, ComCtrls, diff --git a/components/tvplanit/source/vpevnteditdlg.pas b/components/tvplanit/source/vpevnteditdlg.pas index 2f0dd490f..4505d1537 100644 --- a/components/tvplanit/source/vpevnteditdlg.pas +++ b/components/tvplanit/source/vpevnteditdlg.pas @@ -26,7 +26,7 @@ {* *} {* ***** END LICENSE BLOCK ***** *} -{$I Vp.INC} +{$I vp.inc} unit VpEvntEditDlg; { The default event edit dialog } @@ -35,7 +35,7 @@ interface uses {$IFDEF LCL} - LMessages, LCLProc, LCLType, LCLIntf, LResources, EditBtn, + LCLProc, LCLType, LCLIntf, LResources, EditBtn, {$ELSE} Windows, Messages, Mask, {$ENDIF} diff --git a/components/tvplanit/source/vpexception.pas b/components/tvplanit/source/vpexception.pas index b8b9979fa..c973ac9a8 100644 --- a/components/tvplanit/source/vpexception.pas +++ b/components/tvplanit/source/vpexception.pas @@ -26,7 +26,7 @@ {* *} {* ***** END LICENSE BLOCK ***** *} -{$I Vp.INC} +{$I vp.inc} unit VpException; {Vp exceptions} @@ -35,7 +35,7 @@ interface uses {$IFDEF LCL} - LMessages,LCLProc,LCLType, + LCLProc, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/tvplanit/source/vpflxds.pas b/components/tvplanit/source/vpflxds.pas index 850e82ba4..c162e92c8 100644 --- a/components/tvplanit/source/vpflxds.pas +++ b/components/tvplanit/source/vpflxds.pas @@ -26,7 +26,7 @@ {* *} {* ***** END LICENSE BLOCK ***** *} -{$I Vp.INC} +{$I vp.inc} unit VpFlxDS; { Flexible DataStore Component } @@ -35,7 +35,7 @@ interface uses {$IFDEF LCL} - LMessages,LCLProc,LCLIntf, + LCLProc, LCLIntf, {$ELSE} Windows, {$ENDIF} diff --git a/components/tvplanit/source/vpflxdsed1.pas b/components/tvplanit/source/vpflxdsed1.pas index 50f599a19..6df3aa1fa 100644 --- a/components/tvplanit/source/vpflxdsed1.pas +++ b/components/tvplanit/source/vpflxdsed1.pas @@ -27,7 +27,7 @@ {* ***** END LICENSE BLOCK ***** *} {.$DEFINE RUNTIMETEST} -{$I Vp.INC} +{$I vp.inc} unit VpFlxDsEd1; { Flexible DataStore ComponentEditor } diff --git a/components/tvplanit/source/vplocalize.pas b/components/tvplanit/source/vplocalize.pas index 6133366db..1fdbf4022 100644 --- a/components/tvplanit/source/vplocalize.pas +++ b/components/tvplanit/source/vplocalize.pas @@ -37,19 +37,10 @@ uses Windows, // Needed for LCIDs {$ENDIF} {$IFDEF LCL} - LMessages,LCLProc,LCLType,LCLIntf, + LCLProc, LCLType, LCLIntf, {$ENDIF} - Classes, - Dialogs, - SysUtils, - Graphics, - StdCtrls, - VpBase, - VpMisc, - VpData, - VpXParsr, - VpPrtFmt, { For TVpAttributes } - Forms; + Classes, Dialogs,SysUtils, Graphics, StdCtrls, Forms, + VpBase, VpMisc, VpData, VpXParsr, VpPrtFmt; { For TVpAttributes } type TVpLocalizeLanguage = class; diff --git a/components/tvplanit/source/vpmisc.pas b/components/tvplanit/source/vpmisc.pas index be1007e68..1b69dec2c 100644 --- a/components/tvplanit/source/vpmisc.pas +++ b/components/tvplanit/source/vpmisc.pas @@ -35,11 +35,11 @@ interface uses {$IFDEF LCL} - LMessages,LCLProc,LCLType,LCLIntf, + LCLProc, LCLType, LCLIntf, {$ELSE} - Windows, Consts, + Windows, Consts, Messages, {$ENDIF} - Buttons, Classes, Controls, StdCtrls, ExtCtrls, Forms, Graphics, Messages, + Buttons, Classes, Controls, StdCtrls, ExtCtrls, Forms, Graphics, SysUtils, VpBase, VpData, VpConst; type diff --git a/components/tvplanit/source/vpmonthview.pas b/components/tvplanit/source/vpmonthview.pas index 0a3b8c417..094d8c4b8 100644 --- a/components/tvplanit/source/vpmonthview.pas +++ b/components/tvplanit/source/vpmonthview.pas @@ -26,7 +26,7 @@ {* *} {* ***** END LICENSE BLOCK ***** *} -{$I Vp.INC} +{$I vp.inc} unit VpMonthView; @@ -34,9 +34,9 @@ interface uses {$IFDEF LCL} - LMessages,LCLProc,LCLType,LCLIntf,FileUtil, + LMessages, LCLProc, LCLType, LCLIntf, FileUtil, {$ELSE} - Windows,Messages, + Windows, Messages, {$ENDIF} Classes, Graphics, Controls, ComCtrls, ExtCtrls, StdCtrls, VpBase, VpBaseDS, VpMisc, VpData, VpSR, VpConst, VpCanvasUtils, Menus; diff --git a/components/tvplanit/source/vpnabed.pas b/components/tvplanit/source/vpnabed.pas index 9d2aa1f2b..6571d8c27 100644 --- a/components/tvplanit/source/vpnabed.pas +++ b/components/tvplanit/source/vpnabed.pas @@ -26,7 +26,7 @@ {* *} {* ***** END LICENSE BLOCK ***** *} -{$I Vp.INC} +{$I vp.inc} unit VpNabEd; {-property editor for the NavBar} @@ -37,7 +37,7 @@ uses {$IFDEF LCL} LMessages, LCLProc, LCLType, LCLIntf, {$ELSE} - Windows,Messages, + Windows, Messages, {$ENDIF} SysUtils, Classes, Graphics, Controls, Forms, Dialogs, {$IFDEF VERSION6} diff --git a/components/tvplanit/source/vpnavbar.pas b/components/tvplanit/source/vpnavbar.pas index 0c01da2cc..0dc58f4c8 100644 --- a/components/tvplanit/source/vpnavbar.pas +++ b/components/tvplanit/source/vpnavbar.pas @@ -26,7 +26,7 @@ {* *} {* ***** END LICENSE BLOCK ***** *} -{$I Vp.INC} +{$I vp.inc} unit VpNavBar; @@ -36,9 +36,9 @@ uses {$IFDEF LCL} LMessages, LCLProc, LCLType, LCLIntf, {$ELSE} - Windows, MMSystem, + Windows, Messages, MMSystem, {$ENDIF} - Messages, Controls, Graphics, Forms, Buttons, SysUtils, + Controls, Graphics, Forms, Buttons, SysUtils, StdCtrls, Classes, ExtCtrls, VpBase, VpConst, VpMisc, VpSR, Math; type diff --git a/components/tvplanit/source/vpprtfmt.pas b/components/tvplanit/source/vpprtfmt.pas index ffc1098ca..238543a24 100644 --- a/components/tvplanit/source/vpprtfmt.pas +++ b/components/tvplanit/source/vpprtfmt.pas @@ -94,20 +94,8 @@ uses {$ELSE} Windows, {$ENDIF} - Classes, - Dialogs, - SysUtils, - Graphics, - StdCtrls, - VpBase, - VpMisc, - VpData, - VpXParsr, - VpCanvasUtils, - VpSR, - VpException, - Forms, - Printers; + Classes, Dialogs, SysUtils, Graphics, StdCtrls, Forms, Printers, + VpBase, VpMisc, VpData, VpXParsr, VpCanvasUtils, VpSR, VpException; type TVpChangeVar = (cvRemove, cvIgnore, cvChange); diff --git a/components/tvplanit/source/vpprtfmtcbox.pas b/components/tvplanit/source/vpprtfmtcbox.pas index 25b9445d0..ee39e107f 100644 --- a/components/tvplanit/source/vpprtfmtcbox.pas +++ b/components/tvplanit/source/vpprtfmtcbox.pas @@ -34,11 +34,10 @@ interface uses {$IFDEF LCL} - LMessages,LCLProc,LCLType,LCLIntf, + LMessages, LCLProc,LCLType,LCLIntf, {$ELSE} - Windows,Messages, + Windows, Messages, {$ENDIF} - Messages, SysUtils, Classes, Controls, @@ -56,11 +55,10 @@ type procedure Change; override; function GetAbout : string; procedure Loaded; override; - procedure Notification (AComponent : TComponent; - Operation : TOperation); override; + procedure Notification (AComponent: TComponent; Operation: TOperation); override; procedure SetAbout (const Value : string); procedure SetControlLink (const v : TVpControlLink); - procedure VpPrintFormatChanged (var Msg : TMessage); message Vp_PrintFormatChanged; + procedure VpPrintFormatChanged (var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); message Vp_PrintFormatChanged; public constructor Create (AOwner : TComponent); override; @@ -234,7 +232,7 @@ begin end; end; -procedure TVpPrintFormatComboBox.VpPrintFormatChanged (var Msg : TMessage); +procedure TVpPrintFormatComboBox.VpPrintFormatChanged(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); begin UpdateItems; end; diff --git a/components/tvplanit/source/vpprtfmted.pas b/components/tvplanit/source/vpprtfmted.pas index f4eef98f3..5ad5a5fd1 100644 --- a/components/tvplanit/source/vpprtfmted.pas +++ b/components/tvplanit/source/vpprtfmted.pas @@ -26,7 +26,7 @@ {* *} {* ***** END LICENSE BLOCK ***** *} -{$I Vp.INC} +{$I vp.inc} unit VpPrtFmtEd; {- property editor for TVpControlLink.Printer.PrintFormats property} @@ -35,9 +35,9 @@ interface uses {$IFDEF LCL} - LMessages,LCLProc,LCLType,LCLIntf, + LCLProc, LCLType, LCLIntf, {$ELSE} - Windows,Messages, + Windows, Messages, {$ENDIF} SysUtils, Classes, Graphics, Controls, Forms, Dialogs, {$IFDEF VERSION6} @@ -52,9 +52,8 @@ uses {$ELSE} DsgnIntf, {$ENDIF} - StdCtrls, ExtCtrls, Buttons, VpSR, - - VpBase, VpBaseDS, VpEdFmtLst; + StdCtrls, ExtCtrls, Buttons, + VpSR, VpBase, VpBaseDS, VpEdFmtLst; type TVpPrtFmtPropertyEditor = class(TComponentEditor) diff --git a/components/tvplanit/source/vpreg.pas b/components/tvplanit/source/vpreg.pas index 5c7a8eb39..45ab50cd2 100644 --- a/components/tvplanit/source/vpreg.pas +++ b/components/tvplanit/source/vpreg.pas @@ -36,7 +36,7 @@ interface uses {$IFDEF LCL} - LMessages, LCLProc, LCLType, LCLIntf, + LCLProc, LCLType, LCLIntf, {$ELSE} Windows, {$ENDIF} diff --git a/components/tvplanit/source/vpreseditdlg.pas b/components/tvplanit/source/vpreseditdlg.pas index 9b8d2d2c4..65cb05b78 100644 --- a/components/tvplanit/source/vpreseditdlg.pas +++ b/components/tvplanit/source/vpreseditdlg.pas @@ -36,9 +36,9 @@ uses {$IFDEF LCL} LMessages, LCLProc, LCLType, LCLIntf, LResources, {$ELSE} - Windows, + Windows, Messages, {$ENDIF} - Messages, SysUtils, + SysUtils, {$IFDEF VERSION6} Variants, {$ENDIF} Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, VpDlg, VpBase, VpData, ComCtrls, VpConst; diff --git a/components/tvplanit/source/vpselresdlg.pas b/components/tvplanit/source/vpselresdlg.pas index 87386996b..3ebcc0c38 100644 --- a/components/tvplanit/source/vpselresdlg.pas +++ b/components/tvplanit/source/vpselresdlg.pas @@ -34,9 +34,9 @@ uses {$IFDEF LCL} LMessages, LCLProc, LCLType, LCLIntf, LResources, {$ELSE} - Windows, + Windows, Messages, {$ENDIF} - Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, + SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, VpBaseDS, VpBase, VpDlg, VpResEditDlg, ExtCtrls; type diff --git a/components/tvplanit/source/vptaskeditdlg.pas b/components/tvplanit/source/vptaskeditdlg.pas index c300a71c6..bb2edf31c 100644 --- a/components/tvplanit/source/vptaskeditdlg.pas +++ b/components/tvplanit/source/vptaskeditdlg.pas @@ -37,9 +37,9 @@ uses {$IFDEF LCL} LMessages, LCLProc, LCLType, LCLIntf, LResources, {$ELSE} - Windows, + Windows, Messages, {$ENDIF} - Messages, SysUtils, + SysUtils, {$IFDEF VERSION6} Variants, {$ENDIF} Classes, Graphics, Controls, Forms, Dialogs, VpData, StdCtrls, ExtCtrls, VpEdPop, VpDateEdit, VpBase, VpSR, VpDlg, ComCtrls, EditBtn; diff --git a/components/tvplanit/source/vptasklist.pas b/components/tvplanit/source/vptasklist.pas index 6c3abc04e..2bd26cda3 100644 --- a/components/tvplanit/source/vptasklist.pas +++ b/components/tvplanit/source/vptasklist.pas @@ -26,7 +26,7 @@ {* *} {* ***** END LICENSE BLOCK ***** *} -{$I Vp.INC} +{$I vp.inc} unit VpTaskList; @@ -34,9 +34,9 @@ interface uses {$IFDEF LCL} - LMessages,LCLProc,LCLType,LCLIntf, + LMessages, LCLProc, LCLType, LCLIntf, {$ELSE} - Windows,Messages, + Windows, Messages, {$ENDIF} Classes, Graphics, Controls, ComCtrls, ExtCtrls, StdCtrls, VpBase, VpBaseDS, VpMisc, VpData, VpSR, VpConst, VpCanvasUtils, Menus; diff --git a/components/tvplanit/source/vptimerpool.pas b/components/tvplanit/source/vptimerpool.pas index dbcfa475e..25585007c 100644 --- a/components/tvplanit/source/vptimerpool.pas +++ b/components/tvplanit/source/vptimerpool.pas @@ -26,7 +26,7 @@ {* *} {* ***** END LICENSE BLOCK ***** *} -{$I Vp.INC} +{$I vp.inc} unit VpTimerPool; {-Timer Pool Class} @@ -35,11 +35,11 @@ interface uses {$IFDEF LCL} - LMessages,LCLProc,LCLType,LCLIntf, + LMessages, LCLProc, LCLType, LCLIntf, {$ELSE} - Windows, + Windows, Messages, {$ENDIF} - Classes, Messages, SysUtils, Forms, VpException; + Classes, SysUtils, Forms, VpException; type TVpTimerTriggerEvent = @@ -93,7 +93,7 @@ type {-returns the internal list index corresponding to the trigger handle} procedure tpSortTriggers; {-sorts the internal list of timer trigger event records} - procedure tpTimerWndProc(var Msg : TMessage); + procedure tpTimerWndProc(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); {-window procedure to catch timer messages} procedure tpUpdateTimer; {-re-create the windows timer with a new timer interval} @@ -606,7 +606,7 @@ begin until Done; end; -procedure TVpTimerPool.tpTimerWndProc(var Msg : TMessage); +procedure TVpTimerPool.tpTimerWndProc(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); {-window procedure to catch timer messages} begin with Msg do diff --git a/components/tvplanit/source/vpwavdlg.pas b/components/tvplanit/source/vpwavdlg.pas index ddc6ca6fe..26a7feafa 100644 --- a/components/tvplanit/source/vpwavdlg.pas +++ b/components/tvplanit/source/vpwavdlg.pas @@ -38,9 +38,9 @@ uses {$IFDEF LCL} LMessages, LCLProc, LCLType, LCLIntf, LResources, {$ELSE} - Windows, + Windows, Messages, {$ENDIF} - Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, + SysUtils, Classes, Graphics, Controls, Forms, Dialogs, FileCtrl, StdCtrls, ExtCtrls, Buttons, VpBase, ComCtrls, ShellCtrls; type diff --git a/components/tvplanit/source/vpweekview.pas b/components/tvplanit/source/vpweekview.pas index 306615126..363116968 100644 --- a/components/tvplanit/source/vpweekview.pas +++ b/components/tvplanit/source/vpweekview.pas @@ -40,7 +40,7 @@ functions in VpCanvasUtils are used to go between the rendering of the control and the TCanvas that it needs to render to. } -{$I Vp.INC} +{$I vp.inc} unit VpWeekView; @@ -48,9 +48,9 @@ interface uses {$IFDEF LCL} - LMessages,LCLProc,LCLType,LCLIntf,FileUtil, + LMessages, LCLProc, LCLType, LCLIntf, FileUtil, {$ELSE} - Windows,Messages, + Windows, Messages, {$ENDIF} Classes, Graphics, Controls, ComCtrls, ExtCtrls, StdCtrls, VpBase, VpBaseDS, VpMisc, VpData, VpSR, VpConst, VpCanvasUtils, Menus,