Menu
▾
▴
[JVCL-Checkins] dev/JVCL3/qrun JvQAlarms.pas,1.3,1.4 JvQChart.pas,1.17,1.18 JvQComputerInfoEx.pas,1.2,1.3 JvQExControls.pas,1.28,1.29 JvQFormPlacement.pas,1.7,1.8 JvQInspector.pas,1.14,1.15 JvQLinkLabel.pas,1.9,1.10 JvQLinkLabelTree.pas,1.3,1.4 JvQLinkedControls.pas,1.3,1.4 JvQParameterList.pas,1.6,1.7 JvQParameterListParameter.pas,1.6,1.7 JvQStringHolder.pas,1.3,1.4 JvQTimeLine.pas,1.5,1.6 JvQTimerList.pas,1.5,1.6 JvQTypes.pas,1.8,1.9 JvQUrlListGrabber.pas,1.7,1.8 JvQWinampLabel.pas,1.13,1.14 JvQXPBar.pas,1.14,1.15 - Regenerated
Update of /cvsroot/jvcl/dev/JVCL3/qrun In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32424/JVCL3/qrun Modified Files: JvQAlarms.pas JvQChart.pas JvQComputerInfoEx.pas JvQExControls.pas JvQFormPlacement.pas JvQInspector.pas JvQLinkLabel.pas JvQLinkLabelTree.pas JvQLinkedControls.pas JvQParameterList.pas JvQParameterListParameter.pas JvQStringHolder.pas JvQTimeLine.pas JvQTimerList.pas JvQTypes.pas JvQUrlListGrabber.pas JvQWinampLabel.pas JvQXPBar.pas Log Message: Regenerated Index: JvQStringHolder.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQStringHolder.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvQStringHolder.pas 26 Mar 2004 15:32:46 -0000 1.3 --- JvQStringHolder.pas 19 May 2004 20:53:12 -0000 1.4 *************** *** 281,285 **** procedure TJvMacro.Assign(Source: TPersistent); begin ! if (Source is TJvMacro) and (Source <> nil) then begin if VarIsEmpty(TJvMacro(Source).FData) then --- 281,285 ---- procedure TJvMacro.Assign(Source: TPersistent); begin ! if Source is TJvMacro then begin if VarIsEmpty(TJvMacro(Source).FData) then *************** *** 288,292 **** --- 288,294 ---- Value := TJvMacro(Source).FData; Name := TJvMacro(Source).Name; + Exit; end; + inherited Assign(Source); end; *************** *** 303,307 **** if (Value <> '') and (AnsiCompareText(Value, FName) <> 0) and (Collection is TJvMacros) and (TJvMacros(Collection).IndexOf(Value) >= 0) then ! raise EJVCLException.Create(SDuplicateString); FName := Value; inherited SetDisplayName(Value); --- 305,309 ---- if (Value <> '') and (AnsiCompareText(Value, FName) <> 0) and (Collection is TJvMacros) and (TJvMacros(Collection).IndexOf(Value) >= 0) then ! raise EJVCLException.CreateRes(@SDuplicateString); FName := Value; inherited SetDisplayName(Value); *************** *** 415,419 **** Result := FindMacro(Value); if Result = nil then ! raise EJVCLException.Create(SInvalidPropertyValue); end; --- 417,421 ---- Result := FindMacro(Value); if Result = nil then ! raise EJVCLException.CreateRes(@SInvalidPropertyValue); end; Index: JvQTypes.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQTypes.pas,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JvQTypes.pas 14 May 2004 22:45:25 -0000 1.8 --- JvQTypes.pas 19 May 2004 20:53:12 -0000 1.9 *************** *** 459,470 **** destructor Destroy; override; procedure Assign(Source: TPersistent); override; ! ! property TopLeft : TJvPoint read FTopLeft write SetTopLeft; ! property BottomRight: TJvPoint read FBottomRight write SetBottomRight; ! property OnChange : TNotifyEvent read FOnChange write FOnChange; published ! property Left : Integer read GetLeft write SetLeft; ! property Top : Integer read GetTop write SetTop; ! property Right : Integer read GetRight write SetRight; property Bottom: Integer read GetBottom write SetBottom; end; --- 459,469 ---- destructor Destroy; override; procedure Assign(Source: TPersistent); override; ! property TopLeft: TJvPoint read FTopLeft write SetTopLeft; ! property BottomRight: TJvPoint read FBottomRight write SetBottomRight; ! property OnChange: TNotifyEvent read FOnChange write FOnChange; published ! property Left: Integer read GetLeft write SetLeft; ! property Top: Integer read GetTop write SetTop; ! property Right: Integer read GetRight write SetRight; property Bottom: Integer read GetBottom write SetBottom; end; *************** *** 472,475 **** --- 471,476 ---- implementation + //=== TJvPersistent ========================================================== + constructor TJvPersistent.Create(AOwner: TComponent); *************** *** 482,506 **** ! { TJvRect } ! ! procedure TJvRect.Assign(Source: TPersistent); ! begin ! if Source is TJvRect then ! begin ! TopLeft := (Source as TJvRect).TopLeft; ! BottomRight := (Source as TJvRect).BottomRight; ! DoChange; ! end ! else ! inherited Assign(Source); ! end; constructor TJvRect.Create; begin inherited Create; ! FTopLeft := TJvPoint.Create; FBottomRight := TJvPoint.Create; ! ! FTopLeft.OnChange := PointChange; FBottomRight.OnChange := PointChange; end; --- 483,494 ---- ! //=== TJvRect ================================================================ constructor TJvRect.Create; begin inherited Create; ! FTopLeft := TJvPoint.Create; FBottomRight := TJvPoint.Create; ! FTopLeft.OnChange := PointChange; FBottomRight.OnChange := PointChange; end; *************** *** 513,516 **** --- 501,516 ---- end; + procedure TJvRect.Assign(Source: TPersistent); + begin + if Source is TJvRect then + begin + TopLeft := (Source as TJvRect).TopLeft; + BottomRight := (Source as TJvRect).BottomRight; + DoChange; + end + else + inherited Assign(Source); + end; + procedure TJvRect.DoChange; begin *************** *** 574,578 **** end; ! { TJvPoint } procedure TJvPoint.Assign(Source: TPersistent); --- 574,578 ---- end; ! //=== TJvPoint =============================================================== procedure TJvPoint.Assign(Source: TPersistent); *************** *** 585,589 **** end else ! inherited; end; --- 585,589 ---- end else ! inherited Assign(Source); end; Index: JvQTimerList.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQTimerList.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JvQTimerList.pas 18 May 2004 14:21:12 -0000 1.5 --- JvQTimerList.pas 19 May 2004 20:53:12 -0000 1.6 *************** *** 259,272 **** procedure TJvTimerEvent.Assign(Source: TPersistent); begin ! if (Source is TJvTimerEvent) and (Source <> Self) then begin ! Cycled := TJvTimerEvent(Source).Cycled; ! Enabled := TJvTimerEvent(Source).Enabled; ! Interval := TJvTimerEvent(Source).Interval; ! Name := TJvTimerEvent(Source).Name; ! RepeatCount := TJvTimerEvent(Source).RepeatCount; ! Exit; ! end; ! inherited; end; --- 259,275 ---- procedure TJvTimerEvent.Assign(Source: TPersistent); begin ! if Source is TJvTimerEvent then begin ! if Source <> Self then ! begin ! Cycled := TJvTimerEvent(Source).Cycled; ! Enabled := TJvTimerEvent(Source).Enabled; ! Interval := TJvTimerEvent(Source).Interval; ! Name := TJvTimerEvent(Source).Name; ! RepeatCount := TJvTimerEvent(Source).RepeatCount; ! end; ! end ! else ! inherited Assign(Source); end; *************** *** 462,468 **** for I := 0 to TJvTimerEvents(Source).Count - 1 do Add.Assign(TJvTimerEvents(Source).Items[I]); ! Exit; ! end; ! inherited Assign(Source); end; --- 465,471 ---- for I := 0 to TJvTimerEvents(Source).Count - 1 do Add.Assign(TJvTimerEvents(Source).Items[I]); ! end ! else ! inherited Assign(Source); end; Index: JvQExControls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQExControls.pas,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** JvQExControls.pas 18 May 2004 14:21:10 -0000 1.28 --- JvQExControls.pas 19 May 2004 20:53:12 -0000 1.29 *************** *** 303,307 **** FMouseOver: Boolean; FOnParentColorChanged: TNotifyEvent; ! FOnMouseEnter: TNotifyEvent; FOnMouseLeave: TNotifyEvent; --- 303,307 ---- FMouseOver: Boolean; FOnParentColorChanged: TNotifyEvent; ! FOnMouseEnter: TNotifyEvent; FOnMouseLeave: TNotifyEvent; *************** *** 309,313 **** property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter; property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave; ! protected procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; --- 309,313 ---- property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter; property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave; ! protected procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; *************** *** 317,332 **** property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; private ! ! FAboutJVCLX: TJVCLAboutInfo; published property AboutJVCLX: TJVCLAboutInfo read FAboutJVCLX write FAboutJVCLX stored False; ! ! public constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! private FText: TCaption; // TControl does not save the Caption property protected --- 317,332 ---- property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; private ! ! FAboutJVCLX: TJVCLAboutInfo; published property AboutJVCLX: TJVCLAboutInfo read FAboutJVCLX write FAboutJVCLX stored False; ! public constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! private + FColor: TColor; FText: TCaption; // TControl does not save the Caption property protected *************** *** 334,345 **** procedure SetText(const Value: TCaption); override; procedure PaintRequest; override; ! end; TJvExPubGraphicControl = class(TJvExGraphicControl) ! end; - ! TJvExCustomControl = class(TCustomControl, IJvWinControlEvents, IJvCustomControlEvents, IJvControlEvents, IPerformControl) --- 334,348 ---- procedure SetText(const Value: TCaption); override; procedure PaintRequest; override; ! function GetColor: TColor; ! procedure SetColor(const Value: TColor); ! published ! property Color: TColor read GetColor write SetColor; end; TJvExPubGraphicControl = class(TJvExGraphicControl) ! end; ! ! TJvExCustomControl = class(TCustomControl, IJvWinControlEvents, IJvCustomControlEvents, IJvControlEvents, IPerformControl) *************** *** 1231,1234 **** --- 1234,1251 ---- end; + function TJvExGraphicControl.GetColor: TColor; + begin + Result := FColor; + end; + + procedure TJvExGraphicControl.SetColor(const Value: TColor); + begin + if Value <> FColor then + begin + FColor := Value; + inherited Color := value; + end; + end; + procedure TJvExGraphicControl.PaintRequest; begin *************** *** 1344,1348 **** procedure TJvExCustomControl.SetDoubleBuffered(Value: Boolean); begin ! if Value <> FDoubleBuffered then begin if Value then --- 1361,1365 ---- procedure TJvExCustomControl.SetDoubleBuffered(Value: Boolean); begin ! if Value <> FDoubleBuffered and Assigned(handle) then begin if Value then Index: JvQAlarms.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQAlarms.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvQAlarms.pas 31 Mar 2004 07:43:11 -0000 1.3 --- JvQAlarms.pas 19 May 2004 20:53:11 -0000 1.4 *************** *** 289,292 **** --- 289,293 ---- Time := TJvAlarmItem(Source).Time; Kind := TJvAlarmItem(Source).Kind; + Exit; end; // (rom) is this correct or should there be an else here? Index: JvQInspector.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQInspector.pas,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** JvQInspector.pas 15 May 2004 16:41:55 -0000 1.14 --- JvQInspector.pas 19 May 2004 20:53:12 -0000 1.15 *************** *** 5287,5291 **** TOpenEdit(EditCtrl).OnChange := nil; try ! EditCtrl.Text := DisplayValue; finally TOpenEdit(EditCtrl).OnChange := TmpOnChange; --- 5287,5294 ---- TOpenEdit(EditCtrl).OnChange := nil; try ! if Data.IsAssigned then ! EditCtrl.Text := DisplayValue ! else ! EditCtrl.Text := ''; finally TOpenEdit(EditCtrl).OnChange := TmpOnChange; *************** *** 6652,6656 **** DrawText(ACanvas, S, Length(S), ARect, DT_EDITCONTROL or DT_WORDBREAK); ! end; end --- 6655,6659 ---- DrawText(ACanvas, S, Length(S), ARect, DT_EDITCONTROL or DT_WORDBREAK); ! end; end *************** *** 10146,10150 **** MaxValue := GetTypeData(TypeInfo).MaxValue; if (Value < MinValue) or (Value > MaxValue) then ! raise ERangeError.CreateFmt(SOutOfRange, [MinValue, MaxValue]); PShortint(Address)^ := Value; end; --- 10149,10153 ---- MaxValue := GetTypeData(TypeInfo).MaxValue; if (Value < MinValue) or (Value > MaxValue) then ! raise ERangeError.CreateResFmt(@SOutOfRange, [MinValue, MaxValue]); PShortint(Address)^ := Value; end; *************** *** 10154,10158 **** MaxValue := GetTypeData(TypeInfo).MaxValue; if (Value < MinValue) or (Value > MaxValue) then ! raise ERangeError.CreateFmt(SOutOfRange, [MinValue, MaxValue]); PByte(Address)^ := Value; end; --- 10157,10161 ---- MaxValue := GetTypeData(TypeInfo).MaxValue; if (Value < MinValue) or (Value > MaxValue) then ! raise ERangeError.CreateResFmt(@SOutOfRange, [MinValue, MaxValue]); PByte(Address)^ := Value; end; *************** *** 10162,10166 **** MaxValue := GetTypeData(TypeInfo).MaxValue; if (Value < MinValue) or (Value > MaxValue) then ! raise ERangeError.CreateFmt(SOutOfRange, [MinValue, MaxValue]); PSmallint(Address)^ := Value; end; --- 10165,10169 ---- MaxValue := GetTypeData(TypeInfo).MaxValue; if (Value < MinValue) or (Value > MaxValue) then ! raise ERangeError.CreateResFmt(@SOutOfRange, [MinValue, MaxValue]); PSmallint(Address)^ := Value; end; *************** *** 10170,10174 **** MaxValue := GetTypeData(TypeInfo).MaxValue; if (Value < MinValue) or (Value > MaxValue) then ! raise ERangeError.CreateFmt(SOutOfRange, [MinValue, MaxValue]); PWord(Address)^ := Value; end; --- 10173,10177 ---- MaxValue := GetTypeData(TypeInfo).MaxValue; if (Value < MinValue) or (Value > MaxValue) then ! raise ERangeError.CreateResFmt(@SOutOfRange, [MinValue, MaxValue]); PWord(Address)^ := Value; end; *************** *** 10178,10182 **** MaxValue := GetTypeData(TypeInfo).MaxValue; if (Value < MinValue) or (Value > MaxValue) then ! raise ERangeError.CreateFmt(SOutOfRange, [MinValue, MaxValue]); PLongint(Address)^ := Value; end; --- 10181,10185 ---- MaxValue := GetTypeData(TypeInfo).MaxValue; if (Value < MinValue) or (Value > MaxValue) then ! raise ERangeError.CreateResFmt(@SOutOfRange, [MinValue, MaxValue]); PLongint(Address)^ := Value; end; *************** *** 10186,10190 **** MaxValue := Longword(GetTypeData(TypeInfo).MaxValue); if (Value < MinValue) or (Value > MaxValue) then ! raise ERangeError.CreateFmt(SOutOfRange, [MinValue, MaxValue]); PLongword(Address)^ := Value; end; --- 10189,10193 ---- MaxValue := Longword(GetTypeData(TypeInfo).MaxValue); if (Value < MinValue) or (Value > MaxValue) then ! raise ERangeError.CreateResFmt(@SOutOfRange, [MinValue, MaxValue]); PLongword(Address)^ := Value; end; *************** *** 10836,10840 **** if (Value < GetTypeData(TypeInfo).MinInt64Value) or (Value > GetTypeData(TypeInfo).MaxInt64Value) then ! raise ERangeError.CreateFmt(SOutOfRange, [GetTypeData(TypeInfo).MinValue, GetTypeData(TypeInfo).MaxValue]); DoSetAsInt64(Value); --- 10839,10843 ---- if (Value < GetTypeData(TypeInfo).MinInt64Value) or (Value > GetTypeData(TypeInfo).MaxInt64Value) then ! raise ERangeError.CreateResFmt(@SOutOfRange, [GetTypeData(TypeInfo).MinValue, GetTypeData(TypeInfo).MaxValue]); DoSetAsInt64(Value); *************** *** 10876,10880 **** end; if (Value < MinValue) or (Value > MaxValue) then ! raise ERangeError.CreateFmt(SOutOfRange, [MinValue, MaxValue]); case GetTypeData(TypeInfo).OrdType of otSByte: --- 10879,10883 ---- end; if (Value < MinValue) or (Value > MaxValue) then ! raise ERangeError.CreateResFmt(@SOutOfRange, [MinValue, MaxValue]); case GetTypeData(TypeInfo).OrdType of otSByte: Index: JvQXPBar.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQXPBar.pas,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** JvQXPBar.pas 14 May 2004 22:45:25 -0000 1.14 --- JvQXPBar.pas 19 May 2004 20:53:12 -0000 1.15 *************** *** 59,63 **** Types, Qt, QControls, QGraphics, QForms, QImgList, QActnList, ! QWindows, QTypes, QExtCtrls, JvQTypes, JvQConsts, JvQXPCore, JvQXPCoreUtils; --- 59,64 ---- Types, Qt, QControls, QGraphics, QForms, QImgList, QActnList, ! QWindows, QTypes, QExtCtrls, ! JvQTypes, JvQConsts, JvQXPCore, JvQXPCoreUtils; *************** *** 72,80 **** TJvXPBarHitTest = ! ( ! htNone, // mouse is inside non-supported rect ! htHeader, // mouse is inside header htRollButton // mouse is inside rollbutton ! ); TJvXPBarRollDelay = 1..200; --- 73,81 ---- TJvXPBarHitTest = ! ( ! htNone, // mouse is inside non-supported rect ! htHeader, // mouse is inside header htRollButton // mouse is inside rollbutton ! ); TJvXPBarRollDelay = 1..200; *************** *** 1279,1283 **** --- 1280,1286 ---- Self.GradientFrom := GradientFrom; Self.SeparatorColor := SeparatorColor; + Exit; end; + inherited Assign(Source); end; *************** *** 1479,1483 **** Exit; NewHeight := FC_HEADER_MARGIN + HeaderHeight + FVisibleItems.Count * FRollOffset + FC_ITEM_MARGIN + 1; ! { full collapsing } if ((FRolling and not FCollapsed) or (not FRolling and FCollapsed) or (FVisibleItems.Count = 0)) then --- 1482,1486 ---- Exit; NewHeight := FC_HEADER_MARGIN + HeaderHeight + FVisibleItems.Count * FRollOffset + FC_ITEM_MARGIN + 1; ! { full collapsing } if ((FRolling and not FCollapsed) or (not FRolling and FCollapsed) or (FVisibleItems.Count = 0)) then *************** *** 1545,1549 **** procedure TJvXPCustomWinXPBar.ItemVisibilityChanged(Item: TJvXPBarItem); begin ! // update visible-item list if Item.Visible then FVisibleItems.Add(Item) --- 1548,1552 ---- procedure TJvXPCustomWinXPBar.ItemVisibilityChanged(Item: TJvXPBarItem); begin ! // update visible-item list if Item.Visible then FVisibleItems.Add(Item) Index: JvQTimeLine.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQTimeLine.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JvQTimeLine.pas 18 May 2004 14:21:12 -0000 1.5 --- JvQTimeLine.pas 19 May 2004 20:53:12 -0000 1.6 *************** *** 584,590 **** Color := TJvTimeItem(Source).Color; TextColor := TJvTimeItem(Source).TextColor; ! Exit; ! end; ! inherited Assign(Source); end; --- 584,590 ---- Color := TJvTimeItem(Source).Color; TextColor := TJvTimeItem(Source).TextColor; ! end ! else ! inherited Assign(Source); end; *************** *** 853,857 **** begin FDirection := Value; ! if TimeLine <> nil then begin UpdatePlacement; --- 853,857 ---- begin FDirection := Value; ! if (TimeLine <> nil) and (TimeLine.parent <> nil )then begin UpdatePlacement; *************** *** 1923,1928 **** procedure TJvCustomTimeLine.Paint; begin ! if (FUpdate <> 0) or (csDestroying in ComponentState) or (csCreating in ControlState) ! then Exit; DrawTimeLine(Canvas); --- 1923,1927 ---- procedure TJvCustomTimeLine.Paint; begin ! if (FUpdate <> 0) or (csDestroying in ComponentState) then Exit; DrawTimeLine(Canvas); Index: JvQUrlListGrabber.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQUrlListGrabber.pas,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JvQUrlListGrabber.pas 15 May 2004 00:50:27 -0000 1.7 --- JvQUrlListGrabber.pas 19 May 2004 20:53:12 -0000 1.8 *************** *** 564,568 **** FUrls.Objects[I] := JvUrlGrabberClassList[DefaultGrabberIndex].Create(Self, FUrls[I], FDefaultGrabbersProperties.Items[DefaultGrabberIndex]) else ! raise ENoGrabberForUrl.CreateFmt(RsENoGrabberForUrl, [FUrls[I]]); // add in the list of owned objects --- 564,568 ---- FUrls.Objects[I] := JvUrlGrabberClassList[DefaultGrabberIndex].Create(Self, FUrls[I], FDefaultGrabbersProperties.Items[DefaultGrabberIndex]) else ! raise ENoGrabberForUrl.CreateResFmt(@RsENoGrabberForUrl, [FUrls[I]]); // add in the list of owned objects *************** *** 626,630 **** FUrl := Value else ! raise EGrabberNotStopped.Create(RsEGrabberNotStopped); end; --- 626,630 ---- FUrl := Value else ! raise EGrabberNotStopped.CreateRes(@RsEGrabberNotStopped); end; *************** *** 873,877 **** begin if Source is TJvCustomUrlGrabberDefaultProperties then - begin with Source as TJvCustomUrlGrabberDefaultProperties do begin --- 873,876 ---- *************** *** 881,888 **** Self.FileName := FileName; Self.OutputMode := OutputMode; ! end; ! end else ! inherited; end; --- 880,886 ---- Self.FileName := FileName; Self.OutputMode := OutputMode; ! end else ! inherited Assign(Source); end; Index: JvQLinkLabelTree.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQLinkLabelTree.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvQLinkLabelTree.pas 3 Apr 2004 19:10:01 -0000 1.3 --- JvQLinkLabelTree.pas 19 May 2004 20:53:12 -0000 1.4 *************** *** 280,286 **** const ! clNormalLink = TColor($400 or $80000000); ! clClickedLink = TColor($401 or $80000000); ! clHotLink = TColor($402 or $80000000); procedure ResetNodeCount; --- 280,289 ---- const ! ! ! clNormalLink = clBlue; ! clClickedLink = clMaroon; ! clHotLink = clNavy; ! procedure ResetNodeCount; *************** *** 569,573 **** Result := FWordInfoArray[Pos] else ! raise ENodeError.Create(RsEWordInfoIndexOutOfBounds); end; --- 572,576 ---- Result := FWordInfoArray[Pos] else ! raise ENodeError.CreateRes(@RsEWordInfoIndexOutOfBounds); end; *************** *** 792,796 **** Exit; ! raise ENodeError.Create(RsETNodeGetNodeTypeUnknownClass); end; --- 795,799 ---- Exit; ! raise ENodeError.CreateRes(@RsETNodeGetNodeTypeUnknownClass); end; *************** *** 847,851 **** end else ! raise ENodeError.Create(RsENoMoreNodesToReturn); end; --- 850,854 ---- end else ! raise ENodeError.CreateRes(@RsENoMoreNodesToReturn); end; *************** *** 883,887 **** end else ! raise ENodeError.Create(RsENoMoreRecordsToReturn); end; --- 886,890 ---- end else ! raise ENodeError.CreateRes(@RsENoMoreRecordsToReturn); end; Index: JvQParameterListParameter.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQParameterListParameter.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JvQParameterListParameter.pas 18 May 2004 14:21:11 -0000 1.6 --- JvQParameterListParameter.pas 19 May 2004 20:53:12 -0000 1.7 *************** *** 28,32 **** {$I jvcl.inc} ! // for FileCtrl.pas and QFileCtrls.pas {$WARN UNIT_PLATFORM OFF} --- 28,32 ---- {$I jvcl.inc} ! // for FileCtrl.pas and QFileCtrls.pas {$WARN UNIT_PLATFORM OFF} *************** *** 194,198 **** procedure Assign(Source: TPersistent); override; published ! // property AutoSize: Boolean read FAutoSize write SetAutoSize; property Center: Boolean read FCenter write FCenter; property IncrementalDisplay: Boolean read FIncrementalDisplay write FIncrementalDisplay; --- 194,198 ---- procedure Assign(Source: TPersistent); override; published ! // property AutoSize: Boolean read FAutoSize write SetAutoSize; property Center: Boolean read FCenter write FCenter; property IncrementalDisplay: Boolean read FIncrementalDisplay write FIncrementalDisplay; *************** *** 485,489 **** const HelpButton: TMsgDlgBtn = mbHelp; const ADynControlEngine: TJvDynControlEngine = nil): TModalResult; ! implementation --- 485,489 ---- const HelpButton: TMsgDlgBtn = mbHelp; const ADynControlEngine: TJvDynControlEngine = nil): TModalResult; ! implementation *************** *** 499,506 **** Result := ! JvQDSADialogs. ! ! MessageDlg(Msg, DlgType, Buttons, HelpCtx, Center, Timeout, DefaultButton, CancelButton, HelpButton, ADynControlEngine); end; --- 499,506 ---- Result := + + JvQDSADialogs. ! MessageDlg(Msg, DlgType, Buttons, HelpCtx, Center, Timeout, DefaultButton, CancelButton, HelpButton, ADynControlEngine); end; *************** *** 540,546 **** begin inherited Assign(Source); ! Glyph := TJvButtonParameter(Source).Glyph; ! Layout := TJvButtonParameter(Source).Layout; ! NumGlyphs := TJvButtonParameter(Source).NumGlyphs; end; --- 540,549 ---- begin inherited Assign(Source); ! if Source is TJvButtonParameter then ! begin ! Glyph := TJvButtonParameter(Source).Glyph; ! Layout := TJvButtonParameter(Source).Layout; ! NumGlyphs := TJvButtonParameter(Source).NumGlyphs; ! end; end; *************** *** 637,642 **** FramePanel.Width := WinControl.Width; end ! else ! if RightSpace > 0 then if FramePanel.Width > 0 then WinControl.Width := FramePanel.Width - RightSpace --- 640,644 ---- FramePanel.Width := WinControl.Width; end ! else if RightSpace > 0 then if FramePanel.Width > 0 then WinControl.Width := FramePanel.Width - RightSpace *************** *** 646,651 **** WinControl.Width := WinControl.Width - RightSpace; end ! else ! if FramePanel.Width > 0 then WinControl.Width := FramePanel.Width else --- 648,652 ---- WinControl.Width := WinControl.Width - RightSpace; end ! else if FramePanel.Width > 0 then WinControl.Width := FramePanel.Width else *************** *** 672,677 **** FramePanel.Width := WinControl.Width; end ! else ! if RightSpace > 0 then if FramePanel.Width > 0 then WinControl.Width := FramePanel.Width - RightSpace --- 673,677 ---- FramePanel.Width := WinControl.Width; end ! else if RightSpace > 0 then if FramePanel.Width > 0 then WinControl.Width := FramePanel.Width - RightSpace *************** *** 681,686 **** WinControl.Width := WinControl.Width - RightSpace; end ! else ! if FramePanel.Width > 0 then WinControl.Width := FramePanel.Width else --- 681,685 ---- WinControl.Width := WinControl.Width - RightSpace; end ! else if FramePanel.Width > 0 then WinControl.Width := FramePanel.Width else *************** *** 694,699 **** else WinControl.Height := Height ! else ! if Assigned(LabelControl) then FramePanel.Height := WinControl.Height + LabelControl.Height + 3 else --- 693,697 ---- else WinControl.Height := Height ! else if Assigned(LabelControl) then FramePanel.Height := WinControl.Height + LabelControl.Height + 3 else *************** *** 704,709 **** if LabelWidth > 0 then LabelControl.Width := LabelWidth; ! // ELSE ! // LabelControl.Width := WinControl.Top := LabelControl.Top; WinControl.Left := LabelControl.Left + LabelControl.Width + 4; --- 702,707 ---- if LabelWidth > 0 then LabelControl.Width := LabelWidth; ! // ELSE ! // LabelControl.Width := WinControl.Top := LabelControl.Top; WinControl.Left := LabelControl.Left + LabelControl.Width + 4; *************** *** 750,754 **** begin inherited SetHeight(Value); ! if Assigned (FramePanel) then FramePanel.Height := Value; ArrangeLabelAndWinControlOnPanel; --- 748,752 ---- begin inherited SetHeight(Value); ! if Assigned(FramePanel) then FramePanel.Height := Value; ArrangeLabelAndWinControlOnPanel; *************** *** 758,762 **** begin inherited SetWidth(Value); ! if Assigned (FramePanel) then FramePanel.Width := Value; ArrangeLabelAndWinControlOnPanel; --- 756,760 ---- begin inherited SetWidth(Value); ! if Assigned(FramePanel) then FramePanel.Width := Value; ArrangeLabelAndWinControlOnPanel; *************** *** 772,779 **** begin inherited Assign(Source); ! LabelArrangeMode := TJvBasePanelEditParameter(Source).LabelArrangeMode; ! LabelWidth := TJvBasePanelEditParameter(Source).LabelWidth; ! EditWidth := TJvBasePanelEditParameter(Source).EditWidth; ! RightSpace := TJvBasePanelEditParameter(Source).RightSpace; end; --- 770,780 ---- begin inherited Assign(Source); ! if Source is TJvBasePanelEditParameter then ! begin ! LabelArrangeMode := TJvBasePanelEditParameter(Source).LabelArrangeMode; ! LabelWidth := TJvBasePanelEditParameter(Source).LabelWidth; ! EditWidth := TJvBasePanelEditParameter(Source).EditWidth; ! RightSpace := TJvBasePanelEditParameter(Source).RightSpace; ! end; end; *************** *** 821,830 **** begin inherited Assign(Source); ! Picture := TJvImageParameter(Source).Picture; ! // AutoSize := TJvImageParameter(Source).AutoSize; ! Center := TJvImageParameter(Source).Center; ! IncrementalDisplay := TJvImageParameter(Source).IncrementalDisplay; ! Stretch := TJvImageParameter(Source).Stretch; ! Transparent := TJvImageParameter(Source).Transparent; end; --- 822,834 ---- begin inherited Assign(Source); ! if Source is TJvImageParameter then ! begin ! Picture := TJvImageParameter(Source).Picture; ! // AutoSize := TJvImageParameter(Source).AutoSize; ! Center := TJvImageParameter(Source).Center; ! IncrementalDisplay := TJvImageParameter(Source).IncrementalDisplay; ! Stretch := TJvImageParameter(Source).Stretch; ! Transparent := TJvImageParameter(Source).Transparent; ! end; end; *************** *** 843,847 **** begin ControlSetPicture(Picture); ! // ControlSetAutoSize(AutoSize); ControlSetIncrementalDisplay(IncrementalDisplay); ControlSetCenter(Center); --- 847,851 ---- begin ControlSetPicture(Picture); ! // ControlSetAutoSize(AutoSize); ControlSetIncrementalDisplay(IncrementalDisplay); ControlSetCenter(Center); *************** *** 890,895 **** begin inherited Assign(Source); ! BevelInner := TJvPanelParameter(Source).BevelInner; ! BevelOuter := TJvPanelParameter(Source).BevelOuter; end; --- 894,902 ---- begin inherited Assign(Source); ! if Source is TJvPanelParameter then ! begin ! BevelInner := TJvPanelParameter(Source).BevelInner; ! BevelOuter := TJvPanelParameter(Source).BevelOuter; ! end; end; *************** *** 1025,1029 **** if VariantAsItemIndex then if VarType(Value) in [varSmallInt, varInteger, varByte ! , varShortInt, varWord, varLongWord ] then ItemIndex := Value else --- 1032,1036 ---- if VariantAsItemIndex then if VarType(Value) in [varSmallInt, varInteger, varByte ! , varShortInt, varWord, varLongWord] then ItemIndex := Value else *************** *** 1055,1060 **** if VariantAsItemIndex then inherited SetAsVariant(FItemIndex) ! else ! if (Value >= 0) and (Value < ItemList.Count) then inherited SetAsVariant(ItemList[Value]) else --- 1062,1066 ---- if VariantAsItemIndex then inherited SetAsVariant(FItemIndex) ! else if (Value >= 0) and (Value < ItemList.Count) then inherited SetAsVariant(ItemList[Value]) else *************** *** 1072,1077 **** if VariantAsItemIndex then Result := Index ! else ! if (Index >= 0) and (Index < ItemList.Count) then Result := ItemList[Index] else --- 1078,1082 ---- if VariantAsItemIndex then Result := Index ! else if (Index >= 0) and (Index < ItemList.Count) then Result := ItemList[Index] else *************** *** 1099,1105 **** begin inherited Assign(Source); ! ItemList.Assign(TJvListParameter(Source).ItemList); ! ItemIndex := TJvListParameter(Source).ItemIndex; ! Sorted := TJvListParameter(Source).Sorted; end; --- 1104,1113 ---- begin inherited Assign(Source); ! if Source is TJvListParameter then ! begin ! ItemList.Assign(TJvListParameter(Source).ItemList); ! ItemIndex := TJvListParameter(Source).ItemIndex; ! Sorted := TJvListParameter(Source).Sorted; ! end; end; *************** *** 1129,1135 **** begin inherited SetData; ! // IF Assigned ( ! // IF Assigned (WinControl) THEN ! // ItemList.IndexOf (AsString) := ItemIndex; end; --- 1137,1143 ---- begin inherited SetData; ! // IF Assigned ( ! // IF Assigned (WinControl) THEN ! // ItemList.IndexOf (AsString) := ItemIndex; end; *************** *** 1139,1143 **** begin inherited Assign(Source); ! Columns := TJvRadioGroupParameter(Source).Columns; end; --- 1147,1152 ---- begin inherited Assign(Source); ! if Source is TJvRadioGroupParameter then ! Columns := TJvRadioGroupParameter(Source).Columns; end; *************** *** 1170,1175 **** begin inherited Assign(Source); ! Sorted := TJvComboBoxParameter(Source).Sorted; ! NewEntriesAllowed := TJvComboBoxParameter(Source).NewEntriesAllowed; end; --- 1179,1187 ---- begin inherited Assign(Source); ! if Source is TJvComboBoxParameter then ! begin ! Sorted := TJvComboBoxParameter(Source).Sorted; ! NewEntriesAllowed := TJvComboBoxParameter(Source).NewEntriesAllowed; ! end; end; *************** *** 1215,1219 **** begin inherited Assign(Source); ! Sorted := TJvListBoxParameter(Source).Sorted; end; --- 1227,1232 ---- begin inherited Assign(Source); ! if Source is TJvListBoxParameter then ! Sorted := TJvListBoxParameter(Source).Sorted; end; *************** *** 1257,1261 **** begin inherited Assign(Source); ! Format := TJvTimeParameter(Source).Format; end; --- 1270,1275 ---- begin inherited Assign(Source); ! if Source is TJvTimeParameter then ! Format := TJvTimeParameter(Source).Format; end; *************** *** 1284,1290 **** begin inherited Assign(Source); ! Format := TJvDateTimeParameter(Source).Format; ! MaxDate := TJvDateTimeParameter(Source).MaxDate; ! MinDate := TJvDateTimeParameter(Source).MinDate; end; --- 1298,1307 ---- begin inherited Assign(Source); ! if Source is TJvDateTimeParameter then ! begin ! Format := TJvDateTimeParameter(Source).Format; ! MaxDate := TJvDateTimeParameter(Source).MaxDate; ! MinDate := TJvDateTimeParameter(Source).MinDate; ! end; end; *************** *** 1318,1324 **** begin inherited Assign(Source); ! Format := TJvDateParameter(Source).Format; ! MinDate := TJvDateParameter(Source).MinDate; ! MaxDate := TJvDateParameter(Source).MaxDate; end; --- 1335,1344 ---- begin inherited Assign(Source); ! if Source is TJvDateParameter then ! begin ! Format := TJvDateParameter(Source).Format; ! MinDate := TJvDateParameter(Source).MinDate; ! MaxDate := TJvDateParameter(Source).MaxDate; ! end; end; *************** *** 1363,1372 **** begin inherited Assign(Source); ! EditMask := TJvEditParameter(Source).EditMask; ! PasswordChar := TJvEditParameter(Source).PasswordChar; ! LabelWidth := TJvEditParameter(Source).LabelWidth; ! EditWidth := TJvEditParameter(Source).EditWidth; ! LabelArrangeMode := TJvEditParameter(Source).LabelArrangeMode; ! RightSpace := TJvEditParameter(Source).RightSpace; end; --- 1383,1395 ---- begin inherited Assign(Source); ! if Source is TJvEditParameter then ! begin ! EditMask := TJvEditParameter(Source).EditMask; ! PasswordChar := TJvEditParameter(Source).PasswordChar; ! LabelWidth := TJvEditParameter(Source).LabelWidth; ! EditWidth := TJvEditParameter(Source).EditWidth; ! LabelArrangeMode := TJvEditParameter(Source).LabelArrangeMode; ! RightSpace := TJvEditParameter(Source).RightSpace; ! end; end; *************** *** 1410,1414 **** begin inherited Assign(Source); ! OnButtonClick := TJvButtonEditParameter(Source).OnButtonClick; end; --- 1433,1438 ---- begin inherited Assign(Source); ! if Source is TJvButtonEditParameter then ! OnButtonClick := TJvButtonEditParameter(Source).OnButtonClick; end; *************** *** 1418,1422 **** begin inherited Assign(Source); ! EditorType := TJvNumberEditParameter(Source).EditorType; end; --- 1442,1447 ---- begin inherited Assign(Source); ! if Source is TJvNumberEditParameter then ! EditorType := TJvNumberEditParameter(Source).EditorType; end; *************** *** 1438,1443 **** if (EditorType = netCalculate) and DynControlEngine.IsControlTypeRegistered(jctCalculateEdit) then WinControl := DynControlEngine.CreateCalculateControl(Self, AParameterParent, GetParameterName) ! else ! if (EditorType = netSpin) and DynControlEngine.IsControlTypeRegistered(jctSpinEdit) then WinControl := DynControlEngine.CreateSpinControl(Self, AParameterParent, GetParameterName) else --- 1463,1467 ---- if (EditorType = netCalculate) and DynControlEngine.IsControlTypeRegistered(jctCalculateEdit) then WinControl := DynControlEngine.CreateCalculateControl(Self, AParameterParent, GetParameterName) ! else if (EditorType = netSpin) and DynControlEngine.IsControlTypeRegistered(jctSpinEdit) then WinControl := DynControlEngine.CreateSpinControl(Self, AParameterParent, GetParameterName) else *************** *** 1468,1473 **** begin inherited Assign(Source); ! MinValue := TJvIntegerEditParameter(Source).MinValue; ! MaxValue := TJvIntegerEditParameter(Source).MaxValue; end; --- 1492,1500 ---- begin inherited Assign(Source); ! if Source is TJvIntegerEditParameter then ! begin ! MinValue := TJvIntegerEditParameter(Source).MinValue; ! MaxValue := TJvIntegerEditParameter(Source).MaxValue; ! end; end; *************** *** 1522,1527 **** if (EditorType = netCalculate) and DynControlEngine.IsControlTypeRegistered(jctCalculateEdit) then WinControl := DynControlEngine.CreateCalculateControl(Self, AParameterParent, GetParameterName) ! else ! if (EditorType = netSpin) and DynControlEngine.IsControlTypeRegistered(jctSpinEdit) then WinControl := DynControlEngine.CreateSpinControl(Self, AParameterParent, GetParameterName) else --- 1549,1553 ---- if (EditorType = netCalculate) and DynControlEngine.IsControlTypeRegistered(jctCalculateEdit) then WinControl := DynControlEngine.CreateCalculateControl(Self, AParameterParent, GetParameterName) ! else if (EditorType = netSpin) and DynControlEngine.IsControlTypeRegistered(jctSpinEdit) then WinControl := DynControlEngine.CreateSpinControl(Self, AParameterParent, GetParameterName) else *************** *** 1552,1557 **** begin inherited Assign(Source); ! MinValue := TJvDoubleEditParameter(Source).MinValue; ! MaxValue := TJvDoubleEditParameter(Source).MaxValue; end; --- 1578,1586 ---- begin inherited Assign(Source); ! if Source is TJvDoubleEditParameter then ! begin ! MinValue := TJvDoubleEditParameter(Source).MinValue; ! MaxValue := TJvDoubleEditParameter(Source).MaxValue; ! end; end; *************** *** 1592,1602 **** begin inherited Assign(Source); ! DialogKind := TJvFileNameParameter(Source).DialogKind; ! DefaultExt := TJvFileNameParameter(Source).DefaultExt; ! Filter := TJvFileNameParameter(Source).Filter; ! FilterIndex := TJvFileNameParameter(Source).FilterIndex; ! InitialDir := TJvFileNameParameter(Source).InitialDir; ! DialogOptions := TJvFileNameParameter(Source).DialogOptions; ! DialogTitle := TJvFileNameParameter(Source).DialogTitle; end; --- 1621,1634 ---- begin inherited Assign(Source); ! if Source is TJvFileNameParameter then ! begin ! DialogKind := TJvFileNameParameter(Source).DialogKind; ! DefaultExt := TJvFileNameParameter(Source).DefaultExt; ! Filter := TJvFileNameParameter(Source).Filter; ! FilterIndex := TJvFileNameParameter(Source).FilterIndex; ! InitialDir := TJvFileNameParameter(Source).InitialDir; ! DialogOptions := TJvFileNameParameter(Source).DialogOptions; ! DialogTitle := TJvFileNameParameter(Source).DialogTitle; ! end; end; *************** *** 1677,1683 **** begin inherited Assign(Source); ! InitialDir := TJvDirectoryParameter(Source).InitialDir; ! ! DialogTitle := TJvDirectoryParameter(Source).DialogTitle; end; --- 1709,1718 ---- begin inherited Assign(Source); ! if Source is TJvDirectoryParameter then ! begin ! InitialDir := TJvDirectoryParameter(Source).InitialDir; ! ! DialogTitle := TJvDirectoryParameter(Source).DialogTitle; ! end; end; Index: JvQFormPlacement.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQFormPlacement.pas,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JvQFormPlacement.pas 18 May 2004 14:21:10 -0000 1.7 --- JvQFormPlacement.pas 19 May 2004 20:53:12 -0000 1.8 *************** *** 927,932 **** Name := TJvStoredValue(Source).Name; KeyString := TJvStoredValue(Source).KeyString; end; ! // (rom) else inherited Assign(Source) missing? end; --- 927,933 ---- Name := TJvStoredValue(Source).Name; KeyString := TJvStoredValue(Source).KeyString; + Exit; end; ! inherited Assign(Source); end; Index: JvQChart.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQChart.pas,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** JvQChart.pas 12 May 2004 23:35:32 -0000 1.17 --- JvQChart.pas 19 May 2004 20:53:11 -0000 1.18 *************** *** 672,678 **** begin if (Pen < 0) or (ValueIndex < 0) then ! raise ERangeError.Create(RsEDataIndexCannotBeNegative); if (Pen > CHART_SANITY_LIMIT) or (ValueIndex > CHART_SANITY_LIMIT) then ! raise ERangeError.Create(RsEDataIndexTooLargeProbablyAnInternal); if ValueIndex >= FDataAlloc then --- 672,678 ---- begin if (Pen < 0) or (ValueIndex < 0) then ! raise ERangeError.CreateRes(@RsEDataIndexCannotBeNegative); if (Pen > CHART_SANITY_LIMIT) or (ValueIndex > CHART_SANITY_LIMIT) then ! raise ERangeError.CreateRes(@RsEDataIndexTooLargeProbablyAnInternal); if ValueIndex >= FDataAlloc then *************** *** 1020,1024 **** begin if (Index < 0) or (Index >= MAX_PEN) then ! raise ERangeError.Create(RsEChartOptionsPenCountPenCountOutOf); if Index >= Length(FPenColors) then --- 1020,1024 ---- begin if (Index < 0) or (Index >= MAX_PEN) then ! raise ERangeError.CreateRes(@RsEChartOptionsPenCountPenCountOutOf); if Index >= Length(FPenColors) then *************** *** 1030,1034 **** begin if (Index < 0) or (Index >= MAX_PEN) then ! raise ERangeError.Create(RsEChartOptionsPenCountPenCountOutOf); if Index >= Length(FPenStyles) then --- 1030,1034 ---- begin if (Index < 0) or (Index >= MAX_PEN) then ! raise ERangeError.CreateRes(@RsEChartOptionsPenCountPenCountOutOf); if Index >= Length(FPenStyles) then *************** *** 1048,1052 **** begin if Index < 0 then ! raise ERangeError.Create(RsEGetAverageValueIndexNegative); if Index >= Length(FAverageValue) then Result := 0.0 --- 1048,1052 ---- begin if Index < 0 then ! raise ERangeError.CreateRes(@RsEGetAverageValueIndexNegative); if Index >= Length(FAverageValue) then Result := 0.0 *************** *** 1058,1062 **** begin if Index < 0 then ! raise ERangeError.Create(RsESetAverageValueIndexNegative); if Index >= Length(FAverageValue) then SetLength(FAverageValue, Index + 1); --- 1058,1062 ---- begin if Index < 0 then ! raise ERangeError.CreateRes(@RsESetAverageValueIndexNegative); if Index >= Length(FAverageValue) then SetLength(FAverageValue, Index + 1); *************** *** 1075,1079 **** begin if (Index < 0) or (Index >= MAX_PEN) then ! raise ERangeError.Create(RsEChartOptionsPenCountPenCountOutOf); if Index >= Length(FPenSecondaryAxisFlag) then --- 1075,1079 ---- begin if (Index < 0) or (Index >= MAX_PEN) then ! raise ERangeError.CreateRes(@RsEChartOptionsPenCountPenCountOutOf); if Index >= Length(FPenSecondaryAxisFlag) then *************** *** 1093,1097 **** begin if (Index < 0) or (Index >= MAX_PEN) then ! raise ERangeError.Create(RsEChartOptionsPenCountPenCountOutOf); if Index >= Length(FPenValueLabels) then --- 1093,1097 ---- begin if (Index < 0) or (Index >= MAX_PEN) then ! raise ERangeError.CreateRes(@RsEChartOptionsPenCountPenCountOutOf); if Index >= Length(FPenValueLabels) then *************** *** 1103,1107 **** begin if (Count < 0) or (Count >= MAX_PEN) then ! raise ERangeError.Create(RsEChartOptionsPenCountPenCountOutOf); FPenCount := Count; SetLength(FPenSecondaryAxisFlag, FPenCount + 1); --- 1103,1107 ---- begin if (Count < 0) or (Count >= MAX_PEN) then ! raise ERangeError.CreateRes(@RsEChartOptionsPenCountPenCountOutOf); FPenCount := Count; SetLength(FPenSecondaryAxisFlag, FPenCount + 1); *************** *** 1177,1181 **** //if (not PrintInSession) then // if (Offset < 10) or (Offset > (FOwner.Width div 2)) then ! // raise ERangeError.Create(RsEChartOptionsXStartOffsetValueOutO); FXStartOffset := Offset; end; --- 1177,1181 ---- //if (not PrintInSession) then // if (Offset < 10) or (Offset > (FOwner.Width div 2)) then ! // raise ERangeError.CreateRes(@RsEChartOptionsXStartOffsetValueOutO); FXStartOffset := Offset; end; *************** *** 1364,1368 **** // Inc(JvChart_PaintCounter); // OutputDebugString(PChar('JvChart_PaintCounter='+IntToStr(JvChart_PaintCounter))); ! if csDesigning in ComponentState then // or (Options.ChartKind = ckChartNone) then // Blank. DesignModePaint --- 1364,1368 ---- // Inc(JvChart_PaintCounter); // OutputDebugString(PChar('JvChart_PaintCounter='+IntToStr(JvChart_PaintCounter))); ! SetBkMode(Canvas.Handle, OPAQUE); if csDesigning in ComponentState then // or (Options.ChartKind = ckChartNone) then // Blank. DesignModePaint *************** *** 2755,2759 **** Result := TBitmap(FPicture.Graphic).Canvas else ! raise EInvalidOperation.Create(RsEUnableToGetCanvas); end; --- 2755,2759 ---- Result := TBitmap(FPicture.Graphic).Canvas else ! raise EInvalidOperation.CreateRes(@RsEUnableToGetCanvas); end; *************** *** 2933,2937 **** ! TextOutAngle(ChartCanvas, 90, horiz, vert, StrText); end; --- 2933,2938 ---- ! wd := ChartCanvas.TextHeight(StrText); ! TextOutAngle(ChartCanvas, 90, horiz + wd, vert, StrText); end; Index: JvQParameterList.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQParameterList.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JvQParameterList.pas 18 May 2004 14:21:11 -0000 1.6 --- JvQParameterList.pas 19 May 2004 20:53:12 -0000 1.7 *************** *** 425,429 **** cTrue = 'TRUE'; ! //=== TJvParameterListMessages =============================================== constructor TJvParameterListMessages.Create; --- 425,429 ---- cTrue = 'TRUE'; ! //=== TJvParameterListMessages =============================================== constructor TJvParameterListMessages.Create; *************** *** 529,537 **** procedure TJvParameterListEnableDisableReason.Assign(Source: TPersistent); begin inherited Assign(Source); ! AsVariant := TJvParameterListEnableDisableReason(Source).AsVariant; ! IsEmpty := TJvParameterListEnableDisableReason(Source).IsEmpty; ! IsNotEmpty := TJvParameterListEnableDisableReason(Source).IsNotEmpty; ! RemoteParameterName := TJvParameterListEnableDisableReason(Source).RemoteParameterName; end; --- 529,542 ---- procedure TJvParameterListEnableDisableReason.Assign(Source: TPersistent); begin + if Source is TJvParameterListEnableDisableReason then + begin + AsVariant := TJvParameterListEnableDisableReason(Source).AsVariant; + IsEmpty := TJvParameterListEnableDisableReason(Source).IsEmpty; + IsNotEmpty := TJvParameterListEnableDisableReason(Source).IsNotEmpty; + RemoteParameterName := TJvParameterListEnableDisableReason(Source).RemoteParameterName; + Exit; + end; inherited Assign(Source); ! end; *************** *** 762,774 **** begin FValue := Value; ! // if Assigned(FJvDynControlData) then ! // FJvDynControlData.Value := Value; end; function TJvBaseParameter.GetAsVariant: Variant; begin ! // if Assigned(FJvDynControlData) then ! // Result := FJvDynControlData.Value ! // else Result := FValue; end; --- 767,779 ---- begin FValue := Value; ! // if Assigned(FJvDynControlData) then ! // FJvDynControlData.Value := Value; end; function TJvBaseParameter.GetAsVariant: Variant; begin ! // if Assigned(FJvDynControlData) then ! // Result := FJvDynControlData.Value ! // else Result := FValue; end; *************** *** 908,928 **** procedure TJvBaseParameter.Assign(Source: TPersistent); begin inherited Assign(Source); - AsVariant := TJvBaseParameter(Source).AsVariant; - Caption := TJvBaseParameter(Source).Caption; - SearchName := TJvBaseParameter(Source).SearchName; - Width := TJvBaseParameter(Source).Width; - Height := TJvBaseParameter(Source).Height; - Required := TJvBaseParameter(Source).Required; - ParentParameterName := TJvBaseParameter(Source).ParentParameterName; - StoreValueToAppStorage := TJvBaseParameter(Source).StoreValueToAppStorage; - StoreValueCrypted := TJvBaseParameter(Source).StoreValueCrypted; - TabOrder := TJvBaseParameter(Source).TabOrder; - FParameterList := TJvBaseParameter(Source).ParameterList; - Color := TJvBaseParameter(Source).Color; - ReadOnly := TJvBaseParameter(Source).ReadOnly; - Enabled := TJvBaseParameter(Source).Enabled; - FEnableReasons.Assign(TJvBaseParameter(Source).FEnableReasons); - FDisableReasons.Assign(TJvBaseParameter(Source).FDisableReasons); end; --- 913,937 ---- procedure TJvBaseParameter.Assign(Source: TPersistent); begin + if Source is TJvBaseParameter then + begin + AsVariant := TJvBaseParameter(Source).AsVariant; + Caption := TJvBaseParameter(Source).Caption; + SearchName := TJvBaseParameter(Source).SearchName; + Width := TJvBaseParameter(Source).Width; + Height := TJvBaseParameter(Source).Height; + Required := TJvBaseParameter(Source).Required; + ParentParameterName := TJvBaseParameter(Source).ParentParameterName; + StoreValueToAppStorage := TJvBaseParameter(Source).StoreValueToAppStorage; + StoreValueCrypted := TJvBaseParameter(Source).StoreValueCrypted; + TabOrder := TJvBaseParameter(Source).TabOrder; + FParameterList := TJvBaseParameter(Source).ParameterList; + Color := TJvBaseParameter(Source).Color; + ReadOnly := TJvBaseParameter(Source).ReadOnly; + Enabled := TJvBaseParameter(Source).Enabled; + FEnableReasons.Assign(TJvBaseParameter(Source).FEnableReasons); + FDisableReasons.Assign(TJvBaseParameter(Source).FDisableReasons); + Exit; + end; inherited Assign(Source); end; *************** *** 1031,1047 **** procedure TJvParameterList.Assign(Source: TPersistent); begin inherited Assign(Source); - Messages.Assign(TJvParameterList(Source).Messages); - ArrangeSettings := TJvParameterList(Source).ArrangeSettings; - AppStorage := TJvParameterList(Source).AppStorage; - Width := TJvParameterList(Source).Width; - Height := TJvParameterList(Source).Height; - MaxWidth := TJvParameterList(Source).MaxWidth; - MaxHeight := TJvParameterList(Source).MaxHeight; - OkButtonVisible := TJvParameterList(Source).OkButtonVisible; - CancelButtonVisible := TJvParameterList(Source).CancelButtonVisible; - FIntParameterList.Assign(TJvParameterList(Source).FIntParameterList); - HistoryEnabled := TJvParameterList(Source).HistoryEnabled; - AppStoragePath := TJvParameterList(Source).AppStoragePath; end; --- 1040,1060 ---- procedure TJvParameterList.Assign(Source: TPersistent); begin + if Source is TJvParameterList then + begin + Messages.Assign(TJvParameterList(Source).Messages); + ArrangeSettings := TJvParameterList(Source).ArrangeSettings; + AppStorage := TJvParameterList(Source).AppStorage; + Width := TJvParameterList(Source).Width; + Height := TJvParameterList(Source).Height; + MaxWidth := TJvParameterList(Source).MaxWidth; + MaxHeight := TJvParameterList(Source).MaxHeight; + OkButtonVisible := TJvParameterList(Source).OkButtonVisible; + CancelButtonVisible := TJvParameterList(Source).CancelButtonVisible; + FIntParameterList.Assign(TJvParameterList(Source).FIntParameterList); + HistoryEnabled := TJvParameterList(Source).HistoryEnabled; + AppStoragePath := TJvParameterList(Source).AppStoragePath; + Exit; + end; inherited Assign(Source); end; *************** *** 1333,1346 **** for I := 0 to Count - 1 do if Parameters[I].Visible then ! // if Parameters[I] is TJvTabControlParameter then ! // for J := 0 to TJvTabControlParameter(Parameters[I]).Tabs.Count - 1 do ! // if Uppercase(Parameters[I].SearchName + '.' + TJvTabControlParameter(Parameters[I]).Tabs[J]) = Uppercase(SearchName) then ! // begin ! // Result := TWinControl(TJvTabControlParameter(Parameters[I]).TabWinControls.Objects[J]); ! // break; ! // end {*** IF Uppercase(TJvBaseParameter(Objects[I]).SearchName) = Uppercase(ASearchName) THEN ***} ! // else ! else ! if UpperCase(Parameters[I].SearchName) = UpperCase(SearchName) then begin Parameter := Parameters[I]; --- 1346,1358 ---- for I := 0 to Count - 1 do if Parameters[I].Visible then ! // if Parameters[I] is TJvTabControlParameter then ! // for J := 0 to TJvTabControlParameter(Parameters[I]).Tabs.Count - 1 do ! // if Uppercase(Parameters[I].SearchName + '.' + TJvTabControlParameter(Parameters[I]).Tabs[J]) = Uppercase(SearchName) then ! // begin ! // Result := TWinControl(TJvTabControlParameter(Parameters[I]).TabWinControls.Objects[J]); ! // break; ! // end {*** IF Uppercase(TJvBaseParameter(Objects[I]).SearchName) = Uppercase(ASearchName) THEN ***} ! // else ! else if UpperCase(Parameters[I].SearchName) = UpperCase(SearchName) then begin Parameter := Parameters[I]; *************** *** 1534,1542 **** end; HandleEnableDisable; ! // for I := 0 to Count - 1 do ! // if Parameters[I].Visible then ! // if Assigned(Parameters[I].WinControl) then ! // if Assigned(THackWinControl(Parameters[I].WinControl).OnExit) then ! // THackWinControl(Parameters[I].WinControl).OnExit(Parameters[I].WinControl); finally ArrangePanel.EnableArrange; --- 1546,1554 ---- end; HandleEnableDisable; ! // for I := 0 to Count - 1 do ! // if Parameters[I].Visible then ! // if Assigned(Parameters[I].WinControl) then ! // if Assigned(THackWinControl(Parameters[I].WinControl).OnExit) then ! // THackWinControl(Parameters[I].WinControl).OnExit(Parameters[I].WinControl); finally ArrangePanel.EnableArrange; *************** *** 1560,1564 **** end; if (ArrangePanel.Height > ScrollBox.Height) {OR ! (ArrangePanel.Height > MaxHeight) } then ScrollBox.AutoScroll := True; end; --- 1572,1576 ---- end; if (ArrangePanel.Height > ScrollBox.Height) {OR ! (ArrangePanel.Height > MaxHeight) }then ScrollBox.AutoScroll := True; end; *************** *** 1653,1658 **** if Width > 0 then Result := Width ! else ! if Assigned(ArrangePanel) then if ArrangePanel.Align in [alTop, alBottom, alClient] then Result := ArrangePanel.ArrangeWidth --- 1665,1669 ---- if Width > 0 then Result := Width ! else if Assigned(ArrangePanel) then if ArrangePanel.Align in [alTop, alBottom, alClient] then Result := ArrangePanel.ArrangeWidth *************** *** 1669,1674 **** if Height > 0 then Result := Height ! else ! if Assigned(ArrangePanel) then begin if ArrangePanel.Align in [alleft, alRight, alClient] then --- 1680,1684 ---- if Height > 0 then Result := Height ! else if Assigned(ArrangePanel) then begin if ArrangePanel.Align in [alleft, alRight, alClient] then Index: JvQLinkLabel.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQLinkLabel.pas,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** JvQLinkLabel.pas 14 May 2004 22:45:25 -0000 1.9 --- JvQLinkLabel.pas 19 May 2004 20:53:12 -0000 1.10 *************** *** 542,546 **** --- 542,548 ---- // Adjust Root start point relative to control's canvas. FNodeTree.Root.StartingPoint := Point(TmpRect.Left, TmpRect.Top); // Bianconi #2 + TmpBmp.Transparent := false; Canvas.Draw(TmpRect.Left,TmpRect.Top,TmpBmp); + TmpBmp.savetofile('C:\Linklabel.bmp'); end; finally Index: JvQLinkedControls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQLinkedControls.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvQLinkedControls.pas 3 Apr 2004 19:10:01 -0000 1.3 --- JvQLinkedControls.pas 19 May 2004 20:53:12 -0000 1.4 *************** *** 112,120 **** procedure TJvLinkedControl.Assign(Source: TPersistent); begin ! if (Source <> Self) and (Source is TJvLinkedControl) then begin ! Control := TJvLinkedControl(Source).Control; ! Options := TJvLinkedControl(Source).Options; ! Changed(False); end else --- 112,123 ---- procedure TJvLinkedControl.Assign(Source: TPersistent); begin ! if Source is TJvLinkedControl then begin ! if Source <> Self then ! begin ! Control := TJvLinkedControl(Source).Control; ! Options := TJvLinkedControl(Source).Options; ! Changed(False); ! end; e... [truncated message content] |