Menu
▾
▴
[JVCL-Checkins] CVS: dev/JVCL3/run JvAnimatedImage.pas,1.14,1.15 JvBDEQuery.pas,1.5,1.6 JvBandObject.pas,1.8,1.9 JvBaseDlg.pas,1.7,1.8 JvBdeUtils.pas,1.13,1.14 JvBehaviorLabel.pas,1.12,1.13 JvComponentPanel.pas,1.10,1.11 JvEdit.pas,1.16,1.17 JvGroupBox.pas,1.15,1.16 JvHtControls.pas,1.16,1.17 JvgReport.pas,1.16,1.17 - style cleaning, behavior label improvements
|
From: Robert M. <mar...@us...> - 2004-01-10 07:24:02
|
Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1:/tmp/cvs-serv25545/JVCL3/run
Modified Files:
JvAnimatedImage.pas JvBDEQuery.pas JvBandObject.pas
JvBaseDlg.pas JvBdeUtils.pas JvBehaviorLabel.pas
JvComponentPanel.pas JvEdit.pas JvGroupBox.pas
JvHtControls.pas JvgReport.pas
Log Message:
style cleaning, behavior label improvements
Index: JvAnimatedImage.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvAnimatedImage.pas,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** JvAnimatedImage.pas 5 Jan 2004 22:37:41 -0000 1.14
--- JvAnimatedImage.pas 10 Jan 2004 07:23:58 -0000 1.15
***************
*** 332,346 ****
type
TOpenWidgetControl = class(TWidgetControl);
! {$ENDIF}
procedure TJvImageControl.DoPaintControl;
var
! {$IFDEF VCl}
DC: HDC;
! {$ENDIF}
! {$IFDEF VisualCLX}
DC: QPainterH;
OrgDC: QPainterH;
! {$ENDIF}
begin
if GetCurrentThreadID = MainThreadID then
--- 332,346 ----
type
TOpenWidgetControl = class(TWidgetControl);
! {$ENDIF VisualCLX}
procedure TJvImageControl.DoPaintControl;
var
! {$IFDEF VCL}
DC: HDC;
! {$ENDIF VCL}
! {$IFDEF VisualCLX}
DC: QPainterH;
OrgDC: QPainterH;
! {$ENDIF VisualCLX}
begin
if GetCurrentThreadID = MainThreadID then
***************
*** 349,353 ****
Exit;
end;
! {$IFDEF VCL}
DC := GetDC(Parent.Handle);
try
--- 349,353 ----
Exit;
end;
! {$IFDEF VCL}
DC := GetDC(Parent.Handle);
try
***************
*** 358,363 ****
ReleaseDC(Parent.Handle, DC);
end;
! {$ENDIF VCL}
! {$IFDEF VisualCLX}
DC := QPainter_create;
try
--- 358,363 ----
ReleaseDC(Parent.Handle, DC);
end;
! {$ENDIF VCL}
! {$IFDEF VisualCLX}
DC := QPainter_create;
try
***************
*** 380,384 ****
QPainter_destroy(DC);
end;
! {$ENDIF VisualCLX}
end;
--- 380,384 ----
QPainter_destroy(DC);
end;
! {$ENDIF VisualCLX}
end;
***************
*** 419,423 ****
AdjustSize;
if FGraphic <> nil then
! if {$IFDEF VCL}DoPaletteChange and{$ENDIF} FDrawing then
Update;
if not FDrawing then
--- 419,423 ----
AdjustSize;
if FGraphic <> nil then
! if {$IFDEF VCL} DoPaletteChange and {$ENDIF} FDrawing then
Update;
if not FDrawing then
***************
*** 433,437 ****
{$IFDEF VisualCLX}
FOpaque := True;
! {$ENDIF}
FTimer := TJvTimer.Create(Self);
FTimer.Enabled := False;
--- 433,437 ----
{$IFDEF VisualCLX}
FOpaque := True;
! {$ENDIF VisualCLX}
FTimer := TJvTimer.Create(Self);
FTimer.Enabled := False;
***************
*** 707,713 ****
BmpIndex: Integer;
SrcRect, DstRect: TRect;
! {$IFDEF VisualCLX}
Bmp: TBitmap;
! {$ENDIF VisualCLX}
begin
if (not Active) and (FInactiveGlyph >= 0) and
--- 707,713 ----
BmpIndex: Integer;
SrcRect, DstRect: TRect;
! {$IFDEF VisualCLX}
Bmp: TBitmap;
! {$ENDIF VisualCLX}
begin
if (not Active) and (FInactiveGlyph >= 0) and
Index: JvBDEQuery.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBDEQuery.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JvBDEQuery.pas 5 Jan 2004 22:37:41 -0000 1.5
--- JvBDEQuery.pas 10 Jan 2004 07:23:58 -0000 1.6
***************
*** 34,40 ****
{$IFDEF COMPILER6_UP}
RTLConsts,
! {$ENDIF}
Classes, SysUtils, DB, DBTables,
! JvTypes, JvJCLUtils, JvBdeUtils {, JvComponent};
{.$DEFINE DEBUG}
--- 34,40 ----
{$IFDEF COMPILER6_UP}
RTLConsts,
! {$ENDIF COMPILER6_UP}
Classes, SysUtils, DB, DBTables,
! JvTypes, JvJCLUtils, JvBdeUtils, JvComponent, JVCLVer;
{.$DEFINE DEBUG}
***************
*** 49,52 ****
--- 49,53 ----
TJvQuery = class(TQuery)
private
+ FAboutJVCL: TJVCLAboutInfo;
FDisconnectExpected: Boolean;
FSaveQueryChanged: TNotifyEvent;
***************
*** 97,100 ****
--- 98,102 ----
{$ENDIF DEBUG}
published
+ property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False;
property MacroChar: Char read FMacroChar write SetMacroChar default DefaultMacroChar;
property SQL: TStrings read FSQLPattern write SetSQL;
***************
*** 129,133 ****
LineNo, StatementNo: Integer; var Action: TScriptAction) of object;
! TJvSQLScript = class(TComponent)
private
FSQL: TStrings;
--- 131,135 ----
LineNo, StatementNo: Integer; var Action: TScriptAction) of object;
! TJvSQLScript = class(TJvComponent)
private
FSQL: TStrings;
Index: JvBandObject.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBandObject.pas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** JvBandObject.pas 5 Jan 2004 22:37:41 -0000 1.8
--- JvBandObject.pas 10 Jan 2004 07:23:58 -0000 1.9
***************
*** 168,172 ****
{$IFDEF DEBUGINFO_ON}
//zTrace,
! {$ENDIF}
Registry, SysUtils, Math, JvJVCLUtils;
--- 168,172 ----
{$IFDEF DEBUGINFO_ON}
//zTrace,
! {$ENDIF DEBUGINFO_ON}
Registry, SysUtils, Math, JvJVCLUtils;
Index: JvBaseDlg.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBaseDlg.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JvBaseDlg.pas 5 Jan 2004 22:37:41 -0000 1.7
--- JvBaseDlg.pas 10 Jan 2004 07:23:58 -0000 1.8
***************
*** 44,48 ****
{$IFDEF VisualCLX}
TCommonDialog = TCustomDialog;
! {$ENDIF}
TJvCommonDialog = class(TCommonDialog)
--- 44,48 ----
{$IFDEF VisualCLX}
TCommonDialog = TCustomDialog;
! {$ENDIF VisualCLX}
TJvCommonDialog = class(TCommonDialog)
Index: JvBdeUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBdeUtils.pas,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** JvBdeUtils.pas 5 Jan 2004 22:37:41 -0000 1.13
--- JvBdeUtils.pas 10 Jan 2004 07:23:58 -0000 1.14
***************
*** 37,41 ****
{$IFDEF COMPILER6_UP}
Variants, RTLConsts,
! {$ENDIF}
Classes, DB, DBTables, IniFiles,
JvDBUtils;
--- 37,41 ----
{$IFDEF COMPILER6_UP}
Variants, RTLConsts,
! {$ENDIF COMPILER6_UP}
Classes, DB, DBTables, IniFiles,
JvDBUtils;
Index: JvBehaviorLabel.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBehaviorLabel.pas,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** JvBehaviorLabel.pas 6 Jan 2004 22:31:00 -0000 1.12
--- JvBehaviorLabel.pas 10 Jan 2004 07:23:58 -0000 1.13
***************
*** 43,47 ****
--- 43,49 ----
interface
+
uses
+ SysUtils, Classes,
{$IFDEF VCL}
Windows, Messages, Controls, Graphics, StdCtrls, ExtCtrls, Forms,
***************
*** 50,60 ****
[...1135 lines suppressed...]
--- 1253,1257 ----
FreeAndNil(FTimer);
// OwnerLabel.Caption := FOriginal;
! inherited Stop;
end;
***************
*** 1246,1250 ****
finalization
! FreeAndNil(FBehaviorOptions);
end.
--- 1266,1270 ----
finalization
! FreeAndNil(AllBehaviorOptions);
end.
Index: JvComponentPanel.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvComponentPanel.pas,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JvComponentPanel.pas 8 Jan 2004 16:38:22 -0000 1.10
--- JvComponentPanel.pas 10 Jan 2004 07:23:58 -0000 1.11
***************
*** 106,110 ****
property UseDockManager default True;
property DockSite;
! {$ENDIF VCl}
property DragKind;
property ParentBiDiMode;
--- 106,110 ----
property UseDockManager default True;
property DockSite;
! {$ENDIF VCL}
property DragKind;
property ParentBiDiMode;
Index: JvEdit.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvEdit.pas,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** JvEdit.pas 5 Jan 2004 22:37:42 -0000 1.16
--- JvEdit.pas 10 Jan 2004 07:23:58 -0000 1.17
***************
*** 51,58 ****
Windows, Messages, Graphics, Controls, StdCtrls, Forms, Menus,
JvCaret, JvToolEdit,
! {$ENDIF}
{$IFDEF VisualCLX}
QGraphics, QControls, QStdCtrls, QDialogs, QForms,
! {$ENDIF}
JvComponent, JvMaxPixel, JVCLVer, JvExStdCtrls;
--- 51,58 ----
Windows, Messages, Graphics, Controls, StdCtrls, Forms, Menus,
JvCaret, JvToolEdit,
! {$ENDIF VCL}
{$IFDEF VisualCLX}
QGraphics, QControls, QStdCtrls, QDialogs, QForms,
! {$ENDIF VisualCLX}
JvComponent, JvMaxPixel, JVCLVer, JvExStdCtrls;
***************
*** 69,73 ****
FOldCommands: TJvClipboardCommands;
FGroupIndex: Integer;
! {$IFDEF VCL}
FAlignment: TAlignment;
FCaret: TJvCaret;
--- 69,73 ----
FOldCommands: TJvClipboardCommands;
FGroupIndex: Integer;
! {$IFDEF VCL}
FAlignment: TAlignment;
FCaret: TJvCaret;
***************
*** 99,103 ****
procedure WMCut(var Msg: TWMCut); message WM_CUT;
procedure WMUndo(var Msg: TWMUndo); message WM_UNDO;
! {$ENDIF}
procedure SetGroupIndex(const Value: Integer);
procedure UpdateEdit;
--- 99,103 ----
procedure WMCut(var Msg: TWMCut); message WM_CUT;
procedure WMUndo(var Msg: TWMUndo); message WM_UNDO;
! {$ENDIF VCL}
procedure SetGroupIndex(const Value: Integer);
procedure UpdateEdit;
***************
*** 107,115 ****
procedure KeyDown(var Key:Word;Shift:TSHiftState);override;
procedure MaxPixelChanged(Sender: TObject);
! {$IFDEF VCL}
procedure SetSelLength(Value: Integer); override;
procedure SetSelStart(Value: Integer); override;
function GetPopupMenu: TPopupMenu; override;
! {$ENDIF}
procedure EnabledChanged; override;
procedure ParentColorChanged; override;
--- 107,115 ----
procedure KeyDown(var Key:Word;Shift:TSHiftState);override;
procedure MaxPixelChanged(Sender: TObject);
! {$IFDEF VCL}
procedure SetSelLength(Value: Integer); override;
procedure SetSelStart(Value: Integer); override;
function GetPopupMenu: TPopupMenu; override;
! {$ENDIF VCL}
procedure EnabledChanged; override;
procedure ParentColorChanged; override;
***************
*** 120,130 ****
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
! {$IFDEF VCL}
procedure DefaultHandler(var Msg); override;
procedure CreateParams(var Params: TCreateParams); override;
procedure Loaded; override;
! {$ENDIF}
protected
! {$IFDEF VCL}
property Alignment: TAlignment read FAlignment write SetAlignment default taLeftJustify;
property Caret: TJvCaret read FCaret write SetCaret;
--- 120,130 ----
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
! {$IFDEF VCL}
procedure DefaultHandler(var Msg); override;
procedure CreateParams(var Params: TCreateParams); override;
procedure Loaded; override;
! {$ENDIF VCL}
protected
! {$IFDEF VCL}
property Alignment: TAlignment read FAlignment write SetAlignment default taLeftJustify;
property Caret: TJvCaret read FCaret write SetCaret;
***************
*** 137,141 ****
property Text: string read GetText write SetText;
property UseFixedPopup:boolean read FUseFixedPopup write FUseFixedPopup default true;
! {$ENDIF}
property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False;
property ClipboardCommands: TJvClipboardCommands read FClipboardCommands write SetClipboardCommands default
--- 137,141 ----
property Text: string read GetText write SetText;
property UseFixedPopup:boolean read FUseFixedPopup write FUseFixedPopup default true;
! {$ENDIF VCL}
property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False;
property ClipboardCommands: TJvClipboardCommands read FClipboardCommands write SetClipboardCommands default
***************
*** 150,154 ****
TJvEdit = class(TJvCustomEdit)
published
! {$IFDEF VCL}
{$IFDEF COMPILER6_UP}
property BevelEdges;
--- 150,154 ----
TJvEdit = class(TJvCustomEdit)
published
! {$IFDEF VCL}
{$IFDEF COMPILER6_UP}
property BevelEdges;
***************
*** 156,160 ****
property BevelKind default bkNone;
property BevelOuter;
! {$ENDIF}
property BiDiMode;
property Caret;
--- 156,160 ----
property BevelKind default bkNone;
property BevelOuter;
! {$ENDIF COMPILER6_UP}
property BiDiMode;
property Caret;
***************
*** 172,180 ****
property ProtectPassword;
property UseFixedPopup; // asn: clx not implemented yet
! {$ENDIF}
! {$IFDEF VisualCLX}
property EchoMode;
property InputKeys;
! {$ENDIF}
property AboutJVCL;
property Align;
--- 172,180 ----
property ProtectPassword;
property UseFixedPopup; // asn: clx not implemented yet
! {$ENDIF VCL}
! {$IFDEF VisualCLX}
property EchoMode;
property InputKeys;
! {$ENDIF VisualCLX}
property AboutJVCL;
property Align;
***************
*** 238,242 ****
{$IFDEF VCL}
JvFixedEditPopup,
! {$ENDIF}
Math;
--- 238,242 ----
{$IFDEF VCL}
JvFixedEditPopup,
! {$ENDIF VCL}
Math;
***************
*** 258,262 ****
FStreamedSelStart := 0;
FUseFixedPopup := True; // asn: clx not implemented yet
! {$ENDIF}
FMaxPixel := TJvMaxPixel.Create(Self);
FMaxPixel.OnChanged := MaxPixelChanged;
--- 258,262 ----
FStreamedSelStart := 0;
FUseFixedPopup := True; // asn: clx not implemented yet
! {$ENDIF VCL}
FMaxPixel := TJvMaxPixel.Create(Self);
FMaxPixel.OnChanged := MaxPixelChanged;
***************
*** 269,273 ****
{$IFDEF VCL}
FCaret.Free;
! {$ENDIF}
inherited Destroy;
end;
--- 269,273 ----
{$IFDEF VCL}
FCaret.Free;
! {$ENDIF VCL}
inherited Destroy;
end;
***************
*** 280,284 ****
SelLength := FStreamedSelLength;
end;
! {$ENDIF}
procedure TJvCustomEdit.Change;
--- 280,284 ----
SelLength := FStreamedSelLength;
end;
! {$ENDIF VCL}
procedure TJvCustomEdit.Change;
***************
*** 323,327 ****
FSaved := Application.HintColor;
Application.HintColor := FColor;
! {$IFDEF VCL}
if FHotTrack then
begin
--- 323,327 ----
FSaved := Application.HintColor;
Application.HintColor := FColor;
! {$IFDEF VCL}
if FHotTrack then
begin
***************
*** 332,336 ****
SelLength := J;
end;
! {$ENDIF VCL}
FOver := True;
end;
--- 332,336 ----
SelLength := J;
end;
! {$ENDIF VCL}
FOver := True;
end;
***************
*** 377,381 ****
Ctl3D := not FHotTrack; // asn: in clx not implemented
end;
! {$ENDIF VCl}
function TJvCustomEdit.IsEmpty: Boolean;
--- 377,381 ----
Ctl3D := not FHotTrack; // asn: in clx not implemented
end;
! {$ENDIF VCL}
function TJvCustomEdit.IsEmpty: Boolean;
***************
*** 409,412 ****
--- 409,413 ----
{$IFDEF VCL}
+
procedure TJvCustomEdit.SetDisabledColor(const Value: TColor);
begin
***************
*** 506,509 ****
--- 507,511 ----
inherited;
end;
+
{$ENDIF VCL}
***************
*** 516,523 ****
{$IFDEF VisualCLX}
procedure TJvCustomEdit.CopyToClipboard;
! {$ENDIF}
{$IFDEF VCL}
procedure TJvCustomEdit.WMCopy(var Msg: TWMCopy);
! {$ENDIF}
begin
if caCopy in ClipBoardCommands then
--- 518,525 ----
{$IFDEF VisualCLX}
procedure TJvCustomEdit.CopyToClipboard;
! {$ENDIF VisualCLX}
{$IFDEF VCL}
procedure TJvCustomEdit.WMCopy(var Msg: TWMCopy);
! {$ENDIF VCL}
begin
if caCopy in ClipBoardCommands then
***************
*** 527,534 ****
{$IFDEF VisualCLX}
procedure TJvCustomEdit.CutToClipboard;
! {$ENDIF}
{$IFDEF VCL}
procedure TJvCustomEdit.WMCut(var Msg: TWMCut);
! {$ENDIF}
begin
if caCut in ClipBoardCommands then
--- 529,536 ----
{$IFDEF VisualCLX}
procedure TJvCustomEdit.CutToClipboard;
! {$ENDIF VisualCLX}
{$IFDEF VCL}
procedure TJvCustomEdit.WMCut(var Msg: TWMCut);
! {$ENDIF VCL}
begin
if caCut in ClipBoardCommands then
***************
*** 538,545 ****
{$IFDEF VisualCLX}
procedure TJvCustomEdit.PasteFromClipboard;
! {$ENDIF}
{$IFDEF VCL}
procedure TJvCustomEdit.WMPaste(var Msg: TWMPaste);
! {$ENDIF}
begin
if caPaste in ClipBoardCommands then
--- 540,547 ----
{$IFDEF VisualCLX}
procedure TJvCustomEdit.PasteFromClipboard;
! {$ENDIF VisualCLX}
{$IFDEF VCL}
procedure TJvCustomEdit.WMPaste(var Msg: TWMPaste);
! {$ENDIF VCL}
begin
if caPaste in ClipBoardCommands then
***************
*** 550,557 ****
{$IFDEF VisualCLX}
procedure TJvCustomEdit.Undo;
! {$ENDIF}
{$IFDEF VCL}
procedure TJvCustomEdit.WMUndo(var Msg: TWMUndo);
! {$ENDIF}
begin
if caUndo in ClipBoardCommands then
--- 552,559 ----
{$IFDEF VisualCLX}
procedure TJvCustomEdit.Undo;
! {$ENDIF VisualCLX}
{$IFDEF VCL}
procedure TJvCustomEdit.WMUndo(var Msg: TWMUndo);
! {$ENDIF VCL}
begin
if caUndo in ClipBoardCommands then
***************
*** 560,563 ****
--- 562,566 ----
{$IFDEF VCL}
+
function TJvCustomEdit.GetReadOnly: Boolean;
begin
***************
*** 578,582 ****
FClipboardCommands := FOldCommands;
end;
! {$ENDIF}
procedure TJvCustomEdit.SetGroupIndex(const Value: Integer);
--- 581,586 ----
FClipboardCommands := FOldCommands;
end;
!
! {$ENDIF VCL}
procedure TJvCustomEdit.SetGroupIndex(const Value: Integer);
***************
*** 608,611 ****
--- 612,616 ----
{$IFDEF VCL}
+
procedure TJvCustomEdit.SetText(const Value: string);
begin
***************
*** 662,666 ****
Result := inherited PasswordChar;
end;
! {$ENDIF}
procedure TJvCustomEdit.KeyDown(var Key: Word; Shift: TSHiftState);
--- 667,672 ----
Result := inherited PasswordChar;
end;
!
! {$ENDIF VCL}
procedure TJvCustomEdit.KeyDown(var Key: Word; Shift: TSHiftState);
***************
*** 671,674 ****
--- 677,681 ----
{$IFDEF VCL}
+
procedure TJvCustomEdit.SetSelLength(Value: Integer);
begin
***************
*** 694,698 ****
Result := FixedDefaultEditPopUp(self);
end;
! {$ENDIF}
end.
--- 701,706 ----
Result := FixedDefaultEditPopUp(self);
end;
!
! {$ENDIF VCL}
end.
Index: JvGroupBox.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvGroupBox.pas,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** JvGroupBox.pas 8 Jan 2004 16:37:43 -0000 1.15
--- JvGroupBox.pas 10 Jan 2004 07:23:58 -0000 1.16
***************
*** 194,198 ****
H := TextHeight('0');
R := Rect(0, H div 2 - 1, Width, Height);
! {$IFDEF VCl}
if Ctl3D then
{$ELSE}
--- 194,198 ----
H := TextHeight('0');
R := Rect(0, H div 2 - 1, Width, Height);
! {$IFDEF VCL}
if Ctl3D then
{$ELSE}
Index: JvHtControls.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvHtControls.pas,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** JvHtControls.pas 9 Jan 2004 12:29:56 -0000 1.16
--- JvHtControls.pas 10 Jan 2004 07:23:58 -0000 1.17
***************
*** 221,225 ****
constructor Create(AOwner: TComponent); override;
property PlainItems[Index: Integer]: string read GetPlainItems;
! {$IFDEF VCl}
procedure SetHeight(Value: Integer); // Kaczkowski
function GetHeight: Integer; // Kaczkowski
--- 221,225 ----
constructor Create(AOwner: TComponent); override;
property PlainItems[Index: Integer]: string read GetPlainItems;
! {$IFDEF VCL}
procedure SetHeight(Value: Integer); // Kaczkowski
function GetHeight: Integer; // Kaczkowski
Index: JvgReport.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgReport.pas,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** JvgReport.pas 5 Jan 2004 22:37:47 -0000 1.16
--- JvgReport.pas 10 Jan 2004 07:23:58 -0000 1.17
***************
*** 115,125 ****
procedure WMLMouseUp(var Message: TWMMouse); message WM_LBUTTONUP;
procedure WMSize(var Message: TWMSize); message WM_SIZE;
!
! {$IFDEF USEJVCL}
protected
procedure MouseEnter(Control: TControl); override;
procedure MouseLeave(Control: TControl); override;
procedure FontChanged; override;
! {$ELSE}
procedure CMMouseEnter(var Message: TMessage); message CM_MOUSEENTER;
procedure CMMouseLeave(var Message: TMessage); message CM_MOUSELEAVE;
--- 115,124 ----
procedure WMLMouseUp(var Message: TWMMouse); message WM_LBUTTONUP;
procedure WMSize(var Message: TWMSize); message WM_SIZE;
! {$IFDEF USEJVCL}
protected
procedure MouseEnter(Control: TControl); override;
procedure MouseLeave(Control: TControl); override;
procedure FontChanged; override;
! {$ELSE}
procedure CMMouseEnter(var Message: TMessage); message CM_MOUSEENTER;
procedure CMMouseLeave(var Message: TMessage); message CM_MOUSELEAVE;
***************
*** 129,133 ****
procedure MouseLeave(Control: TControl); dynamic;
procedure FontChanged; dynamic;
! {$ENDIF USEJVCl}
public
procedure Paint; override;
--- 128,132 ----
procedure MouseLeave(Control: TControl); dynamic;
procedure FontChanged; dynamic;
! {$ENDIF USEJVCL}
public
procedure Paint; override;
***************
*** 308,312 ****
{$IFDEF GL_RUS}
Font.CharSet := RUSSIAN_CHARSET;
! {$ENDIF}
FontChanged;
end;
--- 307,311 ----
{$IFDEF GL_RUS}
Font.CharSet := RUSSIAN_CHARSET;
! {$ENDIF GL_RUS}
FontChanged;
end;
***************
*** 658,663 ****
end;
! {$IFDEF USEJVCL}
! {$ELSE}
procedure TJvgReportItem.CMMouseEnter(var Message: TMessage);
begin
--- 657,662 ----
end;
! {$IFNDEF USEJVCL}
!
procedure TJvgReportItem.CMMouseEnter(var Message: TMessage);
begin
***************
*** 677,680 ****
--- 676,680 ----
FontChanged;
end;
+
{$ENDIF USEJVCL}
|