| salframeview.mm (bde8a4bd) | salframeview.mm (2dae3561) |
|---|---|
| 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 122 unchanged lines hidden (view full) --- 131} aExceptionalKeys[] = 132{ 133 { KEY_D, NSControlKeyMask | NSShiftKeyMask | NSAlternateKeyMask }, 134 { KEY_D, NSCommandKeyMask | NSShiftKeyMask | NSAlternateKeyMask } 135}; 136 137static AquaSalFrame* getMouseContainerFrame() 138{ | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 122 unchanged lines hidden (view full) --- 131} aExceptionalKeys[] = 132{ 133 { KEY_D, NSControlKeyMask | NSShiftKeyMask | NSAlternateKeyMask }, 134 { KEY_D, NSCommandKeyMask | NSShiftKeyMask | NSAlternateKeyMask } 135}; 136 137static AquaSalFrame* getMouseContainerFrame() 138{ |
| 139 int nWindows = 0; | 139 NSInteger nWindows = 0; |
| 140 NSCountWindows( &nWindows ); | 140 NSCountWindows( &nWindows ); |
| 141 int* pWindows = (int*)alloca( nWindows * sizeof(int) ); | 141 NSInteger* pWindows = (NSInteger*)alloca( nWindows * sizeof(NSInteger) ); |
| 142 // note: NSWindowList is supposed to be in z-order front to back 143 NSWindowList( nWindows, pWindows ); 144 AquaSalFrame* pDispatchFrame = NULL; 145 for(int i = 0; i < nWindows && ! pDispatchFrame; i++ ) 146 { 147 NSWindow* pWin = [NSApp windowWithWindowNumber: pWindows[i]]; 148 if( pWin && [pWin isMemberOfClass: [SalFrameWindow class]] && [(SalFrameWindow*)pWin containsMouse] ) 149 pDispatchFrame = [(SalFrameWindow*)pWin getSalFrame]; --- 1481 unchanged lines hidden (view full) --- 1631 1632- (NSAttributedString *)attributedSubstringFromRange:(NSRange)theRange 1633{ 1634 (void)theRange; 1635 // FIXME 1636 return nil; 1637} 1638 | 142 // note: NSWindowList is supposed to be in z-order front to back 143 NSWindowList( nWindows, pWindows ); 144 AquaSalFrame* pDispatchFrame = NULL; 145 for(int i = 0; i < nWindows && ! pDispatchFrame; i++ ) 146 { 147 NSWindow* pWin = [NSApp windowWithWindowNumber: pWindows[i]]; 148 if( pWin && [pWin isMemberOfClass: [SalFrameWindow class]] && [(SalFrameWindow*)pWin containsMouse] ) 149 pDispatchFrame = [(SalFrameWindow*)pWin getSalFrame]; --- 1481 unchanged lines hidden (view full) --- 1631 1632- (NSAttributedString *)attributedSubstringFromRange:(NSRange)theRange 1633{ 1634 (void)theRange; 1635 // FIXME 1636 return nil; 1637} 1638 |
| 1639- (unsigned int)characterIndexForPoint:(NSPoint)thePoint | 1639- (NSUInteger)characterIndexForPoint:(NSPoint)thePoint |
| 1640{ 1641 (void)thePoint; 1642 // FIXME 1643 return 0; 1644} 1645 1646#if defined(MAC_OS_X_VERSION_10_5) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) 1647/* build target 10.5 or greater */ --- 130 unchanged lines hidden --- | 1640{ 1641 (void)thePoint; 1642 // FIXME 1643 return 0; 1644} 1645 1646#if defined(MAC_OS_X_VERSION_10_5) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) 1647/* build target 10.5 or greater */ --- 130 unchanged lines hidden --- |