Menu
▾
▴
[JVCL-Checkins] dev/JVCL3/run JvBaseEdits.pas,1.25,1.26 JvButton.pas,1.21,1.22 JvCharMap.pas,1.23,1.24 JvChart.pas,1.17,1.18 JvCheckBox.pas,1.39,1.40 JvColorCombo.pas,1.22,1.23 JvColorForm.pas,1.16,1.17 JvCtrls.pas,1.21,1.22 JvDrawImage.pas,1.16,1.17 JvEnterTab.pas,1.4,1.5 JvErrorIndicator.pas,1.7,1.8 JvInterpreter.pas,1.25,1.26 JvLinkedControls.pas,1.5,1.6 JvOutlookBar.pas,1.21,1.22 JvPageSetupTitled.pas,1.3,1.4 JvRadioButton.pas,1.25,1.26 JvResources.pas,1.43,1.44 JvScrollMax.pas,1.21,1.22 JvSegmentedLEDDisplay.pas,1.33,1.34 JvSimLogic.pas,1.14,1.15 JvSpecialProgress.pas,1.5,1.6 JvSpin.pas,1.29,1.30 JvTFManager.pas,1.23,1.24 JvTFUtils.pas,1.14,1.15 JvTMTimeLine.pas,1.12,1.13 JvTimeLine.pas,1.17,1.18 JvTipOfDay.pas,1.12,1.13 JvTransparentButton.pas,1.14,1.15 JvWaitingGradient.pas,1.4,1.5 JvWinampLabel.pas,1.12,1.13 JvWizard.pas,1.17,1.18 JvYearGrid.pas,1.23,1.24 JvgHint.pas,1.9,1.10 JvxCheckListBox.pas,1.21,1.22 JvxSlider.pas,1.15,1.16 - style cleanup for changed files and directory name Resources
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19690/JVCL3/run Modified Files: JvBaseEdits.pas JvButton.pas JvCharMap.pas JvChart.pas JvCheckBox.pas JvColorCombo.pas JvColorForm.pas JvCtrls.pas JvDrawImage.pas JvEnterTab.pas JvErrorIndicator.pas JvInterpreter.pas JvLinkedControls.pas JvOutlookBar.pas JvPageSetupTitled.pas JvRadioButton.pas JvResources.pas JvScrollMax.pas JvSegmentedLEDDisplay.pas JvSimLogic.pas JvSpecialProgress.pas JvSpin.pas JvTFManager.pas JvTFUtils.pas JvTMTimeLine.pas JvTimeLine.pas JvTipOfDay.pas JvTransparentButton.pas JvWaitingGradient.pas JvWinampLabel.pas JvWizard.pas JvYearGrid.pas JvgHint.pas JvxCheckListBox.pas JvxSlider.pas Log Message: style cleanup for changed files and directory name Resources used throughout Index: JvSimLogic.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvSimLogic.pas,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** JvSimLogic.pas 15 Jan 2004 18:08:20 -0000 1.14 --- JvSimLogic.pas 4 Feb 2004 08:03:12 -0000 1.15 *************** *** 334,340 **** {$IFDEF MSWINDOWS} {$R ..\Resources\JvSimImages.res} - {$ELSE} - {$R ../Resources/JvSimImages.res} {$ENDIF MSWINDOWS} // general bin procedure --- 334,341 ---- {$IFDEF MSWINDOWS} {$R ..\Resources\JvSimImages.res} {$ENDIF MSWINDOWS} + {$IFDEF LINUX} + {$R ../Resources/JvSimImages.res} + {$ENDIF LINUX} // general bin procedure Index: JvColorForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvColorForm.pas,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** JvColorForm.pas 4 Feb 2004 01:02:12 -0000 1.16 --- JvColorForm.pas 4 Feb 2004 08:03:11 -0000 1.17 *************** *** 49,53 **** type ! // (ahuser) TJvColorDialog is not registered as component TJvColorDialog = class(TColorDialog) published --- 49,53 ---- type ! // (ahuser) TJvColorDialog is not registered as component TJvColorDialog = class(TColorDialog) published *************** *** 174,177 **** --- 174,178 ---- {$IFDEF VCL} + procedure TJvColorForm.WMActivate(var Msg: TWMActivate); begin *************** *** 186,200 **** Params.Style := Params.Style and not WS_CAPTION; end; {$ENDIF VCL} {$IFDEF VisualCLX} function TJvColorForm.WidgetFlags: Integer; begin ! Result := inherited WidgetFlags and not Integer(WidgetFlags_WStyle_Title) or ! Integer(WidgetFlags_WType_Popup); end; type ! TJvOpenWidgetControl = class(TWidgetControl); function TJvColorForm.EventFilter(Sender: QObjectH; Event: QEventH): Boolean; --- 187,203 ---- Params.Style := Params.Style and not WS_CAPTION; end; + {$ENDIF VCL} {$IFDEF VisualCLX} + function TJvColorForm.WidgetFlags: Integer; begin ! Result := inherited WidgetFlags and ! not Integer(WidgetFlags_WStyle_Title) or Integer(WidgetFlags_WType_Popup); end; type ! TOpenWidgetControl = class(TWidgetControl); function TJvColorForm.EventFilter(Sender: QObjectH; Event: QEventH): Boolean; *************** *** 207,211 **** QEventType_Hide: if FOwner is TJvColorButton then ! TJvOpenWidgetControl(FOwner).MouseUp(mbLeft, [ssLeft], 0, 0); QEventType_Close: begin --- 210,214 ---- QEventType_Hide: if FOwner is TJvColorButton then ! TOpenWidgetControl(FOwner).MouseUp(mbLeft, [ssLeft], 0, 0); QEventType_Close: begin *************** *** 218,221 **** --- 221,225 ---- Result := inherited EventFilter(Sender, Event); end; + {$ENDIF VisualCLX} Index: JvgHint.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgHint.pas,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** JvgHint.pas 16 Jan 2004 08:31:27 -0000 1.9 --- JvgHint.pas 4 Feb 2004 08:03:12 -0000 1.10 *************** *** 86,90 **** JvgTypes, JvgUtils; ! {$R ..\resources\JvgHint.res} {$IFNDEF USEJVCL} --- 86,90 ---- JvgTypes, JvgUtils; ! {$R ..\Resources\JvgHint.res} {$IFNDEF USEJVCL} Index: JvPageSetupTitled.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvPageSetupTitled.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvPageSetupTitled.pas 5 Jan 2004 22:37:43 -0000 1.3 --- JvPageSetupTitled.pas 4 Feb 2004 08:03:11 -0000 1.4 *************** *** 57,62 **** implementation ! {.$R ..\resources\JvPageSetupTitledRus.res} ! {$R ..\resources\JvPageSetupTitledEng.res} uses --- 57,62 ---- implementation ! {.$R ..\Resources\JvPageSetupTitledRus.res} ! {$R ..\Resources\JvPageSetupTitledEng.res} uses Index: JvxSlider.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvxSlider.pas,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** JvxSlider.pas 20 Jan 2004 20:42:23 -0000 1.15 --- JvxSlider.pas 4 Feb 2004 08:03:12 -0000 1.16 *************** *** 278,282 **** JvJVCLUtils, JvJCLUtils, JvConsts, JvTypes, JvThemes; ! {$R ..\resources\JvxSlider.res} //=== TJvCustomSlider ======================================================== --- 278,282 ---- JvJVCLUtils, JvJCLUtils, JvConsts, JvTypes, JvThemes; ! {$R ..\Resources\JvxSlider.res} //=== TJvCustomSlider ======================================================== Index: JvTimeLine.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTimeLine.pas,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** JvTimeLine.pas 15 Jan 2004 18:08:21 -0000 1.17 --- JvTimeLine.pas 4 Feb 2004 08:03:12 -0000 1.18 *************** *** 478,482 **** JvJVCLUtils, JvThemes; ! {$R ..\resources\JvTimeLine.res} const --- 478,482 ---- JvJVCLUtils, JvThemes; ! {$R ..\Resources\JvTimeLine.res} const Index: JvTFManager.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFManager.pas,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** JvTFManager.pas 3 Feb 2004 21:32:10 -0000 1.23 --- JvTFManager.pas 4 Feb 2004 08:03:12 -0000 1.24 *************** *** 53,56 **** --- 53,57 ---- {$HPPEMIT '#define TDate Controls::TDate'} {$HPPEMIT '#define TTime Controls::TTime'} + type // Redeclaration of this type. It is used in JvTFMonths.TJvTFDrawDWTitleEvent. *************** *** 714,718 **** {$ENDIF VCL} {$IFDEF VisualCLX} ! procedure ActivateHint(Rect: TRect; const AHint: widestring); override; {$ENDIF VisualCLX} procedure ApptHint(Appt: TJvTFAppt; X, Y: Integer; --- 715,719 ---- {$ENDIF VCL} {$IFDEF VisualCLX} ! procedure ActivateHint(Rect: TRect; const AHint: WideString); override; {$ENDIF VisualCLX} procedure ApptHint(Appt: TJvTFAppt; X, Y: Integer; *************** *** 948,952 **** {$IFDEF VCL} property Pages[Index: Integer]: TMetafile read GetPage; ! {$ENDIF} function ConvertMeasure(Value: Integer; FromMeasure, ToMeasure: TJvTFPrinterMeasure; Horizontal: Boolean): Integer; --- 949,953 ---- {$IFDEF VCL} property Pages[Index: Integer]: TMetafile read GetPage; ! {$ENDIF VCL} function ConvertMeasure(Value: Integer; FromMeasure, ToMeasure: TJvTFPrinterMeasure; Horizontal: Boolean): Integer; *************** *** 1062,1066 **** {$HPPEMIT '#undef TTime'} - implementation --- 1063,1066 ---- *************** *** 3770,3779 **** {$ENDIF VCL} - {$IFDEF VisualCLX} - procedure TJvTFHint.ActivateHint(Rect: TRect; const AHint: widestring); - {$ENDIF VisualCLX} {$IFDEF VCL} procedure TJvTFHint.ActivateHint(Rect: TRect; const AHint: string); {$ENDIF VCL} begin PrepTimer(False); --- 3770,3779 ---- {$ENDIF VCL} {$IFDEF VCL} procedure TJvTFHint.ActivateHint(Rect: TRect; const AHint: string); {$ENDIF VCL} + {$IFDEF VisualCLX} + procedure TJvTFHint.ActivateHint(Rect: TRect; const AHint: WideString); + {$ENDIF VisualCLX} begin PrepTimer(False); *************** *** 4386,4398 **** if (FromMeasure = pmPixels) and (ToMeasure = pmInches) then Result := round(Value / PPI * 100) ! else if (FromMeasure = pmPixels) and (ToMeasure = pmMM) then Result := round(Value / PPI * 100 * MMFactor) ! else if (FromMeasure = pmInches) and (ToMeasure = pmPixels) then Result := round(Value / 100 * PPI) ! else if (FromMeasure = pmInches) and (ToMeasure = pmMM) then Result := round(Value * MMFactor) ! else if (FromMeasure = pmMM) and (ToMeasure = pmPixels) then Result := round(Value / MMFactor / 100 * PPI) ! else if (FromMeasure = pmMM) and (ToMeasure = pmInches) then Result := round(Value / MMFactor) else --- 4386,4403 ---- if (FromMeasure = pmPixels) and (ToMeasure = pmInches) then Result := round(Value / PPI * 100) ! else ! if (FromMeasure = pmPixels) and (ToMeasure = pmMM) then Result := round(Value / PPI * 100 * MMFactor) ! else ! if (FromMeasure = pmInches) and (ToMeasure = pmPixels) then Result := round(Value / 100 * PPI) ! else ! if (FromMeasure = pmInches) and (ToMeasure = pmMM) then Result := round(Value * MMFactor) ! else ! if (FromMeasure = pmMM) and (ToMeasure = pmPixels) then Result := round(Value / MMFactor / 100 * PPI) ! else ! if (FromMeasure = pmMM) and (ToMeasure = pmInches) then Result := round(Value / MMFactor) else *************** *** 4402,4407 **** constructor TJvTFPrinter.Create(AOwner: TComponent); begin ! inherited; ! CreateLayout; FMeasure := pmInches; --- 4407,4411 ---- constructor TJvTFPrinter.Create(AOwner: TComponent); begin ! inherited Create(AOwner); CreateLayout; FMeasure := pmInches; *************** *** 4411,4414 **** --- 4415,4428 ---- end; + destructor TJvTFPrinter.Destroy; + begin + FreeDoc; + FBodies.Free; + FPages.Free; + + FPageLayout.Free; + inherited; + end; + procedure TJvTFPrinter.CreateDoc; begin *************** *** 4431,4444 **** end; - destructor TJvTFPrinter.Destroy; - begin - FreeDoc; - FBodies.Free; - FPages.Free; - - FPageLayout.Free; - inherited; - end; - procedure TJvTFPrinter.DrawBody(aCanvas: TCanvas; ARect: TRect; PageNum: Integer); --- 4445,4448 ---- *************** *** 4632,4635 **** --- 4636,4640 ---- end; {$ENDIF VCL} + function TJvTFPrinter.GetPageCount: Integer; begin *************** *** 4859,4879 **** {$IFDEF VCL} if Horizontal then ! begin ! PrinterPPI := Windows.GetDeviceCaps(Printer.Handle, LOGPIXELSX); ! end else - begin PrinterPPI := Windows.GetDeviceCaps(Printer.Handle, LOGPIXELSY); - end; {$ENDIF VCL} {$IFDEF VisualCLX} if Horizontal then ! begin ! PrinterPPI := GetDeviceCaps(Printer.Handle, LOGPIXELSX); ! end else - begin PrinterPPI := GetDeviceCaps(Printer.Handle, LOGPIXELSY); - end; {$ENDIF VisualCLX} Result := Trunc(PrinterPPI / ScreenPPI * Value); --- 4864,4876 ---- {$IFDEF VCL} if Horizontal then ! PrinterPPI := Windows.GetDeviceCaps(Printer.Handle, LOGPIXELSX) else PrinterPPI := Windows.GetDeviceCaps(Printer.Handle, LOGPIXELSY); {$ENDIF VCL} {$IFDEF VisualCLX} if Horizontal then ! PrinterPPI := GetDeviceCaps(Printer.Handle, LOGPIXELSX) else PrinterPPI := GetDeviceCaps(Printer.Handle, LOGPIXELSY); {$ENDIF VisualCLX} Result := Trunc(PrinterPPI / ScreenPPI * Value); *************** *** 4891,4897 **** // SetMargin will catch that case and throw exception case Index of ! 1: FMarginOffsets.Left := Value; ! 2: FMarginOffsets.Top := Value; ! 3: FMarginOffsets.Right := Value; else FMarginOffsets.Bottom := Value; --- 4888,4897 ---- // SetMargin will catch that case and throw exception case Index of ! 1: ! FMarginOffsets.Left := Value; ! 2: ! FMarginOffsets.Top := Value; ! 3: ! FMarginOffsets.Right := Value; else FMarginOffsets.Bottom := Value; Index: JvTMTimeLine.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTMTimeLine.pas,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** JvTMTimeLine.pas 16 Jan 2004 08:31:27 -0000 1.12 --- JvTMTimeLine.pas 4 Feb 2004 08:03:12 -0000 1.13 *************** *** 322,326 **** Consts, JvJVCLUtils, JvThemes; ! {$R ..\resources\JvTMTimeLine.res} const --- 322,326 ---- Consts, JvJVCLUtils, JvThemes; ! {$R ..\Resources\JvTMTimeLine.res} const Index: JvDrawImage.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDrawImage.pas,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** JvDrawImage.pas 1 Feb 2004 22:43:51 -0000 1.16 --- JvDrawImage.pas 4 Feb 2004 08:03:11 -0000 1.17 *************** *** 3090,3094 **** Clip.TransparentColor := RangeTransColor; Canvas.Draw(X,Y, Clip); ! {$ENDIF} myDraw := False; end; --- 3090,3094 ---- Clip.TransparentColor := RangeTransColor; Canvas.Draw(X,Y, Clip); ! {$ENDIF VisualCLX} myDraw := False; end; Index: JvCtrls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvCtrls.pas,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** JvCtrls.pas 31 Jan 2004 18:50:48 -0000 1.21 --- JvCtrls.pas 4 Feb 2004 08:03:11 -0000 1.22 *************** *** 187,191 **** JvThemes, JvJCLUtils; ! {$R ..\resources\JvCtrls.res} const --- 187,191 ---- JvThemes, JvJCLUtils; ! {$R ..\Resources\JvCtrls.res} const Index: JvTFUtils.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFUtils.pas,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** JvTFUtils.pas 3 Feb 2004 21:32:10 -0000 1.14 --- JvTFUtils.pas 4 Feb 2004 08:03:12 -0000 1.15 *************** *** 42,50 **** type ! TJvTFVisibleScrollBars = set of (vsbHorz, vsbVert); EJvTFDateError = class(Exception); TTFDayOfWeek = (dowSunday, dowMonday, dowTuesday, dowWednesday, ! dowThursday, dowFriday, dowSaturday); TTFDaysOfWeek = set of TTFDayOfWeek; --- 42,50 ---- type ! TJvTFVisibleScrollBars = set of (vsbHorz, vsbVert); EJvTFDateError = class(Exception); TTFDayOfWeek = (dowSunday, dowMonday, dowTuesday, dowWednesday, ! dowThursday, dowFriday, dowSaturday); TTFDaysOfWeek = set of TTFDayOfWeek; *************** *** 98,113 **** procedure CalcTextPos(HostRect: TRect; var TextLeft, TextTop: Integer; var TextBounds: TRect; aFont: TFont; aAngle: Integer; ! HAlign: TAlignment; VAlign: TJvTFVAlignment; aTxt: String); procedure DrawAngleText(aCanvas: TCanvas; HostRect: TRect; var TextBounds: TRect; aAngle: Integer; HAlign: TAlignment; ! VAlign: TJvTFVAlignment; aTxt: String); ! Function RectWidth(aRect: TRect): Integer; ! Function RectHeight(aRect: TRect): Integer; function EmptyRect: TRect; function IsClassByName(Obj: TObject; ClassName: ShortString): Boolean; - implementation --- 98,112 ---- procedure CalcTextPos(HostRect: TRect; var TextLeft, TextTop: Integer; var TextBounds: TRect; aFont: TFont; aAngle: Integer; ! HAlign: TAlignment; VAlign: TJvTFVAlignment; aTxt: string); procedure DrawAngleText(aCanvas: TCanvas; HostRect: TRect; var TextBounds: TRect; aAngle: Integer; HAlign: TAlignment; ! VAlign: TJvTFVAlignment; aTxt: string); ! function RectWidth(ARect: TRect): Integer; ! function RectHeight(ARect: TRect): Integer; function EmptyRect: TRect; function IsClassByName(Obj: TObject; ClassName: ShortString): Boolean; implementation *************** *** 122,126 **** RsEInvalidMonthValue = 'Invalid Month Value (%d)'; RsEInvalidDayOfWeekValue = 'Invalid value for day of week (%d)'; ! {$ENDIF USEJVCL} function ExtractYear(aDate: TDateTime): Word; --- 121,125 ---- RsEInvalidMonthValue = 'Invalid Month Value (%d)'; RsEInvalidDayOfWeekValue = 'Invalid value for day of week (%d)'; ! {$ENDIF USEJVCL} function ExtractYear(aDate: TDateTime): Word; *************** *** 161,165 **** FirstDayDOW := DayOfWeek(WorkDate); WorkDate := WorkDate + (DOW - FirstDayDOW); ! If DOW < FirstDayDOW Then WorkDate := WorkDate + 7; --- 160,164 ---- FirstDayDOW := DayOfWeek(WorkDate); WorkDate := WorkDate + (DOW - FirstDayDOW); ! if DOW < FirstDayDOW then WorkDate := WorkDate + 7; *************** *** 170,175 **** Result := ExtractDay(WorkDate); // Finally, check to make sure WorkDate is in the given month ! If Trunc(EncodeDate(Year, Month, 1)) <> Trunc(FirstOfMonth(WorkDate)) Then ! Raise EJvTFDateError.Create(RsEResultDoesNotFallInMonth); end; --- 169,174 ---- Result := ExtractDay(WorkDate); // Finally, check to make sure WorkDate is in the given month ! if Trunc(EncodeDate(Year, Month, 1)) <> Trunc(FirstOfMonth(WorkDate)) then ! raise EJvTFDateError.Create(RsEResultDoesNotFallInMonth); end; *************** *** 177,183 **** var DOW, ! EndOfWeek: Integer; EOM, ! WorkDate: TDateTime; begin // Get the end of the week --- 176,182 ---- var DOW, ! EndOfWeek: Integer; EOM, ! WorkDate: TDateTime; begin // Get the end of the week *************** *** 195,212 **** // Advance WorkDate to the end of the week ! While DOW <> EndOfWeek do ! Begin ! IncBorlDOW(DOW, 1); ! WorkDate := WorkDate + 1; ! End; // We're now on week 1 Result := 1; // Now roll through the rest of the month ! While Trunc(WorkDate) < Trunc(EOM) do ! Begin ! Inc(Result); ! IncWeeks(WorkDate, 1); ! End; end; --- 194,211 ---- // Advance WorkDate to the end of the week ! while DOW <> EndOfWeek do ! begin ! IncBorlDOW(DOW, 1); ! WorkDate := WorkDate + 1; ! end; // We're now on week 1 Result := 1; // Now roll through the rest of the month ! while Trunc(WorkDate) < Trunc(EOM) do ! begin ! Inc(Result); ! IncWeeks(WorkDate, 1); ! end; end; *************** *** 214,218 **** begin BorlDOW := (BorlDOW + (N mod 7)) mod 7; ! If BorlDOW = 0 Then BorlDOW := 7; BorlDOW := Abs(BorlDOW); --- 213,217 ---- begin BorlDOW := (BorlDOW + (N mod 7)) mod 7; ! if BorlDOW = 0 then BorlDOW := 7; BorlDOW := Abs(BorlDOW); *************** *** 235,239 **** end; - procedure IncWeeks(var aDate: TDateTime; N: Integer); // N defaults to 1 --- 234,237 ---- *************** *** 242,246 **** end; - procedure IncMonths(var aDate: TDateTime; N: Integer); // N defaults to 1 --- 240,243 ---- *************** *** 253,262 **** // Be careful not to get invalid date in Feb. ! If M = 2 Then ! Begin ! EOMD := ExtractDay(EndOfMonth(EncodeDate(Y, M, 1))); ! If D > EOMD Then ! D := EOMD; ! End; aDate := EncodeDate(Y, M, D); --- 250,259 ---- // Be careful not to get invalid date in Feb. ! if M = 2 then ! begin ! EOMD := ExtractDay(EndOfMonth(EncodeDate(Y, M, 1))); ! if D > EOMD then ! D := EOMD; ! end; aDate := EncodeDate(Y, M, D); *************** *** 272,281 **** // Be careful not to get invalid date in Feb. ! If M = 2 Then ! Begin ! EOMD := ExtractDay(EndOfMonth(EncodeDate(Y, M, 1))); ! If D > EOMD Then ! D := EOMD; ! End; aDate := EncodeDate(Y, M, D); --- 269,278 ---- // Be careful not to get invalid date in Feb. ! if M = 2 then ! begin ! EOMD := ExtractDay(EndOfMonth(EncodeDate(Y, M, 1))); ! if D > EOMD then ! D := EOMD; ! end; aDate := EncodeDate(Y, M, D); *************** *** 288,296 **** DecodeDate(aDate, Y, M, D); Inc(M); ! If M > 12 Then ! Begin ! M := 1; ! Inc(Y); ! End; Result := EncodeDate(Y, M, 1) - 1; end; --- 285,293 ---- DecodeDate(aDate, Y, M, D); Inc(M); ! if M > 12 then ! begin ! M := 1; ! Inc(Y); ! end; Result := EncodeDate(Y, M, 1) - 1; end; *************** *** 311,322 **** procedure EnsureMonth(Month: Word); begin ! If (Month < 1) or (Month > 12) Then ! Raise EJvTFDateError.CreateFmt(RsEInvalidMonthValue, [Month]); end; procedure EnsureDOW(DOW: Word); begin ! If (DOW < 1) or (DOW > 7) Then ! Raise EJvTFDateError.CreateFmt(RsEInvalidDayOfWeekValue, [DOW]); end; --- 308,319 ---- procedure EnsureMonth(Month: Word); begin ! if (Month < 1) or (Month > 12) then ! raise EJvTFDateError.CreateFmt(RsEInvalidMonthValue, [Month]); end; procedure EnsureDOW(DOW: Word); begin ! if (DOW < 1) or (DOW > 7) then ! raise EJvTFDateError.CreateFmt(RsEInvalidDayOfWeekValue, [DOW]); end; *************** *** 356,362 **** function Lesser(N1, N2: Integer): Integer; begin ! If N1 < N2 Then Result := N1 ! Else Result := N2; end; --- 353,359 ---- function Lesser(N1, N2: Integer): Integer; begin ! if N1 < N2 then Result := N1 ! else Result := N2; end; *************** *** 364,370 **** function Greater(N1, N2: Integer): Integer; begin ! If N1 > N2 Then Result := N1 ! Else Result := N2; end; --- 361,367 ---- function Greater(N1, N2: Integer): Integer; begin ! if N1 > N2 then Result := N1 ! else Result := N2; end; *************** *** 372,383 **** function GetDivLength(TotalLength, DivCount, DivNum: Integer): Integer; begin ! If (DivNum < 0) or (DivNum >= DivCount) Then Result := -1 ! Else ! Begin ! Result := TotalLength div DivCount; ! If DivNum < TotalLength mod DivCount Then ! Inc(Result); ! End; end; --- 369,380 ---- function GetDivLength(TotalLength, DivCount, DivNum: Integer): Integer; begin ! if (DivNum < 0) or (DivNum >= DivCount) then Result := -1 ! else ! begin ! Result := TotalLength div DivCount; ! if DivNum < TotalLength mod DivCount then ! Inc(Result); ! end; end; *************** *** 385,404 **** var Base, ! MakeUp, ! MakeUpWidth: Integer; begin ! If (X < 0) or (X >= TotalLength) Then Result := -1 ! Else ! Begin ! Base := TotalLength div DivCount; ! MakeUp := TotalLength mod DivCount; ! MakeUpWidth := MakeUp * (Base + 1); ! If X < MakeUpWidth Then ! Result := X div (Base + 1) ! Else ! Result := (X - MakeUpWidth) div Base + MakeUp; ! End; end; --- 382,401 ---- var Base, ! MakeUp, ! MakeUpWidth: Integer; begin ! if (X < 0) or (X >= TotalLength) then Result := -1 ! else ! begin ! Base := TotalLength div DivCount; ! MakeUp := TotalLength mod DivCount; ! MakeUpWidth := MakeUp * (Base + 1); ! if X < MakeUpWidth then ! Result := X div (Base + 1) ! else ! Result := (X - MakeUpWidth) div Base + MakeUp; ! end; end; *************** *** 406,425 **** var Base, ! MakeUp, ! MakeUpWidth: Integer; begin ! If (DivNum < 0) or (DivNum >= DivCount) Then Result := -1 ! Else ! Begin ! Base := TotalLength div DivCount; ! MakeUp := TotalLength mod DivCount; ! MakeUpWidth := MakeUp * (Base + 1); ! If DivNum <= MakeUp Then ! Result := DivNum * (Base + 1) ! Else ! Result := (DivNum - MakeUp) * Base + MakeUpWidth; ! End; end; --- 403,422 ---- var Base, ! MakeUp, ! MakeUpWidth: Integer; begin ! if (DivNum < 0) or (DivNum >= DivCount) then Result := -1 ! else ! begin ! Base := TotalLength div DivCount; ! MakeUp := TotalLength mod DivCount; ! MakeUpWidth := MakeUp * (Base + 1); ! if DivNum <= MakeUp then ! Result := DivNum * (Base + 1) ! else ! Result := (DivNum - MakeUp) * Base + MakeUpWidth; ! end; end; *************** *** 448,465 **** // He can be reached at jli...@t-... // ////////////////////////////////////////////////////////////////// procedure CalcTextPos(HostRect: TRect; var TextLeft, TextTop: Integer; var TextBounds: TRect; aFont: TFont; aAngle: Integer; ! HAlign: TAlignment; VAlign: TJvTFVAlignment; aTxt: String); {==========================================================================} { Calculate text pos. depend. on: Font, Escapement, Alignment and length } {--------------------------------------------------------------------------} ! var DC : HDC; ! hSavFont: HFont; ! Size : TSize; ! x,y : Integer; //cStr : array[0..255] of Char; ! PTxt: PChar; ! a, b, c, d: Integer; ! lb, lt, rb, rt: TPoint; begin aAngle := aAngle div 10; --- 445,464 ---- // He can be reached at jli...@t-... // ////////////////////////////////////////////////////////////////// + procedure CalcTextPos(HostRect: TRect; var TextLeft, TextTop: Integer; var TextBounds: TRect; aFont: TFont; aAngle: Integer; ! HAlign: TAlignment; VAlign: TJvTFVAlignment; aTxt: string); {==========================================================================} { Calculate text pos. depend. on: Font, Escapement, Alignment and length } {--------------------------------------------------------------------------} ! var ! DC: HDC; ! hSavFont: HFont; ! Size: TSize; ! x, y: Integer; //cStr : array[0..255] of Char; ! PTxt: PChar; ! a, b, c, d: Integer; ! lb, lt, rb, rt: TPoint; begin aAngle := aAngle div 10; *************** *** 485,555 **** y := 0; ! if aAngle<=90 then ! begin { 1.Quadrant } ! x := 0; ! y := Trunc(Size.cx * sin(aAngle*Pi/180)); ! end ! else if aAngle<=180 then ! begin { 2.Quadrant } ! x := Trunc(Size.cx * -cos(aAngle*Pi/180)); ! y := Trunc(Size.cx * sin(aAngle*Pi/180) + Size.cy * cos((180-aAngle)*Pi/180)); ! end ! else if aAngle<=270 then ! begin { 3.Quadrant } ! x := Trunc(Size.cx * -cos(aAngle*Pi/180) + Size.cy * sin((aAngle-180)*Pi/180)); ! y := Trunc(Size.cy * sin((270-aAngle)*Pi/180)); ! end ! else if aAngle<=360 then ! begin { 4.Quadrant } ! x := Trunc(Size.cy * sin((360-aAngle)*Pi/180)); ! y := 0; ! end; TextLeft := HostRect.Left + x; TextTop := HostRect.Top + y; ! //aRect.Top := aRect.Top + y; ! //aRect.Left := aRect.Left + x; ! x := Abs(Trunc(Size.cx * cos(aAngle*Pi/180))) + Abs(Trunc(Size.cy * sin(aAngle*Pi/180))); ! y := Abs(Trunc(Size.cx * sin(aAngle*Pi/180))) + Abs(Trunc(Size.cy * cos(aAngle*Pi/180))); ! Case HAlign of taCenter: ! //aRect.Left := aRect.Left + ((RectWidth(SaveRect) - X) div 2); TextLeft := TextLeft + ((RectWidth(HostRect) - x) div 2); taRightJustify: ! //aRect.Left := aRect.Left + RectWidth(SaveRect) - X; TextLeft := TextLeft + RectWidth(HostRect) - x; ! End; ! Case VAlign of ! vaCenter : ! //aRect.Top := aRect.Top + ((RectHeight(SaveRect) - Y) div 2); TextTop := TextTop + ((RectHeight(HostRect) - y) div 2); ! vaBottom : ! //aRect.Top := aRect.Top + RectHeight(SaveRect) - Y; TextTop := TextTop + RectHeight(HostRect) - y; ! End; ! //aRect.Right := aRect.Left + X; ! //aRect.Bottom := aRect.Top + Y; //******************************************** // calculate the border areas ! a := Trunc(Size.cy * sin(aAngle*Pi/180)); ! b := Trunc(Size.cy * cos(aAngle*Pi/180)); ! c := Trunc(Size.cx * cos(aAngle*Pi/180)); ! d := Trunc(Size.cx * sin(aAngle*Pi/180)); ! //lt := aRect.TopLeft; lt := Point(TextLeft, TextTop); ! lb := lt; lb.x := lb.x + a; lb.y := lb.y + b; ! rb := lb; rb.x := rb.x + c; rb.y := rb.y - d; ! rt := rb; rt.x := rt.x - a; rt.y := rt.y - b; ! TextBounds.Left := Lesser(Lesser(lt.x,lb.x),Lesser(rb.x,rt.x)); ! TextBounds.Right := Greater(Greater(lt.x,lb.x),Greater(rb.x,rt.x)); ! TextBounds.Top := Lesser(Lesser(lt.y,lb.y),Lesser(rb.y,rt.y)); ! TextBounds.Bottom := Greater(Greater(lt.y,lb.y),Greater(rb.y,rt.y)); //********************************************************************************************* end; --- 484,563 ---- y := 0; ! if aAngle <= 90 then ! begin { 1.Quadrant } ! x := 0; ! y := Trunc(Size.cx * sin(aAngle * Pi / 180)); ! end ! else ! if aAngle <= 180 then ! begin { 2.Quadrant } ! x := Trunc(Size.cx * -cos(aAngle * Pi / 180)); ! y := Trunc(Size.cx * sin(aAngle * Pi / 180) + Size.cy * cos((180 - aAngle) * Pi / 180)); ! end ! else ! if aAngle <= 270 then ! begin { 3.Quadrant } ! x := Trunc(Size.cx * -cos(aAngle * Pi / 180) + Size.cy * sin((aAngle - 180) * Pi / 180)); ! y := Trunc(Size.cy * sin((270 - aAngle) * Pi / 180)); ! end ! else ! if aAngle <= 360 then ! begin { 4.Quadrant } ! x := Trunc(Size.cy * sin((360 - aAngle) * Pi / 180)); ! y := 0; ! end; TextLeft := HostRect.Left + x; TextTop := HostRect.Top + y; ! //ARect.Top := ARect.Top + y; ! //ARect.Left := ARect.Left + x; ! x := Abs(Trunc(Size.cx * cos(aAngle * Pi / 180))) + Abs(Trunc(Size.cy * sin(aAngle * Pi / 180))); ! y := Abs(Trunc(Size.cx * sin(aAngle * Pi / 180))) + Abs(Trunc(Size.cy * cos(aAngle * Pi / 180))); ! case HAlign of taCenter: ! //ARect.Left := ARect.Left + ((RectWidth(SaveRect) - X) div 2); TextLeft := TextLeft + ((RectWidth(HostRect) - x) div 2); taRightJustify: ! //ARect.Left := ARect.Left + RectWidth(SaveRect) - X; TextLeft := TextLeft + RectWidth(HostRect) - x; ! end; ! case VAlign of ! vaCenter: ! //ARect.Top := ARect.Top + ((RectHeight(SaveRect) - Y) div 2); TextTop := TextTop + ((RectHeight(HostRect) - y) div 2); ! vaBottom: ! //ARect.Top := ARect.Top + RectHeight(SaveRect) - Y; TextTop := TextTop + RectHeight(HostRect) - y; ! end; ! //ARect.Right := ARect.Left + X; ! //ARect.Bottom := ARect.Top + Y; //******************************************** // calculate the border areas ! a := Trunc(Size.cy * sin(aAngle * Pi / 180)); ! b := Trunc(Size.cy * cos(aAngle * Pi / 180)); ! c := Trunc(Size.cx * cos(aAngle * Pi / 180)); ! d := Trunc(Size.cx * sin(aAngle * Pi / 180)); ! //lt := ARect.TopLeft; lt := Point(TextLeft, TextTop); ! lb := lt; ! lb.x := lb.x + a; ! lb.y := lb.y + b; ! rb := lb; ! rb.x := rb.x + c; ! rb.y := rb.y - d; ! rt := rb; ! rt.x := rt.x - a; ! rt.y := rt.y - b; ! TextBounds.Left := Lesser(Lesser(lt.x, lb.x), Lesser(rb.x, rt.x)); ! TextBounds.Right := Greater(Greater(lt.x, lb.x), Greater(rb.x, rt.x)); ! TextBounds.Top := Lesser(Lesser(lt.y, lb.y), Lesser(rb.y, rt.y)); ! TextBounds.Bottom := Greater(Greater(lt.y, lb.y), Greater(rb.y, rt.y)); //********************************************************************************************* end; *************** *** 557,561 **** procedure DrawAngleText(aCanvas: TCanvas; HostRect: TRect; var TextBounds: TRect; aAngle: Integer; HAlign: TAlignment; ! VAlign: TJvTFVAlignment; aTxt: String); var {$IFDEF VCL} --- 565,569 ---- procedure DrawAngleText(aCanvas: TCanvas; HostRect: TRect; var TextBounds: TRect; aAngle: Integer; HAlign: TAlignment; ! VAlign: TJvTFVAlignment; aTxt: string); var {$IFDEF VCL} *************** *** 567,573 **** ClipRgn: HRgn; TextLeft, ! TextTop: Integer; begin ! //TxtRect := aRect; //CalcTextPos(TxtRect, aCanvas.Font, aAngle, HAlign, VAlign, aTxt); CalcTextPos(HostRect, TextLeft, TextTop, TextBounds, aCanvas.Font, aAngle, --- 575,581 ---- ClipRgn: HRgn; TextLeft, ! TextTop: Integer; begin ! //TxtRect := ARect; //CalcTextPos(TxtRect, aCanvas.Font, aAngle, HAlign, VAlign, aTxt); CalcTextPos(HostRect, TextLeft, TextTop, TextBounds, aCanvas.Font, aAngle, *************** *** 584,594 **** StrPCopy(PTxt, aTxt); {$IFDEF VCL} ! //ClipRgn := Windows.CreateRectRgn(aRect.Left, aRect.Top, ! // aRect.Right, aRect.Bottom); ClipRgn := Windows.CreateRectRgn(HostRect.Left, HostRect.Top, ! HostRect.Right, HostRect.Bottom); Windows.SelectClipRgn(aCanvas.Handle, ClipRgn); - //Windows.DrawText(aCanvas.Handle, PTxt, -1, TxtRect, Flags); TxtRect := Rect(TextLeft, TextTop, TextLeft + 1, TextTop + 1); --- 592,601 ---- StrPCopy(PTxt, aTxt); {$IFDEF VCL} ! //ClipRgn := Windows.CreateRectRgn(ARect.Left, ARect.Top, ! // ARect.Right, ARect.Bottom); ClipRgn := Windows.CreateRectRgn(HostRect.Left, HostRect.Top, ! HostRect.Right, HostRect.Bottom); Windows.SelectClipRgn(aCanvas.Handle, ClipRgn); //Windows.DrawText(aCanvas.Handle, PTxt, -1, TxtRect, Flags); TxtRect := Rect(TextLeft, TextTop, TextLeft + 1, TextTop + 1); *************** *** 602,609 **** {$IFDEF VisualCLX} ClipRgn := CreateRectRgn(HostRect.Left, HostRect.Top, ! HostRect.Right, HostRect.Bottom); SelectClipRgn(aCanvas.Handle, ClipRgn); - //Windows.DrawText(aCanvas.Handle, PTxt, -1, TxtRect, Flags); TxtRect := Rect(TextLeft, TextTop, TextLeft + 1, TextTop + 1); --- 609,615 ---- {$IFDEF VisualCLX} ClipRgn := CreateRectRgn(HostRect.Left, HostRect.Top, ! HostRect.Right, HostRect.Bottom); SelectClipRgn(aCanvas.Handle, ClipRgn); //Windows.DrawText(aCanvas.Handle, PTxt, -1, TxtRect, Flags); TxtRect := Rect(TextLeft, TextTop, TextLeft + 1, TextTop + 1); *************** *** 616,631 **** {$ENDIF VisualCLX} ! //aRect := TxtRect; end; ! Function RectWidth(aRect: TRect): Integer; ! Begin ! Result := aRect.Right - aRect.Left; ! End; ! Function RectHeight(aRect: TRect): Integer; ! Begin ! Result := aRect.Bottom - aRect.Top; ! End; function EmptyRect: TRect; --- 622,637 ---- {$ENDIF VisualCLX} ! //ARect := TxtRect; end; ! function RectWidth(ARect: TRect): Integer; ! begin ! Result := ARect.Right - ARect.Left; ! end; ! function RectHeight(ARect: TRect): Integer; ! begin ! Result := ARect.Bottom - ARect.Top; ! end; function EmptyRect: TRect; *************** *** 640,647 **** Result := False; ClassRef := Obj.ClassType; ! While (ClassRef <> nil) and not Result do ! If ClassRef.ClassName = ClassName Then Result := True ! Else ClassRef := ClassRef.ClassParent; end; --- 646,653 ---- Result := False; ClassRef := Obj.ClassType; ! while (ClassRef <> nil) and not Result do ! if ClassRef.ClassName = ClassName then Result := True ! else ClassRef := ClassRef.ClassParent; end; *************** *** 649,651 **** end. - --- 655,656 ---- Index: JvTransparentButton.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTransparentButton.pas,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** JvTransparentButton.pas 3 Feb 2004 21:32:10 -0000 1.14 --- JvTransparentButton.pas 4 Feb 2004 08:03:12 -0000 1.15 *************** *** 376,380 **** if FClient is TJvTransparentButton then Result := inherited IsCheckedLinked and (TJvTransparentButton(FClient).Down = (Action as TCustomAction).Checked) ! else if FClient is TJvTransparentButton2 then Result := inherited IsCheckedLinked and (TJvTransparentButton2(FClient).Down = (Action as TCustomAction).Checked) else --- 376,381 ---- if FClient is TJvTransparentButton then Result := inherited IsCheckedLinked and (TJvTransparentButton(FClient).Down = (Action as TCustomAction).Checked) ! else ! if FClient is TJvTransparentButton2 then Result := inherited IsCheckedLinked and (TJvTransparentButton2(FClient).Down = (Action as TCustomAction).Checked) else *************** *** 393,396 **** --- 394,398 ---- // end; + {$ENDIF COMPILER6_UP} *************** *** 406,415 **** end; ! { TJvTransparentButton } constructor TJvTransparentButton.Create(AOwner: TComponent); begin inherited Create(AOwner); ! AllowAllUp := true; FNumGlyphs := 1; FAutoGray := True; --- 408,417 ---- end; ! //=== TJvTransparentButton =================================================== constructor TJvTransparentButton.Create(AOwner: TComponent); begin inherited Create(AOwner); ! AllowAllUp := True; FNumGlyphs := 1; FAutoGray := True; *************** *** 710,714 **** end; ! { aRect contains the bitmap bounds } procedure TJvTransparentButton.DrawTheText(ARect: TRect; Canvas: TCanvas); --- 712,716 ---- end; ! { ARect contains the bitmap bounds } procedure TJvTransparentButton.DrawTheText(ARect: TRect; Canvas: TCanvas); *************** *** 882,890 **** end; ! { TJvTransparentButton2 } constructor TJvTransparentButton2.Create(AOwner: TComponent); begin inherited Create(AOwner); ! AllowAllUp := true; FHiFont := TFont.Create; FHiFont.Assign(Font); --- 884,893 ---- end; ! //=== TJvTransparentButton2 ================================================== ! constructor TJvTransparentButton2.Create(AOwner: TComponent); begin inherited Create(AOwner); ! AllowAllUp := True; FHiFont := TFont.Create; FHiFont.Assign(Font); *************** *** 926,930 **** var Bmp: TBitmap; ! Icon:HICON; begin Bmp := TBitmap.Create; --- 929,933 ---- var Bmp: TBitmap; ! Icon: HICON; begin Bmp := TBitmap.Create; *************** *** 1223,1229 **** TmpRect := Rect(1, 1, Width - 1, Height - 1); ! if (bsMouseDown in MouseStates) then begin ! if not (FrameStyle = fsNone) then begin InflateRect(TmpRect, 1, 1); --- 1226,1232 ---- TmpRect := Rect(1, 1, Width - 1, Height - 1); ! if bsMouseDown in MouseStates then begin ! if FrameStyle <> fsNone then begin InflateRect(TmpRect, 1, 1); *************** *** 1272,1276 **** end; fsExplorer: ! if (bsMouseInside in MouseStates) then Frame3D(Canvas, TmpRect, clBtnHighlight, clBtnShadow, BorderWidth); fsIndent: --- 1275,1279 ---- end; fsExplorer: ! if bsMouseInside in MouseStates then Frame3D(Canvas, TmpRect, clBtnHighlight, clBtnShadow, BorderWidth); fsIndent: *************** *** 1289,1293 **** DrawTheText(TmpRect, Canvas); end; - end; end; --- 1292,1295 ---- *************** *** 1337,1341 **** end; ! { aRect contains the bitmap bounds } procedure TJvTransparentButton2.DrawTheText(ARect: TRect; Canvas: TCanvas); --- 1339,1343 ---- end; ! { ARect contains the bitmap bounds } procedure TJvTransparentButton2.DrawTheText(ARect: TRect; Canvas: TCanvas); *************** *** 1445,1449 **** procedure TJvTransparentButton2.Notification(AComponent: TComponent; Operation: TOperation); begin ! inherited; if Operation = opRemove then begin --- 1447,1451 ---- procedure TJvTransparentButton2.Notification(AComponent: TComponent; Operation: TOperation); begin ! inherited Notification(AComponent, Operation); if Operation = opRemove then begin *************** *** 1462,1466 **** CheckDefaults: Boolean); begin ! inherited; if Sender is TCustomAction then with TCustomAction(Sender) do --- 1464,1468 ---- CheckDefaults: Boolean); begin ! inherited ActionChange(Sender, CheckDefaults); if Sender is TCustomAction then with TCustomAction(Sender) do Index: JvSpin.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvSpin.pas,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** JvSpin.pas 20 Jan 2004 20:42:23 -0000 1.29 --- JvSpin.pas 4 Feb 2004 08:03:12 -0000 1.30 *************** *** 410,414 **** JvJCLUtils, JvConsts, JvResources; ! {$R ..\resources\JvSpin.Res} const --- 410,414 ---- JvJCLUtils, JvConsts, JvResources; ! {$R ..\Resources\JvSpin.Res} const Index: JvCheckBox.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvCheckBox.pas,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** JvCheckBox.pas 3 Feb 2004 22:24:13 -0000 1.39 --- JvCheckBox.pas 4 Feb 2004 08:03:11 -0000 1.40 *************** *** 39,45 **** {$IFDEF VCL} Windows, Messages, Graphics, Controls, Forms, StdCtrls, - {$ELSE} - Types, QWindows, Qt, QGraphics, QControls, QForms, QStdCtrls, {$ENDIF VCL} JvTypes, JvExStdCtrls, JvLinkedControls; --- 39,46 ---- {$IFDEF VCL} Windows, Messages, Graphics, Controls, Forms, StdCtrls, {$ENDIF VCL} + {$IFDEF VisualCLX} + Types, QWindows, Qt, QGraphics, QControls, QForms, QStdCtrls, + {$ENDIF VisualCLX} JvTypes, JvExStdCtrls, JvLinkedControls; *************** *** 274,280 **** ASize: TSize; R: TRect; - {$IFDEF VisualCLX} - ws : WideString; - {$ENDIF} begin if (Parent = nil) or not AutoSize or (csDestroying in ComponentState) or --- 275,278 ---- *************** *** 292,302 **** DrawText(FCanvas.Handle, PChar(Caption), Length(Caption), R, Flags[WordWrap] or DT_LEFT or DT_NOCLIP or DT_CALCRECT); ! {$ELSE} ! FCanvas.start; RequiredState(Fcanvas, [csHandleValid, csFontValid]); DrawTextW(FCanvas.Handle, PWideChar(Caption), -1, R, Flags[WordWrap] or DT_LEFT or DT_NOCLIP or DT_CALCRECT); FCanvas.Stop; ! {$ENDIF VCL} AWidth := (R.Right - R.Left) + ASize.cx + 8; AHeight := R.Bottom - R.Top; --- 290,301 ---- DrawText(FCanvas.Handle, PChar(Caption), Length(Caption), R, Flags[WordWrap] or DT_LEFT or DT_NOCLIP or DT_CALCRECT); ! {$ENDIF VCL} ! {$IFDEF VisualCLX} ! FCanvas.Start; RequiredState(Fcanvas, [csHandleValid, csFontValid]); DrawTextW(FCanvas.Handle, PWideChar(Caption), -1, R, Flags[WordWrap] or DT_LEFT or DT_NOCLIP or DT_CALCRECT); FCanvas.Stop; ! {$ENDIF VisualCLX} AWidth := (R.Right - R.Left) + ASize.cx + 8; AHeight := R.Bottom - R.Top; *************** *** 410,414 **** I: Integer; begin ! if (LinkedControls <> nil) then for I := 0 to LinkedControls.Count - 1 do with LinkedControls[I] do --- 409,413 ---- I: Integer; begin ! if LinkedControls <> nil then for I := 0 to LinkedControls.Count - 1 do with LinkedControls[I] do Index: JvLinkedControls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvLinkedControls.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JvLinkedControls.pas 3 Feb 2004 22:24:13 -0000 1.5 --- JvLinkedControls.pas 4 Feb 2004 08:03:11 -0000 1.6 *************** *** 54,60 **** function GetDisplayName: string; override; public - procedure Assign(Source: TPersistent);override; constructor Create(Collection: TCollection); override; destructor Destroy; override; published property Control: TControl read FControl write SetControl; --- 54,60 ---- function GetDisplayName: string; override; public constructor Create(Collection: TCollection); override; destructor Destroy; override; + procedure Assign(Source: TPersistent);override; published property Control: TControl read FControl write SetControl; *************** *** 88,108 **** implementation ! // TODO -cRESOURCESTRING -oJVCL: move to JvResources ! resourcestring ! RsEOwnerLinkError = 'Cannot link to owner control'; ! ! { TJvLinkedControl } ! 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 ! inherited Assign(Source); ! end; constructor TJvLinkedControl.Create(Collection: TCollection); --- 88,95 ---- implementation ! uses ! JvResources; ! //=== TJvLinkedControl ======================================================= constructor TJvLinkedControl.Create(Collection: TCollection); *************** *** 122,125 **** --- 109,124 ---- end; + 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 + inherited Assign(Source); + end; + function TJvLinkedControl.GetDisplayName: string; begin *************** *** 132,136 **** procedure TJvLinkedControl.SetControl(const Value: TControl); begin ! if (FControl <> Value) then begin if (FOwnerControl = nil) and (Collection is TJvLinkedControls) then --- 131,135 ---- procedure TJvLinkedControl.SetControl(const Value: TControl); begin ! if FControl <> Value then begin if (FOwnerControl = nil) and (Collection is TJvLinkedControls) then *************** *** 168,172 **** end; ! { TJvLinkedControls } function TJvLinkedControls.Add: TJvLinkedControl; --- 167,178 ---- end; ! //=== TJvLinkedControls ====================================================== ! ! constructor TJvLinkedControls.Create(AControl: TControl); ! begin ! inherited Create(AControl, TJvLinkedControl); ! FControl := AControl; ! FRestoreEnabled := True; ! end; function TJvLinkedControls.Add: TJvLinkedControl; *************** *** 177,181 **** procedure TJvLinkedControls.Assign(Source: TPersistent); ! var i:Integer; begin if (Source <> Self) and (Source is TJvLinkedControls) then --- 183,188 ---- procedure TJvLinkedControls.Assign(Source: TPersistent); ! var ! I: Integer; begin if (Source <> Self) and (Source is TJvLinkedControls) then *************** *** 184,189 **** try Clear; ! for i := 0 to TJvLinkedControls(Source).Count - 1 do ! Add.Assign(TJvLinkedControls(Source)[i]); RestoreEnabled := TJvLinkedControls(Source).RestoreEnabled; finally --- 191,196 ---- try Clear; ! for I := 0 to TJvLinkedControls(Source).Count - 1 do ! Add.Assign(TJvLinkedControls(Source)[I]); RestoreEnabled := TJvLinkedControls(Source).RestoreEnabled; finally *************** *** 195,205 **** end; - constructor TJvLinkedControls.Create(AControl: TControl); - begin - inherited Create(AControl, TJvLinkedControl); - FControl := AControl; - FRestoreEnabled := True; - end; - function TJvLinkedControls.GetItems(Index: Integer): TJvLinkedControl; begin --- 202,205 ---- *************** *** 208,214 **** procedure TJvLinkedControls.Notification(AComponent: TComponent; Operation: TOperation); ! var i:Integer; begin ! // make sure the owning controls isn't being destroyed. if Assigned(FControl) and (csDestroying in FControl.ComponentState) then Exit; --- 208,215 ---- procedure TJvLinkedControls.Notification(AComponent: TComponent; Operation: TOperation); ! var ! I: Integer; begin ! // make sure the owning control isn't being destroyed if Assigned(FControl) and (csDestroying in FControl.ComponentState) then Exit; *************** *** 216,222 **** try if (AComponent is TControl) and (Operation = opRemove) then ! for i := 0 to Count - 1 do ! if Items[i].Control = AComponent then ! Items[i].Control := nil; finally EndUpdate; --- 217,223 ---- try if (AComponent is TControl) and (Operation = opRemove) then ! for I := 0 to Count - 1 do ! if Items[I].Control = AComponent then ! Items[I].Control := nil; finally EndUpdate; *************** *** 235,239 **** if Item <> nil then TJvLinkedControl(Item).FOwnerControl := FControl; ! if Assigned(FOnChange) then FOnChange(Self); end; --- 236,241 ---- if Item <> nil then TJvLinkedControl(Item).FOwnerControl := FControl; ! if Assigned(FOnChange) then ! FOnChange(Self); end; Index: JvSegmentedLEDDisplay.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvSegmentedLEDDisplay.pas,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** JvSegmentedLEDDisplay.pas 31 Jan 2004 18:50:48 -0000 1.33 --- JvSegmentedLEDDisplay.pas 4 Feb 2004 08:03:11 -0000 1.34 *************** *** 382,386 **** JclGraphUtils, JvThemes, JvConsts, JvResources; ! {$R ..\resources\JvSegmentedLEDDisplay.res} var --- 382,386 ---- JclGraphUtils, JvThemes, JvConsts, JvResources; ! {$R ..\Resources\JvSegmentedLEDDisplay.res} var Index: JvRadioButton.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvRadioButton.pas,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** JvRadioButton.pas 3 Feb 2004 22:24:14 -0000 1.25 --- JvRadioButton.pas 4 Feb 2004 08:03:11 -0000 1.26 *************** *** 73,77 **** function GetLinkedControls: TJvLinkedControls; procedure SetLinkedControls(const Value: TJvLinkedControls); ! procedure BmSetCheck(var Msg:TMessage); message BM_SETCHECK; protected procedure Notification(AComponent: TComponent; Operation: TOperation);override; --- 73,77 ---- function GetLinkedControls: TJvLinkedControls; procedure SetLinkedControls(const Value: TJvLinkedControls); ! procedure BMSetCheck(var Msg:TMessage); message BM_SETCHECK; protected procedure Notification(AComponent: TComponent; Operation: TOperation);override; *************** *** 340,344 **** I: Integer; begin ! if (LinkedControls <> nil) then for I := 0 to LinkedControls.Count - 1 do with LinkedControls[I] do --- 340,344 ---- I: Integer; begin ! if LinkedControls <> nil then for I := 0 to LinkedControls.Count - 1 do with LinkedControls[I] do *************** *** 365,369 **** end; ! procedure TJvRadioButton.BmSetCheck(var Msg: TMessage); begin inherited; --- 365,369 ---- end; ! procedure TJvRadioButton.BMSetCheck(var Msg: TMessage); begin inherited; Index: JvScrollMax.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvScrollMax.pas,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** JvScrollMax.pas 20 Jan 2004 20:42:23 -0000 1.21 --- JvScrollMax.pas 4 Feb 2004 08:03:11 -0000 1.22 *************** *** 322,326 **** { Cursors resources } ! {$R ..\resources\JvScrollMax.res} function PanelBorder(Panel: TCustomPanel): Integer; --- 322,326 ---- { Cursors resources } ! {$R ..\Resources\JvScrollMax.res} function PanelBorder(Panel: TCustomPanel): Integer; Index: JvEnterTab.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvEnterTab.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvEnterTab.pas 5 Jan 2004 22:37:42 -0000 1.4 --- JvEnterTab.pas 4 Feb 2004 08:03:11 -0000 1.5 *************** *** 61,65 **** Forms, StdCtrls; ! {$R ..\resources\JvEnterTab.res} constructor TJvEnterAsTab.Create(AOwner: TComponent); --- 61,65 ---- Forms, StdCtrls; ! {$R ..\Resources\JvEnterTab.res} constructor TJvEnterAsTab.Create(AOwner: TComponent); Index: JvInterpreter.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvInterpreter.pas,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** JvInterpreter.pas 28 Jan 2004 09:23:51 -0000 1.25 --- JvInterpreter.pas 4 Feb 2004 08:03:11 -0000 1.26 *************** *** 1080,1084 **** JvConsts, JvInterpreterConst, JvJVCLUtils, JvJCLUtils, JvResources, JvTypes; ! {$R ..\resources\JvInterpreter.res} { error messages } { internal structures } --- 1080,1084 ---- JvConsts, JvInterpreterConst, JvJVCLUtils, JvJCLUtils, JvResources, JvTypes; ! {$R ..\Resources\JvInterpreter.res} { error messages } { internal structures } Index: JvChart.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvChart.pas,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** JvChart.pas 4 Feb 2004 01:02:10 -0000 1.17 --- JvChart.pas 4 Feb 2004 08:03:11 -0000 1.18 *************** *** 2394,2398 **** FYFont.Handle := FYFontHandle; end; ! {$ENDIF} procedure TJvChart.MyHeader(strText: string); --- 2394,2398 ---- FYFont.Handle := FYFontHandle; end; ! {$ENDIF VCL} procedure TJvChart.MyHeader(strText: string); Index: JvButton.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvButton.pas,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** JvButton.pas 3 Feb 2004 21:32:09 -0000 1.21 --- JvButton.pas 4 Feb 2004 08:03:11 -0000 1.22 *************** *** 98,113 **** ! property AllowAllUp: Boolean read FAllowAllUp write SetAllowAllUp default false; property GroupIndex: Integer read FGroupIndex write SetGroupIndex default 0; property MouseStates: TJvButtonMouseStates read FStates write FStates default []; ! property ForceSameSize: Boolean read FForceSameSize write SetForceSameSize default false; property Pattern: TBitmap read GetPattern; ! property Flat: Boolean read FFlat write SetFlat default true; ! property HotTrack: Boolean read FHotTrack write FHotTrack default false; property HotTrackFont: TFont read FHotFont write SetHotFont; property HotTrackFontOptions: TJvTrackFontOptions read FHotTrackFontOptions write SetHotTrackFontOptions default DefaultTrackFontOptions; ! property Down: Boolean read FDown write SetDown default false; property DropDownMenu: TPopupMenu read FDropDownMenu write FDropDownMenu; --- 98,113 ---- ! property AllowAllUp: Boolean read FAllowAllUp write SetAllowAllUp default False; property GroupIndex: Integer read FGroupIndex write SetGroupIndex default 0; property MouseStates: TJvButtonMouseStates read FStates write FStates default []; ! property ForceSameSize: Boolean read FForceSameSize write SetForceSameSize default False; property Pattern: TBitmap read GetPattern; ! property Flat: Boolean read FFlat write SetFlat default True; ! property HotTrack: Boolean read FHotTrack write FHotTrack default False; property HotTrackFont: TFont read FHotFont write SetHotFont; property HotTrackFontOptions: TJvTrackFontOptions read FHotTrackFontOptions write SetHotTrackFontOptions default DefaultTrackFontOptions; ! property Down: Boolean read FDown write SetDown default False; property DropDownMenu: TPopupMenu read FDropDownMenu write FDropDownMenu; *************** *** 147,154 **** function GetRealCaption: string; dynamic; procedure Notification(AComponent: TComponent; Operation: TOperation); override; ! property WordWrap: Boolean read FWordWrap write SetWordWrap default true; ! property ForceSameSize: Boolean read FForceSameSize write SetForceSameSize default false; property DropDownMenu: TPopupMenu read FDropDownMenu write FDropDownMenu; ! property HotTrack: Boolean read FHotTrack write FHotTrack default false; property HotTrackFont: TFont read FHotFont write SetHotFont; property HotTrackFontOptions: TJvTrackFontOptions read FHotTrackFontOptions write SetHotTrackFontOptions default --- 147,154 ---- function GetRealCaption: string; dynamic; procedure Notification(AComponent: TComponent; Operation: TOperation); override; ! property WordWrap: Boolean read FWordWrap write SetWordWrap default True; ! property ForceSameSize: Boolean read FForceSameSize write SetForceSameSize default False; property DropDownMenu: TPopupMenu read FDropDownMenu write FDropDownMenu; ! property HotTrack: Boolean read FHotTrack write FHotTrack default False; property HotTrackFont: TFont read FHotFont write SetHotFont; property HotTrackFontOptions: TJvTrackFontOptions read FHotTrackFontOptions write SetHotTrackFontOptions default *************** *** 211,216 **** SetBounds(0, 0, 40, 40); FBuffer := TBitmap.Create; ! FFlat := true; ! FForceSameSize := false; FHotFont := TFont.Create; FHotTrackFontOptions := DefaultTrackFontOptions; --- 211,216 ---- SetBounds(0, 0, 40, 40); FBuffer := TBitmap.Create; ! FFlat := True; ! FForceSameSize := False; FHotFont := TFont.Create; FHotTrackFontOptions := DefaultTrackFontOptions; *************** *** 356,361 **** DropDownMenu.PopupComponent := Self; case DropDownMenu.Alignment of ! paRight: Inc(X,Width); ! paCenter: Inc(X,Width div 2); end; DropDownMenu.Popup(X, Y); --- 356,363 ---- DropDownMenu.PopupComponent := Self; case DropDownMenu.Alignment of ! paRight: ! Inc(X, Width); ! paCenter: ! Inc(X, Width div 2); end; DropDownMenu.Popup(X, Y); *************** *** 368,372 **** repeat Application.ProcessMessages; // (ahuser) does this really do the job? ! until QWidget_isVisible(DropDownMenu.handle) = false; // (asn) it did not, now it does {$ENDIF VisualCLX} { release button } --- 370,374 ---- repeat Application.ProcessMessages; // (ahuser) does this really do the job? ! until not QWidget_isVisible(DropDownMenu.handle); // (asn) it did not, now it does {$ENDIF VisualCLX} { release button } *************** *** 391,395 **** Operation: TOperation); begin ! inherited; if (Operation = opRemove) and (AComponent = DropDownMenu) then DropDownMenu := nil; --- 393,397 ---- Operation: TOperation); begin ! inherited Notification(AComponent, Operation); if (Operation = opRemove) and (AComponent = DropDownMenu) then DropDownMenu := nil; *************** *** 399,406 **** begin if GroupIndex <> 0 then ! Value := false; if FDown <> Value then begin ! if FDown and (not AllowAllUp) then Exit; FDown := Value; --- 401,408 ---- begin if GroupIndex <> 0 then ! Value := False; if FDown <> Value then begin ! if FDown and not AllowAllUp then Exit; FDown := Value; *************** *** 502,506 **** if Sender.Down and Down then begin ! Down := false; Exclude(FStates, bsMouseDown); RepaintBackground; --- 504,508 ---- if Sender.Down and Down then begin ! Down := False; Exclude(FStates, bsMouseDown); RepaintBackground; *************** *** 552,562 **** inherited Create(AOwner); FColor := clInfoBk; ! FHotTrack := false; FHotFont := TFont.Create; FFontSave := TFont.Create; // ControlStyle := ControlStyle + [csAcceptsControls]; ! FOver := false; ! FWordWrap := true; ! FForceSameSize := false; FHotTrackFontOptions := DefaultTrackFontOptions; end; --- 554,564 ---- inherited Create(AOwner); FColor := clInfoBk; ! FHotTrack := False; FHotFont := TFont.Create; FFontSave := TFont.Create; // ControlStyle := ControlStyle + [csAcceptsControls]; ! FOver := False; ! FWordWrap := True; ! FForceSameSize := False; FHotTrackFontOptions := DefaultTrackFontOptions; end; *************** *** 619,623 **** Font.Assign(FHotFont); end; ! FOver := true; inherited MouseEnter(Control); end; --- 621,625 ---- Font.Assign(FHotFont); end; ! FOver := True; inherited MouseEnter(Control); ... [truncated message content] |