paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-16 20:09:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

win32: remove duplicate assignments + code cleanup in winprinters

Browse Source 
git-svn-id: trunk@34376 -
This commit is contained in:
blikblum 2011-12-23 22:00:37 +00:00
parent 38263f7b6b
commit 3c74914f9c
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
components/printers/win32/winprinters.inc
View File

@ -485,16 +485,12 @@ procedure TWinPrinter.DoResetPrintersList;
var i : Integer; var i : Integer;
Obj : TObject; Obj : TObject;
begin begin
if Printers.Count>0 then for i:=0 to Printers.Count-1 do
begin begin
for i:=0 to Printers.Count-1 do Obj:=Printers.Objects[i];
begin Printers.Objects[i]:=nil;
Obj:=Printers.Objects[i]; Obj.Free;
Printers.Objects[i]:=nil;
FreeAndNil(Obj);
end;
end; end;
inherited DoResetPrintersList; inherited DoResetPrintersList;
end; end;
@ -688,11 +684,12 @@ function TWinPrinter.DoGetCopies: Integer;
var var
dm: PDeviceMode; dm: PDeviceMode;
begin begin
Result:=inherited DoGetCopies;
if GetCurrentDevMode(dm) then begin if GetCurrentDevMode(dm) then begin
if dm^.dmCopies<>0 then if dm^.dmCopies<>0 then
result := dm^.dmCopies; result := dm^.dmCopies;
end; end
else
Result:=inherited DoGetCopies;
end; end;
procedure TWinPrinter.DoSetCopies(aValue: Integer); procedure TWinPrinter.DoSetCopies(aValue: Integer);
@ -735,7 +732,6 @@ var
Size: Dword; Size: Dword;
InfoPrt: Pointer; InfoPrt: Pointer;
begin begin
Result := inherited GetPrinterType;
Result := ptLocal; Result := ptLocal;
//On Win9X all printers are local //On Win9X all printers are local
if Win32Platform <> VER_PLATFORM_WIN32_NT then Exit; if Win32Platform <> VER_PLATFORM_WIN32_NT then Exit;
@ -761,7 +757,6 @@ var
Size, Status, Jobs : DWord; Size, Status, Jobs : DWord;
InfoPrt: Pointer; InfoPrt: Pointer;
begin begin
Result := inherited DoGetPrinterState;
Result := psNoDefine; Result := psNoDefine;
GetPrinter(fPrinterHandle, 2, nil, 0, @Size); GetPrinter(fPrinterHandle, 2, nil, 0, @Size);
GetMem(InfoPrt,Size); GetMem(InfoPrt,Size);
@ -803,7 +798,6 @@ end;
function TWinPrinter.GetCanPrint: Boolean; function TWinPrinter.GetCanPrint: Boolean;
begin begin
Result := inherited GetCanPrint;
Result := (DoGetPrinterState <> psStopped); Result := (DoGetPrinterState <> psStopped);
end; end;
@ -812,14 +806,15 @@ var
pDev : TPrinterDevice; pDev : TPrinterDevice;
Count : Integer; Count : Integer;
begin begin
Result := inherited GetCanRenderCopies;
if (Printers.Count>0) then if (Printers.Count>0) then
begin begin
PDev:=TPrinterDevice(Printers.Objects[PrinterIndex]); PDev:=TPrinterDevice(Printers.Objects[PrinterIndex]);
Count := DeviceCapabilities(PChar(Pdev.Name),PCHar(PDev.Port), Count := DeviceCapabilities(PChar(Pdev.Name),PCHar(PDev.Port),
DC_COPIES,nil,PDev.DevMode); DC_COPIES,nil,PDev.DevMode);
Result := (Count>1); Result := (Count>1);
end; end
else
Result := inherited GetCanRenderCopies;
end; end;
procedure TWinPrinter.AdvancedProperties; procedure TWinPrinter.AdvancedProperties;