summaryrefslogtreecommitdiffstats
path: root/generic/tkFrame.c
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-02-10 08:52:32 (GMT)
committerhobbs <hobbs>2000-02-10 08:52:32 (GMT)
commit6e3c3db8630f629578ea034020ae7d920aadf4ce (patch)
tree40bf71711635d8e5ad5dc9afe14eb82905661051 /generic/tkFrame.c
parent6f20b944ba77825f85992c2f0bcff2dc497236df (diff)
downloadtk-6e3c3db8630f629578ea034020ae7d920aadf4ce.zip
tk-6e3c3db8630f629578ea034020ae7d920aadf4ce.tar.gz
tk-6e3c3db8630f629578ea034020ae7d920aadf4ce.tar.bz2
* generic/tkImgGIF.c (FileReadGIF): added cast for trashBuffer
* generic/tkIntXlibDecls.h: * generic/tkInt.decls: declared some Xlib emulation calls for the Mac * generic/tkFrame.c (TkInstallFrameMenu): added extra panic to inform user of bad call when framePtr is NULL [Bug: 2530] * generic/tkMenu.c (DestroyMenuInstance): Placed checks around menu name objects before trying to incr the ref. [Bug: 3402] * generic/tkTest.c: removed USE_OLD_IMAGE def for Mac
Diffstat (limited to 'generic/tkFrame.c')
-rw-r--r--generic/tkFrame.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/generic/tkFrame.c b/generic/tkFrame.c
index 4af8d7e..3ebe0f2 100644
--- a/generic/tkFrame.c
+++ b/generic/tkFrame.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkFrame.c,v 1.5 1999/12/14 06:52:28 hobbs Exp $
+ * RCS: @(#) $Id: tkFrame.c,v 1.6 2000/02/10 08:52:32 hobbs Exp $
*/
#include "default.h"
@@ -975,6 +975,9 @@ TkInstallFrameMenu(tkwin)
if (winPtr->mainPtr != NULL) {
Frame *framePtr;
framePtr = (Frame*) winPtr->instanceData;
+ if (framePtr == NULL) {
+ panic("TkInstallFrameMenu couldn't get frame pointer");
+ }
TkpMenuNotifyToplevelCreate(winPtr->mainPtr->interp,
framePtr->menuName);
}