summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXMenus.c
diff options
context:
space:
mode:
authorculler <culler>2019-04-17 14:05:33 (GMT)
committerculler <culler>2019-04-17 14:05:33 (GMT)
commit7eaee2f2e59cbbb043964d94313d3f22a6d877a5 (patch)
tree234a219579591d68652019df28397ade8a81a33e /macosx/tkMacOSXMenus.c
parent9b521b370e0520f6a489be15b65269a33761501a (diff)
downloadtk-7eaee2f2e59cbbb043964d94313d3f22a6d877a5.zip
tk-7eaee2f2e59cbbb043964d94313d3f22a6d877a5.tar.gz
tk-7eaee2f2e59cbbb043964d94313d3f22a6d877a5.tar.bz2
Mitigate future merge conflict headaches.
Diffstat (limited to 'macosx/tkMacOSXMenus.c')
-rw-r--r--macosx/tkMacOSXMenus.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index 7d77d23..5e6a37c 100644
--- a/macosx/tkMacOSXMenus.c
+++ b/macosx/tkMacOSXMenus.c
@@ -177,7 +177,6 @@ static Tcl_Obj * GetWidgetDemoPath(Tcl_Interp *interp);
SEL action = [anItem action];
if (sel_isEqual(action, @selector(preferences:))) {
-
return (_eventInterp && Tcl_FindCommand(_eventInterp,
"::tk::mac::ShowPreferences", NULL, 0));
} else if (sel_isEqual(action, @selector(tkDemo:))) {