From: <tw...@us...> - 2022-02-06 10:50:30
|
Revision: 3809 http://sourceforge.net/p/gexperts/code/3809 Author: twm Date: 2022-02-06 10:50:27 +0000 (Sun, 06 Feb 2022) Log Message: ----------- updated to latest dzlib from OSDN Modified Paths: -------------- trunk/ExternalSource/dzlib/u_dzTypes.pas trunk/ExternalSource/dzlib/u_dzVclUtils.pas Modified: trunk/ExternalSource/dzlib/u_dzTypes.pas =================================================================== --- trunk/ExternalSource/dzlib/u_dzTypes.pas 2022-02-05 11:33:34 UTC (rev 3808) +++ trunk/ExternalSource/dzlib/u_dzTypes.pas 2022-02-06 10:50:27 UTC (rev 3809) @@ -204,6 +204,8 @@ procedure Assign(_Left, _Top, _Width, _Height: Integer); overload; procedure Assign(_a: TRect); overload; procedure AssignTLRB(_Left, _Top, _Right, _Bottom: Integer); + procedure AssignTo(out _Left, _Top, _Width, _Height: Integer); overload; + procedure AssignTo(out _a: TRect); overload; ///<summary> /// Gets and sets the top left coordinates keeping the size </summary> property TopLeft: TPoint read GetTopLeft write SetTopLeft; @@ -246,6 +248,19 @@ Assign(_Left, _Top, _Right - _Left, _Bottom - _Top); end; +procedure TRectLTWH.AssignTo(out _Left, _Top, _Width, _Height: Integer); +begin + _Left := Left; + _Top := Top; + _Width := Width; + _Height := Height; +end; + +procedure TRectLTWH.AssignTo(out _a: TRect); +begin + _a := Rect(Left, Top, Left + Width, Top + Height); +end; + class function TRectLTWH.FromLTWH(_Left, _Top, _Width, _Height: Integer): TRectLTWH; begin Result.Assign(_Left, _Top, _Width, _Height); Modified: trunk/ExternalSource/dzlib/u_dzVclUtils.pas =================================================================== --- trunk/ExternalSource/dzlib/u_dzVclUtils.pas 2022-02-05 11:33:34 UTC (rev 3808) +++ trunk/ExternalSource/dzlib/u_dzVclUtils.pas 2022-02-06 10:50:27 UTC (rev 3809) @@ -1749,7 +1749,7 @@ PdzMonitor = ^TdzMonitor; TdzMonitor = record public - Handle: HMonitor; + Handle: HMONITOR; MonitorNum: Integer; BoundsRect: TRectLTWH; WorkArea: TRectLTWH; @@ -4637,7 +4637,7 @@ var s: string; PosStr: string; - l, t, w, h: Integer; + L, t, w, h: Integer; begin if u_dzOsUtils.IsShiftDown then begin // if the user holds shift, do not restore the form's placement @@ -4649,7 +4649,7 @@ Result := TRegistry_TryReadString(_RegEntry.KeyName, _RegEntry.ValueName, PosStr, _HKEY); if Result then begin s := ExtractStr(PosStr, ','); - if not TryStrToInt(s, l) then + if not TryStrToInt(s, L) then Exit; //==> s := ExtractStr(PosStr, ','); if not TryStrToInt(s, t) then @@ -4661,7 +4661,7 @@ if not TryStrToInt(s, h) then Exit; //==> - _Bounds.Left := l; + _Bounds.Left := L; _Bounds.Top := t; _Bounds.Width := w; _Bounds.Height := h; @@ -5888,12 +5888,12 @@ begin inherited Create; FCtrl := _Ctrl; - SendMessage(FCtrl.Handle, WM_SETREDRAW, wParam(LongBool(False)), 0); + SendMessage(FCtrl.Handle, WM_SETREDRAW, WPARAM(LongBool(False)), 0); end; destructor TWinControlLocker.Destroy; begin - SendMessage(FCtrl.Handle, WM_SETREDRAW, wParam(LongBool(True)), 0); + SendMessage(FCtrl.Handle, WM_SETREDRAW, WPARAM(LongBool(True)), 0); RedrawWindow(FCtrl.Handle, nil, 0, RDW_ERASE or RDW_INVALIDATE or RDW_ALLCHILDREN); inherited; end; @@ -7221,7 +7221,7 @@ { TdzScreen } -function EnumMonitorsProc(hm: HMonitor; dc: HDC; r: PRECT; Data: Pointer): Boolean; stdcall; +function EnumMonitorsProc(hm: HMONITOR; dc: HDC; r: PRECT; Data: Pointer): Boolean; stdcall; var Info: TMonitorInfoEx; M: TdzScreen.PdzMonitor; @@ -7259,4 +7259,3 @@ finalization FreeAndNil(gblCheckListBoxHelper); end. - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |