From 1d2ec8e5a4e8ea342812fc20dfdaedc1403393d4 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Fri, 6 Aug 2004 19:28:14 +0000 Subject: [PATCH] wxMac CFM never has a GSocketGUIFunctionsTable git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/appcmn.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index ff6aada11d..42d33f7c79 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -588,15 +588,15 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object) GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable() { -#if defined(wxUSE_GSOCKET_CPLUSPLUS) - static GSocketGUIFunctionsTableConcrete table; - return &table; -#else #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__ || __DARWIN__ +#if defined(wxUSE_GSOCKET_CPLUSPLUS) + static GSocketGUIFunctionsTableConcrete table; + return &table; +#else static GSocketGUIFunctionsTable table = { _GSocket_GUI_Init, @@ -611,8 +611,8 @@ GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable() _GSocket_Disable_Events }; return &table; -#endif // !__WXMAC__ || __DARWIN__ #endif // defined(wxUSE_GSOCKET_CPLUSPLUS) +#endif // !__WXMAC__ || __DARWIN__ } #endif -- 2.45.2