X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..8bebc229c7aa9a57fdb4b4955bbe23cd1a44f54a:/src/common/appcmn.cpp

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index fdf85e5b67..5c19be543e 100644
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -323,7 +323,6 @@ bool wxAppBase::ProcessIdle()
     wxIdleEvent event;
     bool needMore = FALSE;
     wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
-    node = wxTopLevelWindows.GetFirst();
     while (node)
     {
         wxWindow* win = node->GetData();
@@ -503,14 +502,25 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
     #include "wx/unix/gsockunx.h"
 #elif defined(__WINDOWS__)
     #include "wx/msw/gsockmsw.h"
-#elif defined(__MAC__)
-    #include "wx/mac/gsockmac.h"
+#elif defined(__WXMAC__)
+  #include <MacHeaders.c>
+  #define OTUNIXERRORS 1
+  #include <OpenTransport.h>
+  #include <OpenTransportProviders.h>
+  #include <OpenTptInternet.h>
+
+  #include "wx/mac/gsockmac.h"
 #else
     #error "Must include correct GSocket header here"
 #endif
 
 GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
 {
+#ifdef __WXMAC__
+    // NB: wxMac does not have any GUI-specific functions in gsocket.c and
+    //     so it doesn't need this table at all
+    return NULL;
+#else // !__WXMAC__
     static GSocketGUIFunctionsTable table =
     {
         _GSocket_GUI_Init,
@@ -525,6 +535,7 @@ GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
         _GSocket_Disable_Events
     };
     return &table;
+#endif // __WXMAC__/!__WXMAC__
 }
 
 #endif