Applied patch [ 805147 ] GDI objects are not deselected from DC

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

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index d0c2b5d7ed5f20611fb3638fb01a8e7694eb32fd..c131905de877243a9e21b8c59510e383246aecc4 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 r = 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;
@@ -187,7 +185,6 @@ void wxApp::HandleSockets()
                     {
                         CallbackInfo[r].proc(CallbackInfo[r].gsock);
                         pendingEvent = TRUE;
-                        wxYield();
                     }
                 }
                 if (FD_ISSET(i, &writefds))
@@ -201,14 +198,13 @@ void wxApp::HandleSockets()
                     {
                         CallbackInfo[r].proc(CallbackInfo[r].gsock);
                         pendingEvent = TRUE;
-                        wxYield();
                     }
                 }
             }
             m_lastUsedHandle = i;
         }
         if (pendingEvent)
-            wxYield();
+            ProcessPendingEvents();
     }
 }
 // ---------------------------------------------------------------------------
@@ -285,7 +281,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     // wxSetKeyboardHook(TRUE);
 
-    RegisterWindowClasses(vHab);
+    RegisterWindowClasses(vHabmain);
 
     return TRUE;
 } // end of wxApp::Initialize
@@ -456,13 +452,6 @@ void wxApp::CleanUp()
     if (wxWinHandleList)
         delete wxWinHandleList;
 
-    delete wxPendingEvents;
-#if wxUSE_THREADS
-    delete wxPendingEventsLocker;
-    // If we don't do the following, we get an apparent memory leak.
-    ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
-#endif
-
     // Delete Message queue
     if (wxTheApp->m_hMq)
         ::WinDestroyMsgQueue(wxTheApp->m_hMq);
@@ -492,9 +481,6 @@ bool wxApp::OnInitGui()
 
 wxApp::wxApp()
 {
-    m_topWindow = NULL;
-    wxTheApp = this;
-
     argc = 0;
     argv = NULL;
     m_nPrintMode = wxPRINT_WINDOWS;
@@ -646,13 +632,13 @@ int wxApp::MainLoop()
         while (!Pending() && ProcessIdle())
         {
             HandleSockets();
-            wxUsleep(10000);
+            wxUsleep(10);
         }
         HandleSockets();
         if (Pending())
             DoMessage();
         else
-            wxUsleep(10000);
+            wxUsleep(10);
 
     }
     return (int)svCurrentMsg.mp1;
@@ -778,7 +764,7 @@ void wxApp::OnIdle(
 
     gbInOnIdle = TRUE;
     
-    wxAppBase::OnIdle(event);
+    wxAppBase::OnIdle(rEvent);
 
 #if wxUSE_DC_CACHEING
     // automated DC cache management: clear the cached DCs and bitmap
@@ -869,6 +855,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
     if (wxTheApp)
         wxTheApp->ProcessPendingEvents();
 
+    HandleSockets();
     //
     // Let the logs be flashed again
     //