rtti api mods added

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

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index fc5d9650093aca9a139f8a050390702a08bcf1ec..84687d9924f211c3e3071568ff013d5eba3de813 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -166,15 +166,13 @@ void wxApp::HandleSockets()
         int i;
         struct GsocketCallbackInfo
           *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
         int i;
         struct GsocketCallbackInfo
           *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;

-        int r = 0;

         timeout.tv_sec = 0;
         timeout.tv_usec = 0;
         if ( select(m_maxSocketNr, &readfds, &writefds, 0, &timeout) > 0)
         {
         timeout.tv_sec = 0;
         timeout.tv_usec = 0;
         if ( select(m_maxSocketNr, &readfds, &writefds, 0, &timeout) > 0)
         {

-            for (i = m_lastUsedHandle + 1; i != m_lastUsedHandle; i++)
+            for (i = m_lastUsedHandle + 1; i != m_lastUsedHandle;
+                 (i < m_maxSocketNr - 1) ? i++ : (i = 0))

             {
             {

-                if (i == m_maxSocketNr)
-                    i = 0;

                 if (FD_ISSET(i, &readfds))
                 {
                     int r;
                 if (FD_ISSET(i, &readfds))
                 {
                     int r;


@@ -187,7 +185,6 @@ void wxApp::HandleSockets()
                     {
                         CallbackInfo[r].proc(CallbackInfo[r].gsock);
                         pendingEvent = TRUE;
                     {
                         CallbackInfo[r].proc(CallbackInfo[r].gsock);
                         pendingEvent = TRUE;

-                        wxYield();

                     }
                 }
                 if (FD_ISSET(i, &writefds))
                     }
                 }
                 if (FD_ISSET(i, &writefds))


@@ -201,14 +198,13 @@ void wxApp::HandleSockets()
                     {
                         CallbackInfo[r].proc(CallbackInfo[r].gsock);
                         pendingEvent = TRUE;
                     {
                         CallbackInfo[r].proc(CallbackInfo[r].gsock);
                         pendingEvent = TRUE;

-                        wxYield();

                     }
                 }
             }
             m_lastUsedHandle = i;
         }
         if (pendingEvent)
                     }
                 }
             }
             m_lastUsedHandle = i;
         }
         if (pendingEvent)

-            wxYield();
+            ProcessPendingEvents();

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


@@ -498,7 +494,6 @@ wxApp::wxApp()
     argc = 0;
     argv = NULL;
     m_nPrintMode = wxPRINT_WINDOWS;
     argc = 0;
     argv = NULL;
     m_nPrintMode = wxPRINT_WINDOWS;

-    m_bAuto3D = TRUE;

     m_hMq = 0;
     m_maxSocketHandles = 0;
     m_maxSocketNr = 0;
     m_hMq = 0;
     m_maxSocketHandles = 0;
     m_maxSocketNr = 0;


@@ -647,30 +642,18 @@ int wxApp::MainLoop()
         while (!Pending() && ProcessIdle())
         {
             HandleSockets();
         while (!Pending() && ProcessIdle())
         {
             HandleSockets();

-            wxUsleep(10000);
+            wxUsleep(10);

         }
         HandleSockets();
         if (Pending())
             DoMessage();
         else
         }
         HandleSockets();
         if (Pending())
             DoMessage();
         else

-            wxUsleep(10000);
+            wxUsleep(10);

 
     }
     return (int)svCurrentMsg.mp1;
 } // end of wxApp::MainLoop
 
 
     }
     return (int)svCurrentMsg.mp1;
 } // end of wxApp::MainLoop
 

-//
-// Returns TRUE if more time is needed.
-//
-bool wxApp::ProcessIdle()
-{
-    wxIdleEvent                     vEvent;
-
-    vEvent.SetEventObject(this);
-    ProcessEvent(vEvent);
-    return vEvent.MoreRequested();
-} // end of wxApp::ProcessIdle
-

 void wxApp::ExitMainLoop()
 {
     ::WinPostMsg(NULL, WM_QUIT, 0, 0);
 void wxApp::ExitMainLoop()
 {
     ::WinPostMsg(NULL, WM_QUIT, 0, 0);


@@ -790,25 +773,8 @@ void wxApp::OnIdle(
         return;
 
     gbInOnIdle = TRUE;
         return;
 
     gbInOnIdle = TRUE;

-
-    //
-    // If there are pending events, we must process them: pending events
-    // are either events to the threads other than main or events posted
-    // with wxPostEvent() functions
-    //
-    ProcessPendingEvents();
-
-    //
-    // 'Garbage' collection of windows deleted with Close().
-    //
-    DeletePendingObjects();
-
-#if wxUSE_LOG
-    //
-    // Flush the logged messages if any
-    //
-    wxLog::FlushActive();
-#endif // wxUSE_LOG
+    
+    wxAppBase::OnIdle(event);

 
 #if wxUSE_DC_CACHEING
     // automated DC cache management: clear the cached DCs and bitmap
 
 #if wxUSE_DC_CACHEING
     // automated DC cache management: clear the cached DCs and bitmap


@@ -820,66 +786,9 @@ void wxApp::OnIdle(
         wxDC::ClearCache();
 #endif // wxUSE_DC_CACHEING
 
         wxDC::ClearCache();
 #endif // wxUSE_DC_CACHEING
 

-    //
-    // Send OnIdle events to all windows
-    //
-    if (SendIdleEvents())
-    {
-        //
-        // SendIdleEvents() returns TRUE if at least one window requested more
-        // idle events
-        //
-        rEvent.RequestMore(TRUE);
-    }

     gbInOnIdle = FALSE;
 } // end of wxApp::OnIdle
 
     gbInOnIdle = FALSE;
 } // end of wxApp::OnIdle
 

-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
-{
-    bool                            bNeedMore = FALSE;
-    wxWindowList::Node*             pNode = wxTopLevelWindows.GetFirst();
-
-    while (pNode)
-    {
-        wxWindow*                   pWin = pNode->GetData();
-
-        if (SendIdleEvents(pWin))
-            bNeedMore = TRUE;
-        pNode = pNode->GetNext();
-    }
-    return bNeedMore;
-} // end of wxApp::SendIdleEvents
-
-//
-// Send idle event to window and all subwindows
-//
-bool wxApp::SendIdleEvents(
-  wxWindow*                         pWin
-)
-{
-    bool                            bNeedMore = FALSE;
-    wxIdleEvent                     vEvent;
-
-    vEvent.SetEventObject(pWin);
-    pWin->GetEventHandler()->ProcessEvent(vEvent);
-
-    if (vEvent.MoreRequested())
-        bNeedMore = TRUE;
-
-    wxNode*                         pNode = pWin->GetChildren().First();
-
-    while (pNode)
-    {
-        wxWindow*                   pWin = (wxWindow*) pNode->Data();
-
-        if (SendIdleEvents(pWin))
-            bNeedMore = TRUE;
-        pNode = pNode->Next();
-    }
-    return bNeedMore;
-} // end of wxApp::SendIdleEvents
-

 void wxApp::OnEndSession(
   wxCloseEvent&                     WXUNUSED(rEvent))
 {
 void wxApp::OnEndSession(
   wxCloseEvent&                     WXUNUSED(rEvent))
 {


@@ -956,6 +865,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
     if (wxTheApp)
         wxTheApp->ProcessPendingEvents();
 
     if (wxTheApp)
         wxTheApp->ProcessPendingEvents();
 

+    HandleSockets();

     //
     // Let the logs be flashed again
     //
     //
     // Let the logs be flashed again
     //