nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-02 03:52:49 -05:00
Code Issues Projects Releases Wiki Activity

Be careful not to try to get information from windows we don't own, or that

Browse Source 
don't exist at all.  Also a small PuTTYgen change that I can't be bothered
to filter out of this commit.

[originally from svn r2874]
This commit is contained in:
Ben Harris
2003-02-20 22:31:52 +00:00
parent fb90fa8650
commit f53c998569
3 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mac/mac.c
View File

@ -1,4 +1,4 @@
/* $Id: mac.c,v 1.49 2003/02/15 16:22:15 ben Exp $ */
/* $Id: mac.c,v 1.50 2003/02/20 22:31:52 ben Exp $ */
/*
* Copyright (c) 1999, 2003 Ben Harris
* All rights reserved.
@ -377,7 +377,7 @@ static int mac_windowtype(WindowPtr window)
static void mac_keypress(EventRecord *event) {
WindowPtr window;
window = FrontWindow();
window = mac_frontwindow();
/*
* Check for a command-key combination, but ignore it if it counts
* as a meta-key combination and we're in a terminal window.
@ -388,7 +388,7 @@ static void mac_keypress(EventRecord *event) {
mac_adjustmenus();
mac_menucommand(MenuKey(event->message & charCodeMask));
} else {
if (mac_wininfo(window)->key != NULL)
if (window != NULL && mac_wininfo(window)->key != NULL)
(*mac_wininfo(window)->key)(window, event);
}
}
@ -402,7 +402,7 @@ static void mac_menucommand(long result) {
menu = HiWord(result);
item = LoWord(result);
window = FrontWindow();
window = mac_frontwindow();
/* Things which do the same whatever window we're in. */
switch (menu) {
case mApple:
@ -445,7 +445,7 @@ static void mac_menucommand(long result) {
break;
}
/* If we get here, handling is up to window-specific code. */
if (mac_wininfo(window)->menu != NULL)
if (window != NULL && mac_wininfo(window)->menu != NULL)
(*mac_wininfo(window)->menu)(window, menu, item);
done:
@ -483,7 +483,7 @@ static void mac_adjustmenus(void) {
WindowPtr window;
MenuHandle menu;
window = FrontWindow();
window = mac_frontwindow();
menu = GetMenuHandle(mApple);
EnableItem(menu, 0);
EnableItem(menu, iAbout);
@ -497,7 +497,7 @@ static void mac_adjustmenus(void) {
DisableItem(menu, iClose);
EnableItem(menu, iQuit);
if (mac_wininfo(window)->adjustmenus != NULL)
if (window != NULL && mac_wininfo(window)->adjustmenus != NULL)
(*mac_wininfo(window)->adjustmenus)(window);
else {
DisableItem(menu, iSave);