From 27a52ff961c6f05c7701e2264ea36ebfa1290832 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Sat, 13 Dec 2003 20:49:01 +0000 Subject: [PATCH] use wxMac Mach-o GUI-specific functions (gsockosx) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/appcmn.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index 0f013b66d3..c6e0fc945b 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -583,11 +583,11 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object) GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable() { -#ifdef __WXMAC__ - // NB: wxMac does not have any GUI-specific functions in gsocket.c and +#if defined(__WXMAC__) && !defined(__DARWIN__) + // NB: wxMac CFM does not have any GUI-specific functions in gsocket.c and // so it doesn't need this table at all return NULL; -#else // !__WXMAC__ +#else // !__WXMAC__ || __DARWIN__ static GSocketGUIFunctionsTable table = { _GSocket_GUI_Init, @@ -602,7 +602,7 @@ GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable() _GSocket_Disable_Events }; return &table; -#endif // __WXMAC__/!__WXMAC__ +#endif // !__WXMAC__ || __DARWIN__ } #endif -- 2.45.2