X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14a39351b319e9d4acde63e92117ab4492d4e4e5..1d73f41603de8103218a8460792f244230c6a7b1:/src/common/appcmn.cpp?ds=inline diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index 37da88bccf..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,17 +502,25 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object) #include "wx/unix/gsockunx.h" #elif defined(__WINDOWS__) #include "wx/msw/gsockmsw.h" +#elif defined(__WXMAC__) + #include + #define OTUNIXERRORS 1 + #include + #include + #include + + #include "wx/mac/gsockmac.h" #else #error "Must include correct GSocket header here" #endif GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable() { -#ifdef __MAC__ +#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 +#else // !__WXMAC__ static GSocketGUIFunctionsTable table = { _GSocket_GUI_Init, @@ -528,7 +535,7 @@ GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable() _GSocket_Disable_Events }; return &table; -#endif +#endif // __WXMAC__/!__WXMAC__ } #endif