From 32e568d9d802c1041fc2f6505b16ad94e2ed39cb Mon Sep 17 00:00:00 2001 From: nijtmans Date: Tue, 15 Jun 2010 12:40:07 +0000 Subject: Terminate TkEnsemble definition with NULL --- ChangeLog | 2 ++ carbon/tkMacOSXDialog.c | 9 +++++---- macosx/tkMacOSXDialog.c | 9 +++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1806541..34f19a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ * unix/tkUnixScrlbr.c * unix/tkUnixSelect.c * unix/tkUnixWm.c + * carbon/tkMacOSXDialog.c: Terminate TkEnsemble definition with NULL + * macosx/tkMacOSXDialog.c 2010-05-31 Joe English diff --git a/carbon/tkMacOSXDialog.c b/carbon/tkMacOSXDialog.c index 4086d47..968daf6 100644 --- a/carbon/tkMacOSXDialog.c +++ b/carbon/tkMacOSXDialog.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.2 2010/02/05 22:45:03 nijtmans Exp $ + * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.3 2010/06/15 12:40:07 nijtmans Exp $ */ #include "tkMacOSXPrivate.h" @@ -1772,9 +1772,10 @@ static void DeleteFontchooserData(ClientData clientData, Tcl_Interp *interp); MODULE_SCOPE const TkEnsemble tkFontchooserEnsemble[]; const TkEnsemble tkFontchooserEnsemble[] = { - { "configure", FontchooserConfigureCmd }, - { "show", FontchooserShowCmd }, - { "hide", FontchooserHideCmd }, + { "configure", FontchooserConfigureCmd, NULL }, + { "show", FontchooserShowCmd, NULL }, + { "hide", FontchooserHideCmd, NULL }, + { NULL, NULL, NULL } }; static Tcl_Interp *fontchooserInterp = NULL; diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c index d4c14d0..8d07996 100644 --- a/macosx/tkMacOSXDialog.c +++ b/macosx/tkMacOSXDialog.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.48 2010/02/05 22:45:03 nijtmans Exp $ + * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.49 2010/06/15 12:40:07 nijtmans Exp $ */ #include "tkMacOSXPrivate.h" @@ -1108,9 +1108,10 @@ static void DeleteFontchooserData(ClientData clientData, MODULE_SCOPE const TkEnsemble tkFontchooserEnsemble[]; const TkEnsemble tkFontchooserEnsemble[] = { - { "configure", FontchooserConfigureCmd }, - { "show", FontchooserShowCmd }, - { "hide", FontchooserHideCmd }, + { "configure", FontchooserConfigureCmd, NULL }, + { "show", FontchooserShowCmd, NULL }, + { "hide", FontchooserHideCmd, NULL }, + { NULL, NULL, NULL } }; static Tcl_Interp *fontchooserInterp = NULL; -- cgit v0.12