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
This commit is contained in:
Gilles Depeyrot
2003-12-13 20:49:01 +00:00
parent 633040eda1
commit 27a52ff961

View File

@@ -583,11 +583,11 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable() GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
{ {
#ifdef __WXMAC__ #if defined(__WXMAC__) && !defined(__DARWIN__)
// NB: wxMac does not have any GUI-specific functions in gsocket.c and // NB: wxMac CFM does not have any GUI-specific functions in gsocket.c and
// so it doesn't need this table at all // so it doesn't need this table at all
return NULL; return NULL;
#else // !__WXMAC__ #else // !__WXMAC__ || __DARWIN__
static GSocketGUIFunctionsTable table = static GSocketGUIFunctionsTable table =
{ {
_GSocket_GUI_Init, _GSocket_GUI_Init,
@@ -602,7 +602,7 @@ GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
_GSocket_Disable_Events _GSocket_Disable_Events
}; };
return &table; return &table;
#endif // __WXMAC__/!__WXMAC__ #endif // !__WXMAC__ || __DARWIN__
} }
#endif #endif