return reference to non-temporary wxString instance from wxGetTranslation() even...

[wxWidgets.git] / src / gtk1 / app.cpp

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 65f7a464413dc7ab4d857aa4116f6554163fc16e..c7d9c5b71f83b5f912088492d9bc517fe3a2b8a6 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -29,11 +29,11 @@
     #include "wx/font.h"
     #include "wx/gdicmn.h"
     #include "wx/image.h"
     #include "wx/font.h"
     #include "wx/gdicmn.h"
     #include "wx/image.h"

+    #include "wx/module.h"

 #endif
 
 #include "wx/file.h"
 #include "wx/filename.h"
 #endif
 
 #include "wx/file.h"
 #include "wx/filename.h"

-#include "wx/module.h"

 #include "wx/thread.h"
 
 #ifdef __WXGPE__
 #include "wx/thread.h"
 
 #ifdef __WXGPE__


@@ -74,6 +74,9 @@
     #include <sys/types.h>
     #include <sys/time.h>
     #include <unistd.h>
     #include <sys/types.h>
     #include <sys/time.h>
     #include <unistd.h>

+    #ifdef HAVE_SYS_SELECT_H
+        #include <sys/select.h>
+    #endif

 #endif // HAVE_POLL/!HAVE_POLL
 
 #include "wx/unix/private.h"
 #endif // HAVE_POLL/!HAVE_POLL
 
 #include "wx/unix/private.h"


@@ -310,7 +313,7 @@ int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
     unsigned int i;
     for ( i = 0; i < nfds; i++ )
     {
     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);
 
         if ( ufds[i].events & G_IO_IN )
             wxFD_SET(ufds[i].fd, &readfds);