paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-08 15:27:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

win32: clean up

Browse Source 
git-svn-id: trunk@51799 -
This commit is contained in:
ondrej 2016-03-02 06:41:52 +00:00
parent f7158c1393
commit 9c843a9ea8
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lcl/interfaces/win32/win32wsdialogs.pp
View File

@ -885,7 +885,6 @@ var
Dialog: IFileOpenDialog; Dialog: IFileOpenDialog;
begin begin
if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then
//if (WindowsVersion >= wvVista) and ThemeServices.ThemesEnabled then
begin begin
if Succeeded(CoCreateInstance(CLSID_FileOpenDialog, nil, CLSCTX_INPROC_SERVER, IFileOpenDialog, Dialog)) and Assigned(Dialog) then if Succeeded(CoCreateInstance(CLSID_FileOpenDialog, nil, CLSCTX_INPROC_SERVER, IFileOpenDialog, Dialog)) and Assigned(Dialog) then
begin begin
@ -906,7 +905,6 @@ var
begin begin
if ACommonDialog.Handle <> 0 then if ACommonDialog.Handle <> 0 then
if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then
//if (WindowsVersion >= wvVista) and ThemeServices.ThemesEnabled then
begin begin
Dialog := IFileDialog(ACommonDialog.Handle); Dialog := IFileDialog(ACommonDialog.Handle);
Dialog._Release; Dialog._Release;
@ -928,9 +926,9 @@ begin
lOldWorkingDir := GetCurrentDirUTF8; lOldWorkingDir := GetCurrentDirUTF8;
try try
lInitialDir := TOpenDialog(ACommonDialog).InitialDir; lInitialDir := TOpenDialog(ACommonDialog).InitialDir;
if lInitialDir <> '' then SetCurrentDirUTF8(lInitialDir); if lInitialDir <> '' then
SetCurrentDirUTF8(lInitialDir);
if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then
//if (WindowsVersion >= wvVista) and ThemeServices.ThemesEnabled then
begin begin
Dialog := IFileOpenDialog(ACommonDialog.Handle); Dialog := IFileOpenDialog(ACommonDialog.Handle);
VistaDialogShowModal(Dialog, TOpenDialog(ACommonDialog)); VistaDialogShowModal(Dialog, TOpenDialog(ACommonDialog));
@ -954,7 +952,6 @@ var
Dialog: IFileSaveDialog; Dialog: IFileSaveDialog;
begin begin
if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then
//if (WindowsVersion >= wvVista) and ThemeServices.ThemesEnabled then
begin begin
if Succeeded(CoCreateInstance(CLSID_FileSaveDialog, nil, CLSCTX_INPROC_SERVER, IFileSaveDialog, Dialog)) if Succeeded(CoCreateInstance(CLSID_FileSaveDialog, nil, CLSCTX_INPROC_SERVER, IFileSaveDialog, Dialog))
and Assigned(Dialog) then and Assigned(Dialog) then
@ -976,7 +973,6 @@ var
begin begin
if ACommonDialog.Handle <> 0 then if ACommonDialog.Handle <> 0 then
if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then
//if (WindowsVersion >= wvVista) and ThemeServices.ThemesEnabled then
begin begin
Dialog := IFileDialog(ACommonDialog.Handle); Dialog := IFileDialog(ACommonDialog.Handle);
Dialog._Release; Dialog._Release;
@ -998,9 +994,9 @@ begin
lOldWorkingDir := GetCurrentDirUTF8; lOldWorkingDir := GetCurrentDirUTF8;
try try
lInitialDir := TSaveDialog(ACommonDialog).InitialDir; lInitialDir := TSaveDialog(ACommonDialog).InitialDir;
if lInitialDir <> '' then SetCurrentDirUTF8(lInitialDir); if lInitialDir <> '' then
SetCurrentDirUTF8(lInitialDir);
if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then
//if (WindowsVersion >= wvVista) and ThemeServices.ThemesEnabled then
begin begin
Dialog := IFileSaveDialog(ACommonDialog.Handle); Dialog := IFileSaveDialog(ACommonDialog.Handle);
TWin32WSOpenDialog.VistaDialogShowModal(Dialog, TOpenDialog(ACommonDialog)); TWin32WSOpenDialog.VistaDialogShowModal(Dialog, TOpenDialog(ACommonDialog));
@ -1134,7 +1130,6 @@ var
Dialog: IFileOpenDialog; Dialog: IFileOpenDialog;
begin begin
if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then
//if (WindowsVersion >= wvVista) and ThemeServices.ThemesEnabled then
begin begin
if Succeeded(CoCreateInstance(CLSID_FileOpenDialog, nil, CLSCTX_INPROC_SERVER, IFileOpenDialog, Dialog)) and Assigned(Dialog) then if Succeeded(CoCreateInstance(CLSID_FileOpenDialog, nil, CLSCTX_INPROC_SERVER, IFileOpenDialog, Dialog)) and Assigned(Dialog) then
begin begin

2
lcl/interfaces/win32/win32wsextdlgs.pp
View File

@ -158,7 +158,6 @@ var
fos: FILEOPENDIALOGOPTIONS; fos: FILEOPENDIALOGOPTIONS;
begin begin
Result := inherited CreateHandle(ACommonDialog); Result := inherited CreateHandle(ACommonDialog);
//if (WindowsVersion >= wvVista) and ThemeServices.ThemesEnabled then
if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then
begin begin
Dialog := IFileOpenDialog(Result); Dialog := IFileOpenDialog(Result);
@ -201,7 +200,6 @@ var
fos: FILEOPENDIALOGOPTIONS; fos: FILEOPENDIALOGOPTIONS;
begin begin
Result := inherited CreateHandle(ACommonDialog); Result := inherited CreateHandle(ACommonDialog);
//if (WindowsVersion >= wvVista) and ThemeServices.ThemesEnabled then
if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then if CanUseVistaDialogs(TOpenDialog(ACommonDialog)) then
begin begin
Dialog := IFileSaveDialog(Result); Dialog := IFileSaveDialog(Result);