From 88ec47bb129e7bc269c64f1c1c00ffc57648211c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 5 Apr 2012 18:39:57 +0000 Subject: [PATCH] No real changes, just remove wxIsDebuggerRunning() stub from wxOSX. There is no need to have a stub here when we already have in wx/debug.h, just remove it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/debug.h | 5 ++--- src/osx/core/utilsexc_base.cpp | 6 ------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/include/wx/debug.h b/include/wx/debug.h index 8a8530d97c..1bc8d5e1ea 100644 --- a/include/wx/debug.h +++ b/include/wx/debug.h @@ -437,10 +437,9 @@ template struct static_assert_test{}; /* Return true if we're running under debugger. - Currently this only really works under Win32 and Mac in CodeWarrior builds, - it always returns false in other cases. + Currently only really works under Win32 and just returns false elsewhere. */ -#if defined(__WXMAC__) || defined(__WIN32__) +#if defined(__WIN32__) extern bool WXDLLIMPEXP_BASE wxIsDebuggerRunning(); #else // !Mac inline bool wxIsDebuggerRunning() { return false; } diff --git a/src/osx/core/utilsexc_base.cpp b/src/osx/core/utilsexc_base.cpp index 84f8a0e3a3..7235975012 100644 --- a/src/osx/core/utilsexc_base.cpp +++ b/src/osx/core/utilsexc_base.cpp @@ -54,12 +54,6 @@ extern WXDLLIMPEXP_BASE wxSocketManager *wxOSXSocketManagerCF; wxSocketManager *wxOSXSocketManagerCF = NULL; #endif // wxUSE_SOCKETS -extern bool WXDLLEXPORT wxIsDebuggerRunning() -{ - // TODO : try to find out ... - return false; -} - #if ( !wxUSE_GUI && !wxOSX_USE_IPHONE ) || wxOSX_USE_COCOA_OR_CARBON // have a fast version for mac code that returns the version as a return value -- 2.45.2