vclnsapp.mm (bde8a4bd) | vclnsapp.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 --- 65 unchanged lines hidden (view full) --- 74 // b) Cmd-W is the same in all languages in on MacOS 75 // for now this seems to be true 76 unsigned int nModMask = ([pEvent modifierFlags] & (NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask)); 77 if( (pFrame->mnStyleMask & NSClosableWindowMask) != 0 ) 78 { 79 if( nModMask == NSCommandKeyMask 80 && [[pEvent charactersIgnoringModifiers] isEqualToString: @"w"] ) 81 { | 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 --- 65 unchanged lines hidden (view full) --- 74 // b) Cmd-W is the same in all languages in on MacOS 75 // for now this seems to be true 76 unsigned int nModMask = ([pEvent modifierFlags] & (NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask)); 77 if( (pFrame->mnStyleMask & NSClosableWindowMask) != 0 ) 78 { 79 if( nModMask == NSCommandKeyMask 80 && [[pEvent charactersIgnoringModifiers] isEqualToString: @"w"] ) 81 { |
82 [pFrame->getNSWindow() windowShouldClose: nil]; | 82 [(SalFrameWindow*)pFrame->getNSWindow() windowShouldClose: nil]; |
83 return; 84 } 85 } 86 87 /* 88 * #i98949# - Cmd-M miniaturize window, Cmd-Option-M miniaturize all windows 89 */ 90 if( [[pEvent charactersIgnoringModifiers] isEqualToString: @"m"] ) --- 429 unchanged lines hidden --- | 83 return; 84 } 85 } 86 87 /* 88 * #i98949# - Cmd-M miniaturize window, Cmd-Option-M miniaturize all windows 89 */ 90 if( [[pEvent charactersIgnoringModifiers] isEqualToString: @"m"] ) --- 429 unchanged lines hidden --- |