From 224f860284e1afbe9db90bbf74942232541ca550 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 31 Oct 2019 23:43:23 +0100 Subject: [PATCH] Move wxOSXSocketManagerCF definition to utils_base.mm This variable is totally unrelated to wxExecute(), so move it to generic "utils" file (which hadn't existed when this variable was added to utilsexc_base.cpp back in 5815e95907dbecbac1e6d4d9cf3290f8d36eca48. No real changes. --- src/osx/cocoa/utils_base.mm | 9 +++++++++ src/osx/core/utilsexc_base.cpp | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/osx/cocoa/utils_base.mm b/src/osx/cocoa/utils_base.mm index 5a428fcf7d..0ca00a0b40 100644 --- a/src/osx/cocoa/utils_base.mm +++ b/src/osx/cocoa/utils_base.mm @@ -28,6 +28,15 @@ #define wxHAS_NSPROCESSINFO 1 #endif +#if wxUSE_SOCKETS +// global pointer which lives in the base library, set from the net one (see +// sockosx.cpp) and used from the GUI code (see utilsexc_cf.cpp) -- ugly but +// needed hack, see the above-mentioned files for more information +class wxSocketManager; +extern WXDLLIMPEXP_BASE wxSocketManager *wxOSXSocketManagerCF; +wxSocketManager *wxOSXSocketManagerCF = NULL; +#endif // wxUSE_SOCKETS + // our OS version is the same in non GUI and GUI cases wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin, int *verMicro) { diff --git a/src/osx/core/utilsexc_base.cpp b/src/osx/core/utilsexc_base.cpp index 12f290a50d..94b8f0974a 100644 --- a/src/osx/core/utilsexc_base.cpp +++ b/src/osx/core/utilsexc_base.cpp @@ -41,15 +41,6 @@ #include "wx/osx/core/cfstring.h" #include "wx/osx/core/private.h" -#if wxUSE_SOCKETS -// global pointer which lives in the base library, set from the net one (see -// sockosx.cpp) and used from the GUI code (see utilsexc_cf.cpp) -- ugly but -// needed hack, see the above-mentioned files for more information -class wxSocketManager; -extern WXDLLIMPEXP_BASE wxSocketManager *wxOSXSocketManagerCF; -wxSocketManager *wxOSXSocketManagerCF = NULL; -#endif // wxUSE_SOCKETS - #if ( !wxUSE_GUI && !wxOSX_USE_IPHONE ) || wxOSX_USE_COCOA_OR_CARBON //===========================================================================