X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/d082ac49971a1c1a9e84c5b201c30aab675f154f..1951eebc43dea8e45a1f745675db63e11624a65b:/mac/mac.c diff --git a/mac/mac.c b/mac/mac.c index add219b7..9e53c630 100644 --- a/mac/mac.c +++ b/mac/mac.c @@ -1,4 +1,4 @@ -/* $Id: mac.c,v 1.1 2002/11/19 02:13:46 ben Exp $ */ +/* $Id: mac.c,v 1.3 2002/11/23 18:22:47 ben Exp $ */ /* * Copyright (c) 1999 Ben Harris * All rights reserved. @@ -41,7 +41,6 @@ #include #include #include -#include #include #include @@ -115,13 +114,6 @@ static void mac_startup(void) { InitDialogs(nil); cold = 0; - /* Check for the Thread Manager. Bail out if it's not there. */ - if (Gestalt(gestaltThreadMgrAttr, &mac_gestalts.thdsattr) != noErr || - !(mac_gestalts.thdsattr & (1 << gestaltThreadMgrPresent)) || - &NewThread == kUnresolvedCFragSymbolAddress) - fatalbox("PuTTY requires the Thread Manager in order to operate. " - "The Thread Manager can be obtained from Apple Software " - "Updates."); /* Find out if we've got Color Quickdraw */ if (Gestalt(gestaltQuickdrawVersion, &mac_gestalts.qdvers) != noErr) mac_gestalts.qdvers = gestaltOriginalQD; @@ -173,7 +165,6 @@ static void mac_eventloop(void) { mac_adjustcursor(cursrgn); if (gotevent) mac_event(&event); - YieldToAnyThread(); } DisposeRgn(cursrgn); } @@ -407,13 +398,14 @@ static void mac_openabout(void) { SelectWindow(windows.about); else { windows.about = GetNewDialog(wAbout, NULL, (WindowPtr)-1); - /* XXX check we're using the right resource file? */ - vers = (VersRecHndl)GetResource('vers', 1); - assert(vers != NULL && *vers != NULL); - longvers = (*vers)->shortVersion + (*vers)->shortVersion[0] + 1; - GetDialogItem(windows.about, wiAboutVersion, &itemtype, &item, &box); - assert(itemtype & kStaticTextDialogItem); - SetDialogItemText(item, longvers); + vers = (VersRecHndl)Get1Resource('vers', 1); + if (vers != NULL && *vers != NULL) { + longvers = (*vers)->shortVersion + (*vers)->shortVersion[0] + 1; + GetDialogItem(windows.about, wiAboutVersion, + &itemtype, &item, &box); + assert(itemtype & kStaticTextDialogItem); + SetDialogItemText(item, longvers); + } ShowWindow(windows.about); } }