Menu
▾
▴
[JVCL-Checkins] dev/JVCL3/run JvAppStorage.pas,1.89,1.90 JvLabel.pas,1.78,1.79 JvListComb.pas,1.52,1.53 JvMaskEdit.pas,1.47,1.48 JvThread.pas,1.37,1.38 JvXPBar.pas,1.92,1.93 - style cleanups are back
|
From: Robert M. <mar...@us...> - 2005-08-14 05:58:21
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10865/JVCL3/run Modified Files: JvAppStorage.pas JvLabel.pas JvListComb.pas JvMaskEdit.pas JvThread.pas JvXPBar.pas Log Message: style cleanups are back Index: JvListComb.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvListComb.pas,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** JvListComb.pas 11 Aug 2005 16:07:14 -0000 1.52 --- JvListComb.pas 14 Aug 2005 05:58:12 -0000 1.53 *************** *** 115,121 **** // as in the list or the component will not be created // correctly when restored from a DFM stream. ! property ListPropertiesUsed: TJvListPropertiesUsed read FListPropertiesUsed write FListPropertiesUsed default AllListPropertiesUsed; ! property ColorHighlight: TColor read GetColorHighlight write SetColorHighlight stored IsColorHighlightStored default clHighlight ; ! property ColorHighlightText: TColor read GetColorHighlightText write SetColorHighlightText stored IsColorHighlightTextStored default clHighlightText; property Font: TFont read GetFont write SetFont stored IsFontStored; property Glyph: TBitmap read GetGlyph write SetGlyph stored True; --- 115,124 ---- // as in the list or the component will not be created // correctly when restored from a DFM stream. ! property ListPropertiesUsed: TJvListPropertiesUsed read FListPropertiesUsed ! write FListPropertiesUsed default AllListPropertiesUsed; ! property ColorHighlight: TColor read GetColorHighlight ! write SetColorHighlight stored IsColorHighlightStored default clHighlight; ! property ColorHighlightText: TColor read GetColorHighlightText ! write SetColorHighlightText stored IsColorHighlightTextStored default clHighlightText; property Font: TFont read GetFont write SetFont stored IsFontStored; property Glyph: TBitmap read GetGlyph write SetGlyph stored True; *************** *** 145,149 **** procedure InsertObject(Index: Integer; const Text: string; ALinkedObject: TObject); procedure Move(CurIndex, NewIndex: Integer); ! procedure Sort(sortProc: TCollectionSortProc); function IndexOfLinkedObject(ALinkedObject: TObject): Integer; --- 148,152 ---- procedure InsertObject(Index: Integer; const Text: string; ALinkedObject: TObject); procedure Move(CurIndex, NewIndex: Integer); ! procedure Sort(SortProc: TCollectionSortProc); function IndexOfLinkedObject(ALinkedObject: TObject): Integer; *************** *** 165,169 **** FDefaultIndent: Integer; FChangeLink: TChangeLink; ! MouseInControl: Boolean; FImageWidth: Integer; FImageHeight: Integer; --- 168,172 ---- FDefaultIndent: Integer; FChangeLink: TChangeLink; ! FMouseInControl: Boolean; FImageWidth: Integer; FImageHeight: Integer; *************** *** 210,214 **** function DrawItem(Index: Integer; R: TRect; State: TOwnerDrawState): Boolean; override; procedure MeasureItem(Control: TWinControl; Item: QClxListBoxItemH; ! var Height, Width: Integer); override; procedure SetParent(const AParent: TWidgetControl); override; {$ENDIF VisualCLX} --- 213,217 ---- function DrawItem(Index: Integer; R: TRect; State: TOwnerDrawState): Boolean; override; procedure MeasureItem(Control: TWinControl; Item: QClxListBoxItemH; ! var Height, Width: Integer); override; procedure SetParent(const AParent: TWidgetControl); override; {$ENDIF VisualCLX} *************** *** 279,283 **** FImageHeight: Integer; FAlignment: TAlignment; ! FColorHighlight, FColorHighlightText: TColor; FButtonFrame: Boolean; FButtonStyle: TJvButtonColors; --- 282,287 ---- FImageHeight: Integer; FAlignment: TAlignment; ! FColorHighlight: TColor; ! FColorHighlightText: TColor; FButtonFrame: Boolean; FButtonStyle: TJvButtonColors; *************** *** 310,314 **** function DrawItem(Index: Integer; Rect: TRect; State: TOwnerDrawState):Boolean ; override; procedure MeasureItem(Control: TWinControl; Item: QClxListBoxItemH; ! var Height, Width: Integer); override; procedure SetParent(const AParent: TWidgetControl); override; {$ENDIF VisualCLX} --- 314,318 ---- function DrawItem(Index: Integer; Rect: TRect; State: TOwnerDrawState):Boolean ; override; procedure MeasureItem(Control: TWinControl; Item: QClxListBoxItemH; ! var Height, Width: Integer); override; procedure SetParent(const AParent: TWidgetControl); override; {$ENDIF VisualCLX} *************** *** 414,419 **** end; - // (rom) completely rewritten - procedure DrawBtnFrame(Canvas: TCanvas; ButtonStyle: TJvButtonColors; DefColor: TColor; Default: Boolean; R: TRect); const --- 418,421 ---- *************** *** 541,545 **** if S[Index] <> Value then begin ! SavedOwner := FOwner; // do not add the item in FillItems which meight be called by the draw message handler while deleting the string try FOwner := nil; --- 543,548 ---- if S[Index] <> Value then begin ! // do not add the item in FillItems which might be called by the draw message handler while deleting the string ! SavedOwner := FOwner; try FOwner := nil; *************** *** 725,730 **** end; ! function TJvImageItems.AddObject(const Text: string; ! ALinkedObject: TObject): Integer; var Item: TJvImageItem; --- 728,732 ---- end; ! function TJvImageItems.AddObject(const Text: string; ALinkedObject: TObject): Integer; var Item: TJvImageItem; *************** *** 736,741 **** end; ! procedure TJvImageItems.InsertObject(Index: Integer; const Text: string; ! ALinkedObject: TObject); var Item: TJvImageItem; --- 738,742 ---- end; ! procedure TJvImageItems.InsertObject(Index: Integer; const Text: string; ALinkedObject: TObject); var Item: TJvImageItem; *************** *** 746,752 **** end; ! procedure TJvImageItems.Sort(sortProc: TCollectionSortProc); begin ! CollectionSort(Self, sortProc); end; --- 747,753 ---- end; ! procedure TJvImageItems.Sort(SortProc: TCollectionSortProc); begin ! CollectionSort(Self, SortProc); end; *************** *** 831,834 **** --- 832,836 ---- {$IFDEF VCL} + procedure TJvImageComboBox.CreateWnd; begin *************** *** 842,848 **** --- 844,852 ---- SetDroppedWidth(FDroppedWidth); end; + {$ENDIF VCL} {$IFDEF VisualCLX} + procedure TJvImageComboBox.CreateWidget; begin *************** *** 856,863 **** SetDroppedWidth(FDroppedWidth); end; - {$ENDIF VisualCLX} - - procedure TJvImageComboBox.Notification(AComponent: TComponent; Operation: TOperation); --- 860,865 ---- SetDroppedWidth(FDroppedWidth); end; + {$ENDIF VisualCLX} procedure TJvImageComboBox.Notification(AComponent: TComponent; Operation: TOperation); *************** *** 908,912 **** --- 910,916 ---- end; end; + {$ENDIF VCL} + {$IFDEF VCL} procedure TJvImageComboBox.DrawItem(Index: Integer; R: TRect; State: TOwnerDrawState); {$ENDIF VCL} *************** *** 951,955 **** Brush.Color := TmpCol; ! if not (odComboBoxEdit in State) or IndentSelected then // (p3) don't draw indentation for edit item unless explicitly told to do so R.Left := R.Left + Items[Index].Indent; --- 955,960 ---- Brush.Color := TmpCol; ! // (p3) don't draw indentation for edit item unless explicitly told to do so ! if not (odComboBoxEdit in State) or IndentSelected then R.Left := R.Left + Items[Index].Indent; *************** *** 963,968 **** begin TmpR := Rect(R.Left, R.Top, R.Left + FImageList.Width + 4, R.Top + FImageList.Height + 4); ! DrawBtnFrame(Canvas, FButtonStyle, Color, not ((odFocused in State) and ! not (odComboBoxEdit in State)), TmpR); end; --- 968,973 ---- begin TmpR := Rect(R.Left, R.Top, R.Left + FImageList.Width + 4, R.Top + FImageList.Height + 4); ! DrawBtnFrame(Canvas, FButtonStyle, Color, ! not ((odFocused in State) and not (odComboBoxEdit in State)), TmpR); end; *************** *** 992,997 **** begin TmpR := Rect(R.Left, R.Top, R.Left + FImageList.Width + 4, R.Top + FImageList.Height + 4); ! DrawBtnFrame(Canvas, FButtonStyle, Color, not ((Tmp in [0..FImageList.Count - 1]) and (odFocused in State) and ! not (odComboBoxEdit in State)), TmpR); end; Inc(R.Left, GetImageWidth(Index) + 8); --- 997,1003 ---- begin TmpR := Rect(R.Left, R.Top, R.Left + FImageList.Width + 4, R.Top + FImageList.Height + 4); ! DrawBtnFrame(Canvas, FButtonStyle, Color, ! not ((Tmp in [0..FImageList.Count - 1]) and ! (odFocused in State) and not (odComboBoxEdit in State)), TmpR); end; Inc(R.Left, GetImageWidth(Index) + 8); *************** *** 1031,1036 **** {$IFDEF VisualCLX} procedure TJvImageComboBox.MeasureItem(Control: TWinControl; Item: QClxListBoxItemH; ! var Height, Width: Integer); begin Height := Max(GetItemHeight(Font) + 4, GetImageHeight(Index) + (Ord(ButtonFrame) * 4)); --- 1037,1043 ---- {$IFDEF VisualCLX} + procedure TJvImageComboBox.MeasureItem(Control: TWinControl; Item: QClxListBoxItemH; ! var Height, Width: Integer); begin Height := Max(GetItemHeight(Font) + 4, GetImageHeight(Index) + (Ord(ButtonFrame) * 4)); *************** *** 1045,1048 **** --- 1052,1056 ---- ResetItemHeight; end; + {$ENDIF VisualCLX} *************** *** 1066,1069 **** --- 1074,1078 ---- {$IFDEF VCL} + function TJvImageComboBox.GetDroppedWidth: Integer; begin *************** *** 1077,1083 **** --- 1086,1094 ---- FDroppedWidth := SendMessage(Handle, CB_SETDROPPEDWIDTH, Value, 0); end; + {$ENDIF VCL} {$IFDEF VisualCLX} + function TJvImageComboBox.GetDroppedWidth: Integer; begin *************** *** 1092,1095 **** --- 1103,1107 ---- FDroppedWidth := GetDroppedWidth; end; + {$ENDIF VisualCLX} *************** *** 1148,1158 **** begin inherited MouseEnter(AControl); ! MouseInControl := True; end; procedure TJvImageComboBox.MouseLeave(AControl: TControl); begin inherited MouseLeave(AControl); - MouseInControl := False; end; --- 1160,1170 ---- begin inherited MouseEnter(AControl); ! FMouseInControl := True; end; procedure TJvImageComboBox.MouseLeave(AControl: TControl); begin + FMouseInControl := False; inherited MouseLeave(AControl); end; *************** *** 1368,1372 **** --- 1380,1386 ---- end; end; + {$ENDIF VCL} + {$IFDEF VCL} procedure TJvImageListBox.DrawItem(Index: Integer; Rect: TRect; State: TOwnerDrawState); {$ENDIF VCL} *************** *** 1427,1431 **** if FButtonFrame then begin ! TmpR := Rect(R.Left + Tmp - 2, R.Top + 2, R.Left + Tmp + FImageList.Width + 2, R.Top + FImageList.Height + 2); DrawBtnFrame(Canvas, FButtonStyle, Color, not (odSelected in State), TmpR); end; --- 1441,1446 ---- if FButtonFrame then begin ! TmpR := Rect(R.Left + Tmp - 2, R.Top + 2, ! R.Left + Tmp + FImageList.Width + 2, R.Top + FImageList.Height + 2); DrawBtnFrame(Canvas, FButtonStyle, Color, not (odSelected in State), TmpR); end; *************** *** 1452,1457 **** if FButtonFrame then begin ! TmpR := Rect(R.Left + Tmp - 2, R.Top + 2, R.Left + Tmp + FImageList.Width + 2, R.Top + FImageList.Height + 2); ! DrawBtnFrame(Canvas, FButtonStyle, Color, not ((Tmp2 in [0..FImageList.Count - 1]) and (odSelected in State)), TmpR); end; InflateRect(R, 1, -4); --- 1467,1474 ---- if FButtonFrame then begin ! TmpR := Rect(R.Left + Tmp - 2, R.Top + 2, ! R.Left + Tmp + FImageList.Width + 2, R.Top + FImageList.Height + 2); ! DrawBtnFrame(Canvas, FButtonStyle, Color, ! not ((Tmp2 in [0..FImageList.Count - 1]) and (odSelected in State)), TmpR); end; InflateRect(R, 1, -4); *************** *** 1529,1533 **** begin TmpR := Rect(R.Left, R.Top, R.Left + FImageList.Width + 4, R.Top + FImageList.Height + 4); ! DrawBtnFrame(Canvas, FButtonStyle, Color, not ((Tmp in [0..FImageList.Count - 1]) and (odSelected in State)), TmpR); end; Inc(R.Left, GetImageWidth(Index) + 8); --- 1546,1551 ---- begin TmpR := Rect(R.Left, R.Top, R.Left + FImageList.Width + 4, R.Top + FImageList.Height + 4); ! DrawBtnFrame(Canvas, FButtonStyle, Color, ! not ((Tmp in [0..FImageList.Count - 1]) and (odSelected in State)), TmpR); end; Inc(R.Left, GetImageWidth(Index) + 8); *************** *** 1581,1585 **** if FButtonFrame then begin ! TmpR := Rect(R.Right - (FImageList.Width + 2) - 2, R.Top + Offset - 2, R.Right - 2, R.Top + Offset + FImageList.Height + 2); DrawBtnFrame(Canvas, FButtonStyle, Color, not (odSelected in State), TmpR); end; --- 1599,1604 ---- if FButtonFrame then begin ! TmpR := Rect(R.Right - (FImageList.Width + 2) - 2, ! R.Top + Offset - 2, R.Right - 2, R.Top + Offset + FImageList.Height + 2); DrawBtnFrame(Canvas, FButtonStyle, Color, not (odSelected in State), TmpR); end; *************** *** 1609,1614 **** if FButtonFrame then begin ! TmpR := Rect(R.Right - (FImageList.Width + 2) - 2, R.Top + Offset - 2, R.Right - 2, R.Top + Offset + FImageList.Height + 2); ! DrawBtnFrame(Canvas, FButtonStyle, Color, not ((Tmp in [0..FImageList.Count - 1]) and (odSelected in State)), TmpR); end; Dec(R.Right, FImageList.Width + 4); --- 1628,1635 ---- if FButtonFrame then begin ! TmpR := Rect(R.Right - (FImageList.Width + 2) - 2, ! R.Top + Offset - 2, R.Right - 2, R.Top + Offset + FImageList.Height + 2); ! DrawBtnFrame(Canvas, FButtonStyle, Color, ! not ((Tmp in [0..FImageList.Count - 1]) and (odSelected in State)), TmpR); end; Dec(R.Right, FImageList.Width + 4); *************** *** 1648,1652 **** procedure TJvImageListBox.MeasureItem(Control: TWinControl; Item: QClxListBoxItemH; ! var Height, Width: Integer); begin Height := Max(GetItemHeight(Font) + 4, GetImageHeight(Index) + Ord(ButtonFrame) * 4); --- 1669,1673 ---- procedure TJvImageListBox.MeasureItem(Control: TWinControl; Item: QClxListBoxItemH; ! var Height, Width: Integer); begin Height := Max(GetItemHeight(Font) + 4, GetImageHeight(Index) + Ord(ButtonFrame) * 4); *************** *** 1659,1663 **** end; - {$ENDIF VisualCLX} --- 1680,1683 ---- *************** *** 1854,1858 **** {$IFDEF UNITVERSIONING} - initialization RegisterUnitVersion(HInstance, UnitVersioning); --- 1874,1877 ---- Index: JvThread.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvThread.pas,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** JvThread.pas 11 Aug 2005 18:21:00 -0000 1.37 --- JvThread.pas 14 Aug 2005 05:58:12 -0000 1.38 *************** *** 62,66 **** public constructor Create(Sender: TObject; Event: TJvNotifyParamsEvent; Params: Pointer); virtual; ! function SynchMessageDlg(const Msg: string; AType: TMsgDlgType; AButtons: TMsgDlgButtons; HelpCtx: Longint): Word; procedure Execute; override; end; --- 62,67 ---- public constructor Create(Sender: TObject; Event: TJvNotifyParamsEvent; Params: Pointer); virtual; ! function SynchMessageDlg(const Msg: string; AType: TMsgDlgType; ! AButtons: TMsgDlgButtons; HelpCtx: Longint): Word; procedure Execute; override; end; *************** *** 92,96 **** procedure Synchronize (Method: TThreadMethod); ! function SynchMessageDlg(const Msg: string; AType: TMsgDlgType; AButtons: TMsgDlgButtons; HelpCtx: Longint): Word; property Count: Integer read GetCount; --- 93,98 ---- procedure Synchronize (Method: TThreadMethod); ! function SynchMessageDlg(const Msg: string; AType: TMsgDlgType; ! AButtons: TMsgDlgButtons; HelpCtx: Longint): Word; property Count: Integer read GetCount; *************** *** 207,211 **** end; ! function TJvThread.SynchMessageDlg(const Msg: string; AType: TMsgDlgType; AButtons: TMsgDlgButtons; HelpCtx: Longint): Word; begin if Assigned(LastThread) then --- 209,214 ---- end; ! function TJvThread.SynchMessageDlg(const Msg: string; AType: TMsgDlgType; ! AButtons: TMsgDlgButtons; HelpCtx: Longint): Word; begin if Assigned(LastThread) then *************** *** 426,430 **** end; ! function TJvBaseThread.SynchMessageDlg(const Msg: string; AType: TMsgDlgType; AButtons: TMsgDlgButtons; HelpCtx: Longint): Word; begin FSynchMsg := Msg; --- 429,434 ---- end; ! function TJvBaseThread.SynchMessageDlg(const Msg: string; AType: TMsgDlgType; ! AButtons: TMsgDlgButtons; HelpCtx: Longint): Word; begin FSynchMsg := Msg; Index: JvMaskEdit.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvMaskEdit.pas,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** JvMaskEdit.pas 11 Aug 2005 07:20:12 -0000 1.47 --- JvMaskEdit.pas 14 Aug 2005 05:58:12 -0000 1.48 *************** *** 38,43 **** {$ENDIF UNITVERSIONING} Windows, Messages, ! SysUtils, Classes, Graphics, Controls, Mask, Forms, ! StdCtrls, JvComponent, JvTypes, JvCaret, JvToolEdit, JvExMask; --- 38,42 ---- {$ENDIF UNITVERSIONING} Windows, Messages, ! SysUtils, Classes, Graphics, Controls, Mask, Forms, StdCtrls, JvComponent, JvTypes, JvCaret, JvToolEdit, JvExMask; *************** *** 88,91 **** --- 87,91 ---- procedure NotifyIfChanged; procedure Change; override; + // (rom) not CLX compatible procedure WMPaint(var Msg: TWMPaint); message WM_PAINT; public *************** *** 467,479 **** case FAlignment of ! taLeftJustify: Params.Style := Params.Style or ES_LEFT; ! taRightJustify: Params.Style := Params.Style or ES_RIGHT; ! taCenter: Params.Style := Params.Style or ES_CENTER; end; case FScrollBars of ! ssHorizontal: Params.Style := Params.Style or WS_HSCROLL; ! ssVertical: Params.Style := Params.Style or WS_VSCROLL; ! ssBoth: Params.Style := Params.Style or WS_HSCROLL or WS_VSCROLL; end; --- 467,485 ---- case FAlignment of ! taLeftJustify: ! Params.Style := Params.Style or ES_LEFT; ! taRightJustify: ! Params.Style := Params.Style or ES_RIGHT; ! taCenter: ! Params.Style := Params.Style or ES_CENTER; end; case FScrollBars of ! ssHorizontal: ! Params.Style := Params.Style or WS_HSCROLL; ! ssVertical: ! Params.Style := Params.Style or WS_VSCROLL; ! ssBoth: ! Params.Style := Params.Style or WS_HSCROLL or WS_VSCROLL; end; Index: JvAppStorage.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvAppStorage.pas,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** JvAppStorage.pas 12 Aug 2005 14:09:07 -0000 1.89 --- JvAppStorage.pas 14 Aug 2005 05:58:12 -0000 1.90 *************** *** 407,413 **** // Do a Reload if the function ReloadNeeded returns true procedure ReloadIfNeeded; ! function ReloadNeeded : Boolean; virtual; procedure FlushIfNeeded; ! function FlushNeeded : Boolean; virtual; procedure BeginUpdate; procedure EndUpdate; --- 407,413 ---- // Do a Reload if the function ReloadNeeded returns true procedure ReloadIfNeeded; ! function ReloadNeeded: Boolean; virtual; procedure FlushIfNeeded; ! function FlushNeeded: Boolean; virtual; procedure BeginUpdate; procedure EndUpdate; *************** *** 800,815 **** property Location: TFileLocation read FLocation write SetLocation default flExeFile; ! property OnGetFileName: TJvAppStorageGetFileNameEvent ! read FOnGetFileName write SetOnGetFileName; ! // OnGetFileName triggered on Location = flCustom function GetPhysicalReadOnly: Boolean; override; - public constructor Create(AOwner: TComponent); override; procedure Reload; override; ! function ReloadNeeded : Boolean; override; ! property FullFileName: TFileName read GetFullFileName; --- 800,812 ---- property Location: TFileLocation read FLocation write SetLocation default flExeFile; ! // OnGetFileName triggered on Location = flCustom ! property OnGetFileName: TJvAppStorageGetFileNameEvent read FOnGetFileName write SetOnGetFileName; function GetPhysicalReadOnly: Boolean; override; public constructor Create(AOwner: TComponent); override; procedure Reload; override; ! function ReloadNeeded: Boolean; override; property FullFileName: TFileName read GetFullFileName; *************** *** 1170,1174 **** end; ! function TJvCustomAppStorage.ReloadNeeded : Boolean; begin Result := AutoReload and not IsUpdating; --- 1167,1171 ---- end; ! function TJvCustomAppStorage.ReloadNeeded: Boolean; begin Result := AutoReload and not IsUpdating; *************** *** 1181,1185 **** end; ! function TJvCustomAppStorage.FlushNeeded : Boolean; begin Result := AutoFlush and not IsUpdating; --- 1178,1182 ---- end; ! function TJvCustomAppStorage.FlushNeeded: Boolean; begin Result := AutoFlush and not IsUpdating; *************** *** 1198,1202 **** Data: PTypeData; begin ! Data := GetTypeData(Instance.ClassInfo); Result := Data.PropCount; end; --- 1195,1199 ---- Data: PTypeData; begin ! Data := GetTypeData(Instance.ClassInfo); Result := Data.PropCount; end; *************** *** 1294,1298 **** end; ! function TJvCustomAppStorage.DefaultObjectListItemCreateEvent(Sender: TJvCustomAppStorage; const Path: string; Index: Integer): TPersistent; var NewClassName: string; --- 1291,1296 ---- end; ! function TJvCustomAppStorage.DefaultObjectListItemCreateEvent(Sender: TJvCustomAppStorage; ! const Path: string; Index: Integer): TPersistent; var NewClassName: string; *************** *** 1303,1307 **** Result := Activator.CreateInstance(GetClass(NewClassName).ClassInfo) as TPersistent; {$ELSE} ! { TODO : Suspicial code: TPeristent has no virtual contructor } Result := GetClass(NewClassName).Create; {$ENDIF CLR} --- 1301,1305 ---- Result := Activator.CreateInstance(GetClass(NewClassName).ClassInfo) as TPersistent; {$ELSE} ! { TODO : Suspicious code: TPeristent has no virtual contructor } Result := GetClass(NewClassName).Create; {$ENDIF CLR} *************** *** 1315,1319 **** begin if List is TList then - begin try NewPath := ConcatPaths([Path, ItemName + IntToStr(Index)]); --- 1313,1316 ---- *************** *** 1323,1327 **** except end; - end; end; --- 1320,1323 ---- *************** *** 1352,1356 **** begin if List is TStrings then - begin try NewPath := ConcatPaths([Path, ItemName + IntToStr(Index)]); --- 1348,1351 ---- *************** *** 1365,1369 **** except end; - end; end; --- 1360,1363 ---- *************** *** 1405,1409 **** begin if List is TCollection then - begin try NewPath := ConcatPaths([Path, ItemName + IntToStr(Index)]); --- 1399,1402 ---- *************** *** 1416,1420 **** except end; - end; end; --- 1409,1412 ---- *************** *** 1758,1762 **** Result := StartsText(Name, cItem) and (Length(Name) > 4) and (Name[5] in DigitSymbols) else ! Result := StartsText(Name.Substring(NameStart), cItem) and (Length(Name) - NameStart > 4) and (Name[5] in DigitSymbols); end; {$ELSE} --- 1750,1755 ---- Result := StartsText(Name, cItem) and (Length(Name) > 4) and (Name[5] in DigitSymbols) else ! Result := StartsText(Name.Substring(NameStart), cItem) and ! (Length(Name) - NameStart > 4) and (Name[5] in DigitSymbols); end; {$ELSE} *************** *** 1990,1997 **** procedure TJvCustomAppStorage.WriteList(const Path: string; const List: TObject; ! const ItemCount: Integer; ! const OnWriteItem: TJvAppStorageListItemEvent; ! const OnDeleteItems: TJvAppStorageListDeleteEvent = nil; ! const ItemName: string = cItem); var TargetStore: TJvCustomAppStorage; --- 1983,1988 ---- procedure TJvCustomAppStorage.WriteList(const Path: string; const List: TObject; ! const ItemCount: Integer; const OnWriteItem: TJvAppStorageListItemEvent; ! const OnDeleteItems: TJvAppStorageListDeleteEvent = nil; const ItemName: string = cItem); var TargetStore: TJvCustomAppStorage; *************** *** 2020,2025 **** function TJvCustomAppStorage.ReadObjectList(const Path: string; List: TList; ItemCreator: TJvAppStorageObjectListItemCreateEvent; ! const ClearFirst: Boolean = True; ! const ItemName: string = cItem): Integer; var TargetStore: TJvCustomAppStorage; --- 2011,2015 ---- function TJvCustomAppStorage.ReadObjectList(const Path: string; List: TList; ItemCreator: TJvAppStorageObjectListItemCreateEvent; ! const ClearFirst: Boolean = True; const ItemName: string = cItem): Integer; var TargetStore: TJvCustomAppStorage; *************** *** 2027,2040 **** begin if not ListStored(Path) and StorageOptions.DefaultIfValueNotExists then begin ! Result := List.Count; ! exit; end; - if ClearFirst then - List.Clear; - ResolvePath(Path + cSubStorePath, TargetStore, TargetPath); // Only needed for assigning the event - TargetStore.FCurrentInstanceCreateEvent := ItemCreator; - Result := ReadList(Path, List, ReadObjectListItem, ItemName); - TargetStore.FCurrentInstanceCreateEvent := nil; end; --- 2017,2030 ---- begin if not ListStored(Path) and StorageOptions.DefaultIfValueNotExists then + Result := List.Count + else begin ! if ClearFirst then ! List.Clear; ! ResolvePath(Path + cSubStorePath, TargetStore, TargetPath); // Only needed for assigning the event ! TargetStore.FCurrentInstanceCreateEvent := ItemCreator; ! Result := ReadList(Path, List, ReadObjectListItem, ItemName); ! TargetStore.FCurrentInstanceCreateEvent := nil; end; end; *************** *** 2042,2047 **** const ItemName: string = cItem); begin ! WriteList(Path, List, List.Count, ! WriteObjectListItem, DeleteObjectListItem, ItemName); end; --- 2032,2036 ---- const ItemName: string = cItem); begin ! WriteList(Path, List, List.Count, WriteObjectListItem, DeleteObjectListItem, ItemName); end; *************** *** 2050,2065 **** begin if not ListStored(Path) and StorageOptions.DefaultIfValueNotExists then ! begin ! Result := List.Count; ! exit; ! end; ! try ! List.BeginUpdate; ! if ClearFirst then ! List.Clear; ! Result := ReadList(Path, List, ReadCollectionItem, ItemName); ! finally ! List.EndUpdate; ! end; end; --- 2039,2052 ---- begin if not ListStored(Path) and StorageOptions.DefaultIfValueNotExists then ! Result := List.Count ! else ! try ! List.BeginUpdate; ! if ClearFirst then ! List.Clear; ! Result := ReadList(Path, List, ReadCollectionItem, ItemName); ! finally ! List.EndUpdate; ! end; end; *************** *** 2067,2072 **** List: TCollection; const ItemName: string = cItem); begin ! WriteList(Path, List, List.Count, ! WriteCollectionItem, DeleteCollectionItem, ItemName); end; --- 2054,2058 ---- List: TCollection; const ItemName: string = cItem); begin ! WriteList(Path, List, List.Count, WriteCollectionItem, DeleteCollectionItem, ItemName); end; *************** *** 2075,2089 **** begin if not ListStored(Path) and StorageOptions.DefaultIfValueNotExists then begin ! Result := SL.Count; ! exit; ! end; ! SL.BeginUpdate; ! try ! if ClearFirst then ! SL.Clear; ! Result := ReadList(Path, SL, ReadStringListItem, ItemName); ! finally ! SL.EndUpdate; end; end; --- 2061,2075 ---- begin if not ListStored(Path) and StorageOptions.DefaultIfValueNotExists then + Result := SL.Count + else begin ! SL.BeginUpdate; ! try ! if ClearFirst then ! SL.Clear; ! Result := ReadList(Path, SL, ReadStringListItem, ItemName); ! finally ! SL.EndUpdate; ! end; end; end; *************** *** 2092,2097 **** const SL: TStrings; const ItemName: string = cItem); begin ! WriteList(Path, SL, SL.Count, ! WriteStringListItem, DeleteStringListItem, ItemName); end; --- 2078,2082 ---- const SL: TStrings; const ItemName: string = cItem); begin ! WriteList(Path, SL, SL.Count, WriteStringListItem, DeleteStringListItem, ItemName); end; *************** *** 2110,2130 **** begin if not ListStoredInt(Path) and StorageOptions.DefaultIfValueNotExists then begin ! Result := SL.Count; ! exit; ! end; ! SL.BeginUpdate; ! try ! ResolvePath(Path + cSubStorePath, TargetStore, TargetPath); ! Delete(TargetPath, Length(TargetPath) - 1, 2); ! if ClearFirst then ! SL.Clear; ! Result := TargetStore.ReadList(TargetPath, SL, TargetStore.ReadStringObjectListItem, ItemName); ! finally ! SL.EndUpdate; end; end; ! procedure TJvCustomAppStorage.WriteStringObjectList(const Path: string; const SL: TStrings; const ItemName: string = cItem); var TargetStore: TJvCustomAppStorage; --- 2095,2116 ---- begin if not ListStoredInt(Path) and StorageOptions.DefaultIfValueNotExists then + Result := SL.Count + else begin ! SL.BeginUpdate; ! try ! ResolvePath(Path + cSubStorePath, TargetStore, TargetPath); ! Delete(TargetPath, Length(TargetPath) - 1, 2); ! if ClearFirst then ! SL.Clear; ! Result := TargetStore.ReadList(TargetPath, SL, TargetStore.ReadStringObjectListItem, ItemName); ! finally ! SL.EndUpdate; ! end; end; end; ! procedure TJvCustomAppStorage.WriteStringObjectList(const Path: string; ! const SL: TStrings; const ItemName: string = cItem); var TargetStore: TJvCustomAppStorage; *************** *** 2133,2137 **** ResolvePath(Path + cSubStorePath, TargetStore, TargetPath); Delete(TargetPath, Length(TargetPath) - 1, 2); ! TargetStore.WriteList(TargetPath, SL, SL.Count, TargetStore.WriteStringObjectListItem, TargetStore.DeleteStringObjectListItem, ItemName); end; --- 2119,2124 ---- ResolvePath(Path + cSubStorePath, TargetStore, TargetPath); Delete(TargetPath, Length(TargetPath) - 1, 2); ! TargetStore.WriteList(TargetPath, SL, SL.Count, ! TargetStore.WriteStringObjectListItem, TargetStore.DeleteStringObjectListItem, ItemName); end; *************** *** 2341,2346 **** end; ! procedure TJvCustomAppStorage.WriteSetInt(const Path: string; ! ATypeInfo: PTypeInfo; const Value); var Lst: TStrings; --- 2328,2332 ---- end; ! procedure TJvCustomAppStorage.WriteSetInt(const Path: string; ATypeInfo: PTypeInfo; const Value); var Lst: TStrings; *************** *** 2391,2396 **** end; ! procedure TJvCustomAppStorage.ReadSet(const Path: string; ! ATypeInfo: PTypeInfo; const Default; out Value); var TargetStore: TJvCustomAppStorage; --- 2377,2381 ---- end; ! procedure TJvCustomAppStorage.ReadSet(const Path: string; ATypeInfo: PTypeInfo; const Default; out Value); var TargetStore: TJvCustomAppStorage; *************** *** 2401,2406 **** end; ! procedure TJvCustomAppStorage.WriteSet(const Path: string; ! ATypeInfo: PTypeInfo; const Value); var TargetStore: TJvCustomAppStorage; --- 2386,2390 ---- end; ! procedure TJvCustomAppStorage.WriteSet(const Path: string; ATypeInfo: PTypeInfo; const Value); var TargetStore: TJvCustomAppStorage; *************** *** 2419,2423 **** TmpValue: Integer; SubObj: TObject; ! P:PPropInfo; begin if not Assigned(PersObj) then --- 2403,2407 ---- TmpValue: Integer; SubObj: TObject; ! P: PPropInfo; begin if not Assigned(PersObj) then *************** *** 2587,2594 **** if not Assigned(PersObj) then Exit; ! if Supports(PersObj, IJvAppStorageHandler, JvAppStorageHandler)then JvAppStorageHandler.WriteToAppStorage(Self, Path); ! if not Supports(PersObj, IJvAppStorageHandler) or ! Supports(PersObj, IJvAppStoragePublishedProps) then for Index := 0 to GetPropCount(PersObj) - 1 do begin --- 2571,2577 ---- if not Assigned(PersObj) then Exit; ! if Supports(PersObj, IJvAppStorageHandler, JvAppStorageHandler) then JvAppStorageHandler.WriteToAppStorage(Self, Path); ! if not Supports(PersObj, IJvAppStorageHandler) or Supports(PersObj, IJvAppStoragePublishedProps) then for Index := 0 to GetPropCount(PersObj) - 1 do begin *************** *** 2837,2848 **** end; ! procedure TJvAppStorage.ReadSetInt(const Path: string; ! ATypeInfo: PTypeInfo; const Default; out Value); begin raise EJVCLAppStorageError.Create(RsEInvalidPath); end; ! procedure TJvAppStorage.WriteSetInt(const Path: string; ! ATypeInfo: PTypeInfo; const Value); begin raise EJVCLAppStorageError.Create(RsEInvalidPath); --- 2820,2829 ---- end; ! procedure TJvAppStorage.ReadSetInt(const Path: string; ATypeInfo: PTypeInfo; const Default; out Value); begin raise EJVCLAppStorageError.Create(RsEInvalidPath); end; ! procedure TJvAppStorage.WriteSetInt(const Path: string; ATypeInfo: PTypeInfo; const Value); begin raise EJVCLAppStorageError.Create(RsEInvalidPath); *************** *** 3085,3089 **** end; ! function TJvCustomAppMemoryFileStorage.ReloadNeeded : Boolean; begin Result := (not FFileLoaded or AutoReload) and not IsUpdating; --- 3066,3070 ---- end; ! function TJvCustomAppMemoryFileStorage.ReloadNeeded: Boolean; begin Result := (not FFileLoaded or AutoReload) and not IsUpdating; *************** *** 3203,3207 **** procedure TJvAppStoragePropertyBaseEngine.WriteProperty(AStorage: TJvCustomAppStorage; ! const APath: string; AObject: TObject; AProperty: TObject; const Recursive: Boolean); begin end; --- 3184,3188 ---- procedure TJvAppStoragePropertyBaseEngine.WriteProperty(AStorage: TJvCustomAppStorage; ! const APath: string; AObject: TObject; AProperty: TObject; const Recursive: Boolean); begin end; *************** *** 3245,3249 **** end; ! function TJvAppStoragePropertyEngineList.GetEngine(AObject: TObject; AProperty: TObject): TJvAppStoragePropertyBaseEngine; var Ind: Integer; --- 3226,3231 ---- end; ! function TJvAppStoragePropertyEngineList.GetEngine(AObject: TObject; ! AProperty: TObject): TJvAppStoragePropertyBaseEngine; var Ind: Integer; Index: JvLabel.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvLabel.pas,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** JvLabel.pas 12 Aug 2005 16:22:48 -0000 1.78 --- JvLabel.pas 14 Aug 2005 05:58:12 -0000 1.79 *************** *** 77,84 **** TAngleInfo = record ! TextWidth, TextHeight : Integer; ! TextGapWidth, TextGapHeight : Integer; ! TotalWidth, TotalHeight : Integer; ! PosX, PosY : Integer end; --- 77,88 ---- TAngleInfo = record ! TextWidth: Integer; ! TextHeight: Integer; ! TextGapWidth: Integer; ! TextGapHeight: Integer; ! TotalWidth: Integer; ! TotalHeight: Integer; ! PosX: Integer; ! PosY: Integer; end; *************** *** 145,152 **** {IJvHotTrack} //added by dejoy 2005-07-20 ! function GetHotTrack:Boolean; ! function GetHotTrackFont:TFont; ! function GetHotTrackFontOptions:TJvTrackFontOptions; ! function GetHotTrackOptions:TJvHotTrackOptions; procedure SetHotTrack(Value: Boolean); procedure SetHotTrackFont(Value: TFont); --- 149,156 ---- {IJvHotTrack} //added by dejoy 2005-07-20 ! function GetHotTrack: Boolean; ! function GetHotTrackFont: TFont; ! function GetHotTrackFontOptions: TJvTrackFontOptions; ! function GetHotTrackOptions: TJvHotTrackOptions; procedure SetHotTrack(Value: Boolean); procedure SetHotTrackFont(Value: TFont); *************** *** 154,159 **** procedure SetHotTrackOptions(Value: TJvHotTrackOptions); protected ! procedure DoDrawCaption(var Rect: TRect; Flags: Integer);virtual; ! procedure DoProviderDraw(var Rect: TRect; Flags: Integer);virtual; procedure FocusChanged(AControl: TWinControl); override; procedure TextChanged; override; --- 158,163 ---- procedure SetHotTrackOptions(Value: TJvHotTrackOptions); protected ! procedure DoDrawCaption(var Rect: TRect; Flags: Integer); virtual; ! procedure DoProviderDraw(var Rect: TRect; Flags: Integer); virtual; procedure FocusChanged(AControl: TWinControl); override; procedure TextChanged; override; *************** *** 164,168 **** procedure DoDrawText(var Rect: TRect; Flags: Integer); virtual; ! procedure AdjustBounds;virtual; {$IFDEF VCL} procedure SetAutoSize(Value: Boolean); override; --- 168,172 ---- procedure DoDrawText(var Rect: TRect; Flags: Integer); virtual; ! procedure AdjustBounds; virtual; {$IFDEF VCL} procedure SetAutoSize(Value: Boolean); override; *************** *** 234,239 **** property Canvas; property MouseOver; ! procedure SetBounds(ALeft: Integer; ATop: Integer; AWidth: Integer; ! AHeight: Integer); override; end; --- 238,242 ---- property Canvas; property MouseOver; ! procedure SetBounds(ALeft: Integer; ATop: Integer; AWidth: Integer; AHeight: Integer); override; end; *************** *** 310,317 **** procedure FrameRounded(Canvas: TCanvas; ARect: TRect; AColor: TColor; R: Integer); ! function CalculateAlignment(Alignment: TAlignment; Angle: integer; X, Y: Real; Info: TAngleInfo): TPoint; procedure CalculateAngleInfo(Canvas: TCanvas; Angle: Integer; Text: string; ! Rect: TRect; var Info: TAngleInfo; AutoSize: boolean = true; Alignment: TAlignment = taLeftJustify); --- 313,320 ---- procedure FrameRounded(Canvas: TCanvas; ARect: TRect; AColor: TColor; R: Integer); ! function CalculateAlignment(Alignment: TAlignment; Angle: Integer; X, Y: Real; Info: TAngleInfo): TPoint; procedure CalculateAngleInfo(Canvas: TCanvas; Angle: Integer; Text: string; ! Rect: TRect; var Info: TAngleInfo; AutoSize: Boolean = True; Alignment: TAlignment = taLeftJustify); *************** *** 338,411 **** //=== { TJvCustomLabel } ===================================================== ! function CalculateAlignment(Alignment: TAlignment; Angle: integer; X, Y: Real; Info: TAngleInfo) : TPoint; begin ! with Info do begin case Angle of 0..89: ! begin ! case Alignment of ! taLeftJustify : Result := Point(0, Round(Y + (TotalHeight - 2 * TextGapHeight) / 2)); ! taCenter : Result := Point(Round(X - TotalWidth / 2), Round(Y + (TotalHeight - 2 * TextGapHeight) / 2)); ! taRightJustify: Result := Point(Round(X * 2 - TotalWidth), Round(Y + (TotalHeight - 2 * TextGapHeight) / 2)); ! end; end; 90..179: ! begin ! case Alignment of ! taLeftJustify : Result := Point(TextWidth, Round(Y + TotalHeight / 2)); ! taCenter : Result := Point(Round(X + (TotalWidth - 2 * TextGapWidth) / 2), Round(Y + TotalHeight / 2)); ! taRightJustify: Result := Point(Round(X * 2 - TextGapWidth), Round(Y + TotalHeight / 2)); ! end; end; 180..269: ! begin ! case Alignment of ! taLeftJustify : Result := Point(TotalWidth, Round(Y - (TotalHeight - 2 * TextGapHeight) / 2)); ! taCenter : Result := Point(Round(X + TotalWidth / 2), Round(Y - (TotalHeight - 2 * TextGapHeight) / 2)); ! taRightJustify: Result := Point(Round(X * 2), Round(Y - (TotalHeight - 2 * TextGapHeight) / 2)); ! end; end; ! else begin case Alignment of ! taLeftJustify : Result := Point(TextGapWidth, Round(Y - TotalHeight / 2)); ! taCenter : Result := Point(Round(X - (TotalWidth - 2 * TextGapWidth) / 2), Round(Y - TotalHeight / 2)); ! taRightJustify: Result := Point(Round(X * 2 - TextWidth), Round(Y - TotalHeight / 2)); end; - end; end; - end; end; procedure CalculateAngleInfo(Canvas: TCanvas; Angle: Integer; Text: string; ! Rect: TRect; var Info: TAngleInfo; AutoSize: boolean = true; Alignment: TAlignment = taLeftJustify); var ! TxtWdt, TxtHgt : Extended; ! angB, X, Y : Real; Origin: TPoint; begin // Calculate intermediate values case Angle of ! 0..89 : angB := DegToRad(90 - Angle); ! 90..179 : angB := DegToRad(Angle - 90); ! 180..269: angB := DegToRad(270 - Angle); else {270..359} ! angB := DegToRad(Angle - 270); end; ! with Canvas do begin ! TxtWdt := TextWidth (Text); TxtHgt := TextHeight(Text); end; ! with Info do begin ! TextWidth := Round(sin(angB) * TxtWdt); ! TextGapWidth := Round(cos(angB) * TxtHgt); ! TextHeight := Round(cos(angB) * TxtWdt); ! TextGapHeight := Round(sin(angB) * TxtHgt); // Calculate new sizes of component ! TotalWidth := (TextWidth + TextGapWidth); ! TotalHeight := (TextHeight + TextGapHeight); end; // Calculate draw position of text ! with Rect do begin X := (Right - Left) / 2; Y := (Bottom - Top) / 2; --- 341,424 ---- //=== { TJvCustomLabel } ===================================================== ! function CalculateAlignment(Alignment: TAlignment; Angle: Integer; X, Y: Real; Info: TAngleInfo) : TPoint; begin ! with Info do case Angle of 0..89: ! case Alignment of ! taLeftJustify : ! Result := Point(0, Round(Y + (TotalHeight - 2 * TextGapHeight) / 2)); ! taCenter: ! Result := Point(Round(X - TotalWidth / 2), Round(Y + (TotalHeight - 2 * TextGapHeight) / 2)); ! taRightJustify: ! Result := Point(Round(X * 2 - TotalWidth), Round(Y + (TotalHeight - 2 * TextGapHeight) / 2)); end; 90..179: ! case Alignment of ! taLeftJustify: ! Result := Point(TextWidth, Round(Y + TotalHeight / 2)); ! taCenter: ! Result := Point(Round(X + (TotalWidth - 2 * TextGapWidth) / 2), Round(Y + TotalHeight / 2)); ! taRightJustify: ! Result := Point(Round(X * 2 - TextGapWidth), Round(Y + TotalHeight / 2)); end; 180..269: ! case Alignment of ! taLeftJustify: ! Result := Point(TotalWidth, Round(Y - (TotalHeight - 2 * TextGapHeight) / 2)); ! taCenter: ! Result := Point(Round(X + TotalWidth / 2), Round(Y - (TotalHeight - 2 * TextGapHeight) / 2)); ! taRightJustify: ! Result := Point(Round(X * 2), Round(Y - (TotalHeight - 2 * TextGapHeight) / 2)); end; ! else case Alignment of ! taLeftJustify: ! Result := Point(TextGapWidth, Round(Y - TotalHeight / 2)); ! taCenter: ! Result := Point(Round(X - (TotalWidth - 2 * TextGapWidth) / 2), Round(Y - TotalHeight / 2)); ! taRightJustify: ! Result := Point(Round(X * 2 - TextWidth), Round(Y - TotalHeight / 2)); end; end; end; procedure CalculateAngleInfo(Canvas: TCanvas; Angle: Integer; Text: string; ! Rect: TRect; var Info: TAngleInfo; AutoSize: Boolean = True; Alignment: TAlignment = taLeftJustify); var ! TxtWdt, TxtHgt: Extended; ! AngleB, X, Y: Real; Origin: TPoint; begin // Calculate intermediate values case Angle of ! 0..89: ! AngleB := DegToRad(90 - Angle); ! 90..179: ! AngleB := DegToRad(Angle - 90); ! 180..269: ! AngleB := DegToRad(270 - Angle); else {270..359} ! AngleB := DegToRad(Angle - 270); end; ! with Canvas do ! begin ! TxtWdt := TextWidth(Text); TxtHgt := TextHeight(Text); end; ! with Info do ! begin ! TextWidth := Round(Sin(AngleB) * TxtWdt); ! TextGapWidth := Round(Cos(AngleB) * TxtHgt); ! TextHeight := Round(Cos(AngleB) * TxtWdt); ! TextGapHeight := Round(Sin(AngleB) * TxtHgt); // Calculate new sizes of component ! TotalWidth := (TextWidth + TextGapWidth); ! TotalHeight := (TextHeight + TextGapHeight); end; // Calculate draw position of text ! with Rect do ! begin X := (Right - Left) / 2; Y := (Bottom - Top) / 2; *************** *** 432,442 **** Info.posY := Info.TextGapHeight; end; ! else begin{270..359} ! Info.PosX := Info.TextGapWidth; ! Info.PosY := 0; ! end; end; end ! else begin Info.PosX := Origin.X; Info.PosY := Origin.Y; --- 445,455 ---- Info.posY := Info.TextGapHeight; end; ! else{270..359} ! Info.PosX := Info.TextGapWidth; ! Info.PosY := 0; end; end ! else ! begin Info.PosX := Origin.X; Info.PosY := Origin.Y; *************** *** 570,574 **** else Canvas.Font := Font; ! if (Flags and DT_CALCRECT <> 0) then begin if ItemsRenderer <> nil then --- 583,587 ---- else Canvas.Font := Font; ! if (Flags and DT_CALCRECT) <> 0 then begin if ItemsRenderer <> nil then *************** *** 688,692 **** TextX, TextY, ShadowX, ShadowY: Integer; Angle10: Integer; ! w, h: Integer; Info: TAngleInfo; CalcRect: Boolean; --- 701,705 ---- TextX, TextY, ShadowX, ShadowY: Integer; Angle10: Integer; ! W, H: Integer; Info: TAngleInfo; CalcRect: Boolean; *************** *** 718,723 **** CalculateAngleInfo(Canvas, Angle, Text, ClientRect, Info, AutoSize, Alignment); ! w := Info.TotalWidth; ! h := Info.TotalHeight; TextX := Info.posX; TextY := Info.posY; --- 731,736 ---- CalculateAngleInfo(Canvas, Angle, Text, ClientRect, Info, AutoSize, Alignment); ! W := Info.TotalWidth; ! H := Info.TotalHeight; TextX := Info.posX; TextY := Info.posY; *************** *** 725,730 **** if CalcRect then begin ! Rect.Right := Rect.Left + w; ! Rect.Bottom := Rect.Top + h; if HasImage then Inc(Rect.Right, Images.Width); --- 738,743 ---- if CalcRect then begin ! Rect.Right := Rect.Left + W; ! Rect.Bottom := Rect.Top + H; if HasImage then Inc(Rect.Right, Images.Width); *************** *** 737,743 **** begin case Alignment of ! taLeftJustify : Inc(TextX, Images.Width); ! taCenter : Inc(TextX, Images.Width div 2); ! taRightJustify: Inc(TextX, 0); end; end; --- 750,759 ---- begin case Alignment of ! taLeftJustify: ! Inc(TextX, Images.Width); ! taCenter: ! Inc(TextX, Images.Width div 2); ! taRightJustify: ! Inc(TextX, 0); end; end; *************** *** 798,808 **** TextX, TextY: Integer; Phi: Real; ! w, h: Integer; CalcRect: Boolean; begin CalcRect := (Flags and DT_CALCRECT <> 0); StrLCopy(@Text, PChar(GetLabelCaption), SizeOf(Text) - 1); ! if CalcRect and ((Text[0] = #0) or ShowAccelChar and ! (Text[0] = '&') and (Text[1] = #0)) then StrCopy(Text, ' '); --- 814,823 ---- TextX, TextY: Integer; Phi: Real; ! W, H: Integer; CalcRect: Boolean; begin CalcRect := (Flags and DT_CALCRECT <> 0); StrLCopy(@Text, PChar(GetLabelCaption), SizeOf(Text) - 1); ! if CalcRect and ((Text[0] = #0) or ShowAccelChar and (Text[0] = '&') and (Text[1] = #0)) then StrCopy(Text, ' '); *************** *** 814,828 **** if not AutoSize then begin ! w := Rect.Right - Rect.Left; ! h := Rect.Bottom - Rect.Top; ! TextX := Trunc(0.5 * w - 0.5 * Canvas.TextWidth(Text) * Cos(Phi) - 0.5 * Canvas.TextHeight(Text) * Sin(Phi)); ! TextY := Trunc(0.5 * h - 0.5 * Canvas.TextHeight(Text) * Cos(Phi) + 0.5 * Canvas.TextWidth(Text) * Sin(Phi)); end else begin ! w := 4 + Trunc(Canvas.TextWidth(Text) * Abs(Cos(Phi)) + Canvas.TextHeight(Text) * Abs(Sin(Phi))); ! h := 4 + Trunc(Canvas.TextHeight(Text) * Abs(Cos(Phi)) + Canvas.TextWidth(Text) * Abs(Sin(Phi))); TextX := 3; TextY := 3; --- 829,843 ---- if not AutoSize then begin ! W := Rect.Right - Rect.Left; ! H := Rect.Bottom - Rect.Top; ! TextX := Trunc(0.5 * W - 0.5 * Canvas.TextWidth(Text) * Cos(Phi) - 0.5 * Canvas.TextHeight(Text) * Sin(Phi)); ! TextY := Trunc(0.5 * H - 0.5 * Canvas.TextHeight(Text) * Cos(Phi) + 0.5 * Canvas.TextWidth(Text) * Sin(Phi)); end else begin ! W := 4 + Trunc(Canvas.TextWidth(Text) * Abs(Cos(Phi)) + Canvas.TextHeight(Text) * Abs(Sin(Phi))); ! H := 4 + Trunc(Canvas.TextHeight(Text) * Abs(Cos(Phi)) + Canvas.TextWidth(Text) * Abs(Sin(Phi))); TextX := 3; TextY := 3; *************** *** 850,855 **** if CalcRect then begin ! Rect.Right := Rect.Left + w; ! Rect.Bottom := Rect.Top + h; if HasImage then Inc(Rect.Right, Images.Width); --- 865,870 ---- if CalcRect then begin ! Rect.Right := Rect.Left + W; ! Rect.Bottom := Rect.Top + H; if HasImage then Inc(Rect.Right, Images.Width); *************** *** 920,926 **** end else - begin Canvas.FillRect(Rect); - end; end; end --- 935,939 ---- *************** *** 1239,1255 **** {$IFDEF VCL} KeyPressed(VK_LBUTTON) ! {$IFDEF COMPILER6_UP} or Mouse.IsDragging {$ENDIF COMPILER6_UP} ! {$ENDIF VCL} ! {$IFDEF VisualCLX} DragActivated ! {$ENDIF VisualCLX} ; ! MouseOver := Enabled and not OtherDragging and ! (FindDragTarget(Mouse.CursorPos, True) = Self) and ! IsForegroundTask; ! if (MouseOver <> OldValue) then Invalidate; end; --- 1252,1267 ---- {$IFDEF VCL} KeyPressed(VK_LBUTTON) ! {$IFDEF COMPILER6_UP} or Mouse.IsDragging {$ENDIF COMPILER6_UP} ! {$ENDIF VCL} ! {$IFDEF VisualCLX} DragActivated ! {$ENDIF VisualCLX} ; ! MouseOver := Enabled and not OtherDragging and ! (FindDragTarget(Mouse.CursorPos, True) = Self) and IsForegroundTask; ! if MouseOver <> OldValue then Invalidate; end; *************** *** 1310,1331 **** Exit; ! if IsForegroundTask then MouseCapture := True; //Capture for MouseUp event ! if not MouseOver and Enabled and IsForegroundTask then begin OtherDragging := {$IFDEF VCL} KeyPressed(VK_LBUTTON) ! {$IFDEF COMPILER6_UP} ! or Mouse.IsDragging {$ENDIF COMPILER6_UP} ! {$ENDIF VCL} ! {$IFDEF VisualCLX} DragActivated ! {$ENDIF VisualCLX} ; ! NeedRepaint := not Transparent and ! ({$IFDEF JVCLThemesEnabled} ThemeServices.ThemesEnabled or {$ENDIF JVCLThemesEnabled} --- 1322,1344 ---- Exit; ! if IsForegroundTask then MouseCapture := True; //Capture for MouseUp event ! if not MouseOver and Enabled and IsForegroundTask then begin OtherDragging := {$IFDEF VCL} KeyPressed(VK_LBUTTON) ! {$IFDEF COMPILER6_UP} ! or Mouse.IsDragging {$ENDIF COMPILER6_UP} ! {$ENDIF VCL} ! {$IFDEF VisualCLX} DragActivated ! {$ENDIF VisualCLX} ; ! NeedRepaint := not Transparent and ! ( ! {$IFDEF JVCLThemesEnabled} ThemeServices.ThemesEnabled or {$ENDIF JVCLThemesEnabled} *************** *** 1335,1341 **** if NeedRepaint then - begin Invalidate; - end; end; end; --- 1348,1352 ---- *************** *** 1344,1348 **** var NeedRepaint: Boolean; ! OtherDragging:Boolean; begin if csDesigning in ComponentState then --- 1355,1359 ---- var NeedRepaint: Boolean; ! OtherDragging: Boolean; begin if csDesigning in ComponentState then *************** *** 1354,1368 **** {$IFDEF VCL} KeyPressed(VK_LBUTTON) ! {$IFDEF COMPILER6_UP} ! or Mouse.IsDragging {$ENDIF COMPILER6_UP} ! {$ENDIF VCL} ! {$IFDEF VisualCLX} DragActivated ! {$ENDIF VisualCLX} ; ! NeedRepaint := not Transparent and ! ({$IFDEF JVCLThemesEnabled} ThemeServices.ThemesEnabled or {$ENDIF JVCLThemesEnabled} --- 1365,1380 ---- {$IFDEF VCL} KeyPressed(VK_LBUTTON) ! {$IFDEF COMPILER6_UP} ! or Mouse.IsDragging {$ENDIF COMPILER6_UP} ! {$ENDIF VCL} ! {$IFDEF VisualCLX} DragActivated ! {$ENDIF VisualCLX} ; ! NeedRepaint := not Transparent and ! ( ! {$IFDEF JVCLThemesEnabled} ThemeServices.ThemesEnabled or {$ENDIF JVCLThemesEnabled} *************** *** 1372,1378 **** if NeedRepaint then - begin Invalidate; - end; end; end; --- 1384,1388 ---- *************** *** 1552,1559 **** procedure TJvCustomLabel.SetHotTrack(Value: Boolean); begin ! if FHotTrack <> Value then ! begin ! FHotTrack := Value; ! end; end; --- 1562,1566 ---- procedure TJvCustomLabel.SetHotTrack(Value: Boolean); begin ! FHotTrack := Value; end; *************** *** 1591,1595 **** begin if FRoundedFrame <> Value then - begin if (Value < Height div 2) and (Value >= 0) then begin --- 1598,1601 ---- *************** *** 1597,1601 **** Invalidate; end; - end; end; --- 1603,1606 ---- *************** *** 1608,1622 **** Dec(Right); Dec(Bottom); ! Polygon([ ! Point(Left + R, Top), ! Point(Right - R, Top), ! Point(Right, Top + R), ! Point(Right, Bottom - R), ! Point(Right - R, Bottom), ! Point(Left + R, Bottom), ! Point(Left, Bottom - R), ! Point(Left, Top + R), ! Point(Left + R, Top) ! ]); Inc(Right); Inc(Bottom); --- 1613,1626 ---- Dec(Right); Dec(Bottom); ! Polygon( ! [Point(Left + R, Top), ! Point(Right - R, Top), ! Point(Right, Top + R), ! Point(Right, Bottom - R), ! Point(Right - R, Bottom), ! Point(Left + R, Bottom), ! Point(Left, Bottom - R), ! Point(Left, Top + R), ! Point(Left + R, Top)]); Inc(Right); Inc(Bottom); Index: JvXPBar.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvXPBar.pas,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** JvXPBar.pas 9 Aug 2005 09:59:31 -0000 1.92 --- JvXPBar.pas 14 Aug 2005 05:58:12 -0000 1.93 *************** *** 61,65 **** // "OUT THERE" have been updated, this should be removed // from the code. ! //{ $ define XP_TRANSPARENCY_FIX} interface --- 61,65 ---- // "OUT THERE" have been updated, this should be removed // from the code. ! //{ $ DEFINE XP_TRANSPARENCY_FIX} interface *************** *** 240,244 **** property Action: TBasicAction read GetAction write SetAction; {$IFDEF VCL} ! property AutoCheck: Boolean read FAutoCheck write FAutoCheck {$IFDEF COMPILER6_UP} stored IsAutoCheckStored {$ENDIF} default False; {$ENDIF VCL} property Caption: TCaption read FCaption write SetCaption stored IsCaptionStored; --- 240,245 ---- property Action: TBasicAction read GetAction write SetAction; {$IFDEF VCL} ! property AutoCheck: Boolean read FAutoCheck write FAutoCheck ! {$IFDEF COMPILER6_UP} stored IsAutoCheckStored {$ENDIF} default False; {$ENDIF VCL} property Caption: TCaption read FCaption write SetCaption stored IsCaptionStored; *************** *** 336,341 **** property CheckedColor: TColor read FCheckedColor write SetCheckedColor default dxColor_CheckedColorXP; property FocusedColor: TColor read FFocusedColor write SetFocusedColor default dxColor_FocusedColorXP; ! property CheckedFrameColor: TColor read FCheckedFrameColor write SetCheckedFrameColor default dxColor_CheckedFrameColorXP; ! property FocusedFrameColor: TColor read FFocusedFrameColor write SetFocusedFrameColor default dxColor_FocusedFrameColorXP; property BodyColor: TColor read FBodyColor write SetBodyColor default dxColor_BodyColorXP; property BodyBorderColor: TColor read FBodyBorderColor write SetBodyBorderColor default dxColor_BodyColorXP; --- 337,344 ---- property CheckedColor: TColor read FCheckedColor write SetCheckedColor default dxColor_CheckedColorXP; property FocusedColor: TColor read FFocusedColor write SetFocusedColor default dxColor_FocusedColorXP; ! property CheckedFrameColor: TColor read FCheckedFrameColor write SetCheckedFrameColor ! default dxColor_CheckedFrameColorXP; ! property FocusedFrameColor: TColor read FFocusedFrameColor write SetFocusedFrameColor ! default dxColor_FocusedFrameColorXP; property BodyColor: TColor read FBodyColor write SetBodyColor default dxColor_BodyColorXP; property BodyBorderColor: TColor read FBodyBorderColor write SetBodyBorderColor default dxColor_BodyColorXP; *************** *** 423,428 **** {$ENDIF VCL} {$IFDEF VisualCLX} ! function WantKey(Key: Integer; Shift: TShiftState; ! const KeyText: WideString): Boolean; override; {$ENDIF VisualCLX} class function GetBarItemsClass: TJvXPBarItemsClass; virtual; --- 426,430 ---- {$ENDIF VCL} {$IFDEF VisualCLX} ! function WantKey(Key: Integer; Shift: TShiftState; const KeyText: WideString): Boolean; override; {$ENDIF VisualCLX} class function GetBarItemsClass: TJvXPBarItemsClass; virtual; *************** *** 469,477 **** property RoundedItemFrame: Integer read FRoundedItemFrame write FRoundedItemFrame default 1; //DS property TopSpace: Integer read FTopSpace write SetTopSpace default 5; ! // (rom) this name is not acceptable. Prefix with "On" ! property AfterCollapsedChange: TJvXPBarOnCollapsedChangeEvent read FAfterCollapsedChange write ! FAfterCollapsedChange; ! property BeforeCollapsedChange: TJvXPBarOnCollapsedChangeEvent read FBeforeCollapsedChange write ! FBeforeCollapsedChange; property OnCollapsedChange: TJvXPBarOnCollapsedChangeEvent read FOnCollapsedChange write FOnCollapsedChange; property OnCanChange: TJvXPBarOnCanChangeEvent read FOnCanChange write FOnCanChange; --- 471,478 ---- property RoundedItemFrame: Integer read FRoundedItemFrame write FRoundedItemFrame default 1; //DS property TopSpace: Integer read FTopSpace write SetTopSpace default 5; ! property AfterCollapsedChange: TJvXPBarOnCollapsedChangeEvent read FAfterCollapsedChange ! write FAfterCollapsedChange; ! property BeforeCollapsedChange: TJvXPBarOnCollapsedChangeEvent read FBeforeCollapsedChange ! write FBeforeCollapsedChange; property OnCollapsedChange: TJvXPBarOnCollapsedChangeEvent read FOnCollapsedChange write FOnCollapsedChange; property OnCanChange: TJvXPBarOnCanChangeEvent read FOnCanChange write FOnCanChange; *************** *** 652,656 **** end; ! {$ifdef XP_TRANSPARENCY_FIX} { BitmapBgPaint: --- 653,657 ---- end; ! {$IFDEF XP_TRANSPARENCY_FIX} { BitmapBgPaint: *************** *** 662,680 **** -WPostma. } ! procedu... [truncated message content] |