From 4db59e33749b384409824e7dc6b56577ad3d173b Mon Sep 17 00:00:00 2001 From: paul Date: Tue, 7 Apr 2009 01:42:16 +0000 Subject: [PATCH] qt, carbon: improve EnumDisplayMonitors git-svn-id: trunk@19261 - --- lcl/interfaces/carbon/carbonwinapi.inc | 3 +++ lcl/interfaces/qt/qtwinapi.inc | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lcl/interfaces/carbon/carbonwinapi.inc b/lcl/interfaces/carbon/carbonwinapi.inc index 919927e5ea..003df38312 100644 --- a/lcl/interfaces/carbon/carbonwinapi.inc +++ b/lcl/interfaces/carbon/carbonwinapi.inc @@ -799,7 +799,10 @@ begin 'TCarbonWidgetSet.EnumDisplayMonitors', 'CGGetActiveDisplayList') then Exit(False); Result := True; for i := 0 to Count - 1 do + begin Result := Result and lpfnEnum(HMONITOR(activeDspys[i]), 0, nil, dwData); + if not Result then break; + end; end; function TCarbonWidgetSet.EnumFontFamilies(DC: HDC; Family: Pchar; diff --git a/lcl/interfaces/qt/qtwinapi.inc b/lcl/interfaces/qt/qtwinapi.inc index 305f5b23cf..12c651b3cb 100644 --- a/lcl/interfaces/qt/qtwinapi.inc +++ b/lcl/interfaces/qt/qtwinapi.inc @@ -1331,9 +1331,12 @@ var Desktop: QDesktopWidgetH; begin Desktop := QApplication_desktop(); - for i := 0 to QDesktopWidget_numScreens(Desktop) - 1 do - lpfnEnum(i, 0, nil, dwData); Result := True; + for i := 0 to QDesktopWidget_numScreens(Desktop) - 1 do + begin + Result := Result and lpfnEnum(i, 0, nil, dwData); + if not Result then break; + end; end;