From 5ffb45c79f7311a73f0d26206235a713714f2335 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 16 Sep 2009 12:54:12 +0000 Subject: [PATCH] Cleanups for the Mac error dialog, after a code review from tma. - Don't expose the function in sys_local.h (it would be static if we could). - Don't call it Sys_Cocoa_*; it'd be nonsense with q3a's naming conventions. --- code/sys/sys_cocoa.m | 2 +- code/sys/sys_local.h | 1 - code/sys/sys_unix.c | 4 +++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/sys/sys_cocoa.m b/code/sys/sys_cocoa.m index 7efa615b..cfc754dd 100644 --- a/code/sys/sys_cocoa.m +++ b/code/sys/sys_cocoa.m @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #import -void Sys_Cocoa_MsgBox( const char *text ) +void Cocoa_MsgBox( const char *text ) { NSRunInformationalAlertPanel(@"ioquake3", [NSString stringWithUTF8String:text], diff --git a/code/sys/sys_local.h b/code/sys/sys_local.h index 09d0cc04..61748766 100644 --- a/code/sys/sys_local.h +++ b/code/sys/sys_local.h @@ -46,7 +46,6 @@ unsigned int CON_LogRead( char *out, unsigned int outSize ); #ifdef MACOS_X char *Sys_StripAppBundle( char *pwd ); -void Sys_Cocoa_MsgBox( const char *text ); #endif void Sys_GLimpSafeInit( void ); diff --git a/code/sys/sys_unix.c b/code/sys/sys_unix.c index 641770ca..5ed0721c 100644 --- a/code/sys/sys_unix.c +++ b/code/sys/sys_unix.c @@ -511,8 +511,10 @@ void Sys_ErrorDialog( const char *error ) Sys_Print( va( "%s\n", error ) ); #if defined(MACOS_X) && !DEDICATED + /* This function has to be in a separate file, compiled as Objective-C. */ + extern void Cocoa_MsgBox( const char *text ); if (!com_dedicated || !com_dedicated->integer) - Sys_Cocoa_MsgBox(error); + Cocoa_MsgBox(error); #endif /* make sure the write path for the crashlog exists... */