X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9eddec696f06d65a80e7339b2fae14fcb55f8383..677dc0ed1a3ff68af15f6246d6d0708d5264b07a:/src/gtk1/app.cpp diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index e8ea46b890..e0d50295b0 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -7,12 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __VMS -// vms_jackets.h should for proper working be included before anything else -# include -#undef ConnectionNumber -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -24,16 +18,16 @@ #include "wx/utils.h" #include "wx/dialog.h" #include "wx/settings.h" + #include "wx/msgdlg.h" + #include "wx/memory.h" + #include "wx/font.h" + #include "wx/gdicmn.h" + #include "wx/image.h" + #include "wx/module.h" #endif -#include "wx/gdicmn.h" -#include "wx/memory.h" -#include "wx/font.h" -#include "wx/msgdlg.h" #include "wx/file.h" #include "wx/filename.h" -#include "wx/module.h" -#include "wx/image.h" #include "wx/thread.h" #ifdef __WXGPE__ @@ -74,6 +68,9 @@ #include #include #include + #ifdef HAVE_SYS_SELECT_H + #include + #endif #endif // HAVE_POLL/!HAVE_POLL #include "wx/unix/private.h" @@ -180,14 +177,14 @@ void wxApp::WakeUpIdle() #if wxUSE_THREADS if (!wxThread::IsMain()) wxMutexGuiEnter(); -#endif // wxUSE_THREADS_ +#endif // wxUSE_THREADS wxapp_install_idle_handler(); #if wxUSE_THREADS if (!wxThread::IsMain()) wxMutexGuiLeave(); -#endif // wxUSE_THREADS_ +#endif // wxUSE_THREADS } //----------------------------------------------------------------------------- @@ -310,7 +307,7 @@ int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout) unsigned int i; for ( i = 0; i < nfds; i++ ) { - wxASSERT_MSG( ufds[i].fd < wxFD_SETSIZE, _T("fd out of range") ); + wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, _T("fd out of range") ); if ( ufds[i].events & G_IO_IN ) wxFD_SET(ufds[i].fd, &readfds); @@ -422,10 +419,6 @@ GtkWidget* wxGetRootWindow() IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxAppBase::OnIdle) -END_EVENT_TABLE() - wxApp::wxApp() { #ifdef __WXDEBUG__