summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-06-03 08:45:04 +0300
committerTor Lillqvist <tml@collabora.com>2014-06-11 09:29:17 +0300
commit5ca6c22bd37ce0768078ea1edac201bcf8f3b9ee (patch)
treef83e771931376eda09f8e58d02fe15b0fbecaca2
parent285607d73a354e72066787dfac05079793270714 (diff)
WaE: 'NSCountWindows' is deprecated: first deprecated in OS X 10.6
Change-Id: I7163d3821ac0dfc0d471cf31e98f72953c78d878
-rw-r--r--vcl/osx/salframeview.mm10
1 files changed, 3 insertions, 7 deletions
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 6825c9b1559a..45bce9986c4f 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -165,15 +165,11 @@ static const struct ExceptionalKey
static AquaSalFrame* getMouseContainerFrame()
{
- NSInteger nWindows = 0;
- NSCountWindows( &nWindows );
- NSInteger* pWindows = (NSInteger*)alloca( nWindows * sizeof(NSInteger) );
- // note: NSWindowList is supposed to be in z-order front to back
- NSWindowList( nWindows, pWindows );
+ NSArray* aWindows = [NSWindow windowNumbersWithOptions:0];
AquaSalFrame* pDispatchFrame = NULL;
- for(int i = 0; i < nWindows && ! pDispatchFrame; i++ )
+ for(NSUInteger i = 0; i < [aWindows count] && ! pDispatchFrame; i++ )
{
- NSWindow* pWin = [NSApp windowWithWindowNumber: pWindows[i]];
+ NSWindow* pWin = [NSApp windowWithWindowNumber:[[aWindows objectAtIndex:i] integerValue]];
if( pWin && [pWin isMemberOfClass: [SalFrameWindow class]] && [(SalFrameWindow*)pWin containsMouse] )
pDispatchFrame = [(SalFrameWindow*)pWin getSalFrame];
}