From f496a353dbcc7494b95cda7669f51d9ed643e777 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 22 May 2009 19:18:07 +0000 Subject: [PATCH] fix MrEd -h, etc. reporting under Mac OS X svn: r14931 --- src/mred/mred.cxx | 5 +++++ src/mred/mred.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mred/mred.cxx b/src/mred/mred.cxx index 8c50f739fa..9f48987f91 100644 --- a/src/mred/mred.cxx +++ b/src/mred/mred.cxx @@ -3152,6 +3152,11 @@ wxFrame *MrEdApp::OnInit(void) # endif #endif +#ifdef OS_X + /* Hack to make sure it's referenced, so that xform doesn't throw it away. */ + wx_in_terminal = wx_in_terminal; +#endif + mred_run_from_cmd_line(argc, argv, setup_basic_env); #if WCONSOLE_STDIO diff --git a/src/mred/mred.h b/src/mred/mred.h index 48c6053a97..aebaa621cf 100644 --- a/src/mred/mred.h +++ b/src/mred/mred.h @@ -198,7 +198,7 @@ MRED_EXTERN void mred_set_run_from_cmd_line(MrEd_Run_From_Cmd_Line_Proc); #endif #ifndef REDIRECT_STDIO -# if (defined(wx_msw) || defined(wx_mac)) && !WCONSOLE_STDIO +# if defined(wx_msw) && !WCONSOLE_STDIO # define REDIRECT_STDIO 1 # else # define REDIRECT_STDIO 0