Preserve original menu label for later retrieval

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 4d47d138f2606e1cf3999be3d25c4da8ee005531..6c57967a5f8e2c5238a41f02e372da7099018680 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -27,13 +27,13 @@
     #include "wx/msgdlg.h"
     #include "wx/memory.h"
     #include "wx/font.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
 
 #endif
 

-#include "wx/gdicmn.h"

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

-#include "wx/module.h"
-#include "wx/image.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"


@@ -180,14 +183,14 @@ void wxApp::WakeUpIdle()
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiEnter();
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiEnter();

-#endif // wxUSE_THREADS_
+#endif // wxUSE_THREADS

 
     wxapp_install_idle_handler();
 
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiLeave();
 
     wxapp_install_idle_handler();
 
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiLeave();

-#endif // wxUSE_THREADS_
+#endif // wxUSE_THREADS

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -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);


@@ -422,10 +425,6 @@ GtkWidget* wxGetRootWindow()
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 

-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxAppBase::OnIdle)
-END_EVENT_TABLE()
-

 wxApp::wxApp()
 {
 #ifdef __WXDEBUG__
 wxApp::wxApp()
 {
 #ifdef __WXDEBUG__