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 5815e95907
.
No real changes.
This commit is contained in:
@@ -28,6 +28,15 @@
|
|||||||
#define wxHAS_NSPROCESSINFO 1
|
#define wxHAS_NSPROCESSINFO 1
|
||||||
#endif
|
#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
|
// our OS version is the same in non GUI and GUI cases
|
||||||
wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin, int *verMicro)
|
wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin, int *verMicro)
|
||||||
{
|
{
|
||||||
|
@@ -41,15 +41,6 @@
|
|||||||
#include "wx/osx/core/cfstring.h"
|
#include "wx/osx/core/cfstring.h"
|
||||||
#include "wx/osx/core/private.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
|
#if ( !wxUSE_GUI && !wxOSX_USE_IPHONE ) || wxOSX_USE_COCOA_OR_CARBON
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
Reference in New Issue
Block a user