]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/app.cpp
fixing RawBitmap access
[wxWidgets.git] / src / os2 / app.cpp
index b9e0318b166c52afc43e23f13c9a4d673366693f..55c540bcd58aeae0c2db31a31cdcf96432a2d1cb 100644 (file)
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-    #pragma implementation "app.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -33,7 +29,8 @@
     #include "wx/dynarray.h"
     #include "wx/wxchar.h"
     #include "wx/icon.h"
-    #include "wx/timer.h"
+    #include "wx/stdpaths.h"
+    #include "wx/filename.h"
 #endif
 
 #include "wx/log.h"
 
 #endif //
 
-#ifndef __EMX__
+#if defined(__WATCOMC__)
+
+#include <tcpustd.h>
+
+#elif !defined(__EMX__)
 
 #define select(a,b,c,d,e) bsdselect(a,b,c,d,e)
 extern "C" int _System bsdselect(int,
@@ -67,13 +68,6 @@ extern "C" int _System bsdselect(int,
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
-
-    // define the array of QMSG strutures
-    WX_DECLARE_OBJARRAY(QMSG, wxMsgArray);
-
-    #include "wx/arrimpl.cpp"
-
-    WX_DEFINE_OBJARRAY(wxMsgArray);
 #endif // wxUSE_THREADS
 
 #if wxUSE_TOOLTIPS
@@ -88,13 +82,10 @@ extern "C" int _System bsdselect(int,
 // ---------------------------------------------------------------------------
 
 extern wxChar*                      wxBuffer;
-extern wxList*                      wxWinHandleList;
 extern wxList WXDLLEXPORT           wxPendingDelete;
 extern wxCursor*                    g_globalCursor;
 
 HAB                                 vHabmain = NULLHANDLE;
-QMSG                                svCurrentMsg;
-wxApp*                              wxTheApp = NULL;
 
 
 HICON wxSTD_FRAME_ICON          = (HICON) NULL;
@@ -125,35 +116,10 @@ struct GsocketCallbackInfo{
     void* gsock;
 };
 
-// These defines and wrapper functions are used here and in gsockpm.c
+// These defines are used here and in gsockpm.cpp
 #define wxSockReadMask  0x01
 #define wxSockWriteMask 0x02
 
-#ifdef __EMX__
-extern "C"
-int wxAppAddSocketHandler(int handle, int mask,
-                           void (*callback)(void*), void * gsock)
-{
-    return wxTheApp->AddSocketHandler(handle, mask, callback, gsock);
-}
-extern "C"
-void wxAppRemoveSocketHandler(int handle)
-{
-    wxTheApp->RemoveSocketHandler(handle);
-}
-#else
-//  Linkage mode problems using callbacks with extern C in a .cpp module
-int wxAppAddSocketHandler(int handle, int mask,
-                           void (*callback)(void*), void * gsock)
-{
-    return wxTheApp->AddSocketHandler(handle, mask, callback, gsock);
-}
-void wxAppRemoveSocketHandler(int handle)
-{
-    wxTheApp->RemoveSocketHandler(handle);
-}
-#endif
-
 void wxApp::HandleSockets()
 {
     bool pendingEvent = FALSE;
@@ -167,15 +133,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;
@@ -188,7 +152,6 @@ void wxApp::HandleSockets()
                     {
                         CallbackInfo[r].proc(CallbackInfo[r].gsock);
                         pendingEvent = TRUE;
-                        wxYield();
                     }
                 }
                 if (FD_ISSET(i, &writefds))
@@ -202,14 +165,13 @@ void wxApp::HandleSockets()
                     {
                         CallbackInfo[r].proc(CallbackInfo[r].gsock);
                         pendingEvent = TRUE;
-                        wxYield();
                     }
                 }
             }
             m_lastUsedHandle = i;
         }
         if (pendingEvent)
-            wxYield();
+            ProcessPendingEvents();
     }
 }
 // ---------------------------------------------------------------------------
@@ -227,10 +189,11 @@ void wxApp::HandleSockets()
 //
 // Initialize
 //
-bool wxApp::Initialize(
-  HAB                               vHab
-)
+bool wxApp::Initialize(int& argc, wxChar **argv)
 {
+    if ( !wxAppBase::Initialize(argc, argv) )
+        return false;
+
 #if defined(wxUSE_CONSOLEDEBUG)
   #if wxUSE_CONSOLEDEBUG
 /***********************************************/
@@ -253,31 +216,22 @@ bool wxApp::Initialize(
   #endif //wxUSE_CONSOLEDEBUG
 #endif
 
-    wxBuffer = new wxChar[1500]; // FIXME; why?
-
-    wxClassInfo::InitializeClasses();
-
-#if wxUSE_THREADS
-    wxPendingEventsLocker = new wxCriticalSection;
-#endif
-
-    wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-    wxTheColourDatabase->Initialize();
-
-    wxInitializeStockLists();
-    wxInitializeStockObjects();
-
-    wxBitmap::InitStandardHandlers();
-
     //
     // OS2 has to have an anchorblock
     //
-    vHab = WinInitialize(0);
+    vHabmain = WinInitialize(0);
+    wxFileName GetPrefix(argv[0]);
+    GetPrefix.MakeAbsolute();
+    wxStandardPaths::SetInstallPrefix(GetPrefix.GetPath());
+    if (!vHabmain)
+    {
+        // TODO: at least give some error message here...
+        wxAppBase::CleanUp();
 
-    if (!vHab)
         return FALSE;
-    else
-        vHabmain = vHab;
+    }
+
+    wxBuffer = new wxChar[1500]; // FIXME; why?
 
     // Some people may wish to use this, but
     // probably it shouldn't be here by default.
@@ -285,7 +239,7 @@ bool wxApp::Initialize(
     //    wxRedirectIOToConsole();
 #endif
 
-    wxWinHandleList = new wxList(wxKEY_INTEGER);
+    wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100);
 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.
     // PLEASE DO NOT ALTER THIS.
@@ -296,10 +250,8 @@ bool wxApp::Initialize(
 
     // wxSetKeyboardHook(TRUE);
 
-    wxModule::RegisterModules();
-    if (!wxModule::InitializeModules())
-        return FALSE;
-    RegisterWindowClasses(vHab);
+    RegisterWindowClasses(vHabmain);
+
     return TRUE;
 } // end of wxApp::Initialize
 
@@ -316,7 +268,7 @@ bool wxApp::RegisterWindowClasses(
     wxString                        sError;
 
     if (!::WinRegisterClass( vHab
-                            ,wxFrameClassName
+                            ,(PSZ)wxFrameClassName
                             ,wxFrameWndProc
                             ,CS_SIZEREDRAW | CS_SYNCPAINT
                             ,sizeof(ULONG)
@@ -324,12 +276,12 @@ bool wxApp::RegisterWindowClasses(
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
-        wxLogLastError(sError);
+        wxLogLastError(sError.c_str());
         return FALSE;
     }
 
     if (!::WinRegisterClass( vHab
-                            ,wxFrameClassNameNoRedraw
+                            ,(PSZ)wxFrameClassNameNoRedraw
                             ,wxWndProc
                             ,0
                             ,sizeof(ULONG)
@@ -337,12 +289,12 @@ bool wxApp::RegisterWindowClasses(
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
-        wxLogLastError(sError);
+        wxLogLastError(sError.c_str());
         return FALSE;
     }
 
     if (!::WinRegisterClass( vHab
-                            ,wxMDIFrameClassName
+                            ,(PSZ)wxMDIFrameClassName
                             ,wxWndProc
                             ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT
                             ,sizeof(ULONG)
@@ -350,12 +302,12 @@ bool wxApp::RegisterWindowClasses(
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
-        wxLogLastError(sError);
+        wxLogLastError(sError.c_str());
         return FALSE;
     }
 
     if (!::WinRegisterClass( vHab
-                            ,wxMDIFrameClassNameNoRedraw
+                            ,(PSZ)wxMDIFrameClassNameNoRedraw
                             ,wxWndProc
                             ,0
                             ,sizeof(ULONG)
@@ -363,12 +315,12 @@ bool wxApp::RegisterWindowClasses(
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
-        wxLogLastError(sError);
+        wxLogLastError(sError.c_str());
         return FALSE;
     }
 
     if (!::WinRegisterClass( vHab
-                            ,wxMDIChildFrameClassName
+                            ,(PSZ)wxMDIChildFrameClassName
                             ,wxWndProc
                             ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST
                             ,sizeof(ULONG)
@@ -376,12 +328,12 @@ bool wxApp::RegisterWindowClasses(
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
-        wxLogLastError(sError);
+        wxLogLastError(sError.c_str());
         return FALSE;
     }
 
     if (!::WinRegisterClass( vHab
-                            ,wxMDIChildFrameClassNameNoRedraw
+                            ,(PSZ)wxMDIChildFrameClassNameNoRedraw
                             ,wxWndProc
                             ,CS_HITTEST
                             ,sizeof(ULONG)
@@ -389,12 +341,12 @@ bool wxApp::RegisterWindowClasses(
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
-        wxLogLastError(sError);
+        wxLogLastError(sError.c_str());
         return FALSE;
     }
 
     if (!::WinRegisterClass( vHab
-                            ,wxPanelClassName
+                            ,(PSZ)wxPanelClassName
                             ,wxWndProc
                             ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
                             ,sizeof(ULONG)
@@ -402,12 +354,12 @@ bool wxApp::RegisterWindowClasses(
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
-        wxLogLastError(sError);
+        wxLogLastError(sError.c_str());
         return FALSE;
     }
 
     if (!::WinRegisterClass( vHab
-                            ,wxCanvasClassName
+                            ,(PSZ)wxCanvasClassName
                             ,wxWndProc
                             ,CS_SIZEREDRAW | CS_HITTEST | CS_SYNCPAINT
                             ,sizeof(ULONG)
@@ -415,11 +367,11 @@ bool wxApp::RegisterWindowClasses(
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
-        wxLogLastError(sError);
+        wxLogLastError(sError.c_str());
         return FALSE;
     }
     if (!::WinRegisterClass( vHab
-                            ,wxCanvasClassNameNR
+                            ,(PSZ)wxCanvasClassNameNR
                             ,wxWndProc
                             ,CS_HITTEST | CS_SYNCPAINT
                             ,sizeof(ULONG)
@@ -427,56 +379,17 @@ bool wxApp::RegisterWindowClasses(
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
-        wxLogLastError(sError);
+        wxLogLastError(sError.c_str());
         return FALSE;
     }
     return TRUE;
 } // end of wxApp::RegisterWindowClasses
 
 //
-// Cleans up any wxWindows internal structures left lying around
+// Cleans up any wxWidgets internal structures left lying around
 //
 void wxApp::CleanUp()
 {
-    //
-    // COMMON CLEANUP
-    //
-
-#if wxUSE_LOG
-
-    //
-    // Flush the logged messages if any and install a 'safer' log target: the
-    // default one (wxLogGui) can't be used after the resources are freed just
-    // below and the user suppliedo ne might be even more unsafe (using any
-    // wxWindows GUI function is unsafe starting from now)
-    //
-    wxLog::DontCreateOnDemand();
-
-    //
-    // This will flush the old messages if any
-    //
-    delete wxLog::SetActiveTarget(new wxLogStderr);
-#endif // wxUSE_LOG
-
-    //
-    // One last chance for pending objects to be cleaned up
-    //
-    wxTheApp->DeletePendingObjects();
-
-    wxModule::CleanUpModules();
-
-    wxDeleteStockObjects();
-
-    //
-    // Destroy all GDI lists, etc.
-    //
-    wxDeleteStockLists();
-
-    delete wxTheColourDatabase;
-    wxTheColourDatabase = NULL;
-
-    wxBitmap::CleanUpHandlers();
-
     delete[] wxBuffer;
     wxBuffer = NULL;
 
@@ -505,143 +418,16 @@ void wxApp::CleanUp()
 // TODO:        ::DeleteObject( wxDisableButtonBrush );
     }
 
-    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
-
-    wxClassInfo::CleanUpClasses();
+    delete wxWinHandleHash;
+    wxWinHandleHash = NULL;
 
     // Delete Message queue
     if (wxTheApp->m_hMq)
         ::WinDestroyMsgQueue(wxTheApp->m_hMq);
 
-    delete wxTheApp;
-    wxTheApp = NULL;
-
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    // At this point we want to check if there are any memory
-    // blocks that aren't part of the wxDebugContext itself,
-    // as a special case. Then when dumping we need to ignore
-    // wxDebugContext, too.
-    if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
-    {
-        wxLogDebug(wxT("There were memory leaks."));
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
-    }
-    //  wxDebugContext::SetStream(NULL, NULL);
-#endif
-
-#if wxUSE_LOG
-    // do it as the very last thing because everything else can log messages
-    delete wxLog::SetActiveTarget(NULL);
-#endif // wxUSE_LOG
+    wxAppBase::CleanUp();
 } // end of wxApp::CleanUp
 
-//----------------------------------------------------------------------
-// Main wxWindows entry point
-//----------------------------------------------------------------------
-int wxEntry(
-  int                               argc
-, char*                             argv[]
-)
-{
-    HAB                             vHab = 0;
-
-    if (!wxApp::Initialize(vHab))
-        return 0;
-
-    //
-    // create the application object or ensure that one already exists
-    //
-    if (!wxTheApp)
-    {
-        // The app may have declared a global application object, but we recommend
-        // the IMPLEMENT_APP macro is used instead, which sets an initializer
-        // function for delayed, dynamic app object construction.
-        wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
-                     wxT("No initializer - use IMPLEMENT_APP macro.") );
-        wxTheApp = (*wxApp::GetInitializerFunction()) ();
-    }
-    wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
-    wxTheApp->argc = argc;
-
-#if wxUSE_UNICODE
-    wxTheApp->argv = new wxChar*[argc+1];
-
-    int                             nArgc = 0;
-
-    while (nArgc < argc)
-    {
-          wxTheApp->argv[nArgc] = wxStrdup(wxConvLibc.cMB2WX(argv[nArgc]));
-          nArgc++;
-    }
-    wxTheApp->argv[nArgc] = (wxChar *)NULL;
-#else
-    wxTheApp->argv = argv;
-#endif
-
-    wxString                        sName(wxFileNameFromPath(argv[0]));
-
-    wxStripExtension(sName);
-    wxTheApp->SetAppName(sName);
-
-    int                             nRetValue = 0;
-
-    if (!wxTheApp->OnInitGui())
-        nRetValue = -1;
-
-    if (nRetValue == 0)
-    {
-        if (wxTheApp->OnInit())
-        {
-            wxTheApp->OnRun();
-        }
-        // Normal exit
-        wxWindow*                   pTopWindow = wxTheApp->GetTopWindow();
-        if (pTopWindow)
-        {
-            // Forcibly delete the window.
-            if (pTopWindow->IsKindOf(CLASSINFO(wxFrame)) ||
-                pTopWindow->IsKindOf(CLASSINFO(wxDialog)) )
-            {
-                pTopWindow->Close(TRUE);
-                wxTheApp->DeletePendingObjects();
-            }
-            else
-            {
-                delete pTopWindow;
-                wxTheApp->SetTopWindow(NULL);
-            }
-        }
-    }
-    else // app initialization failed
-    {
-        wxLogLastError(" Gui initialization failed, exitting");
-    }
-#if wxUSE_CONSOLEDEBUG
-    printf("wxTheApp->OnExit ");
-    fflush(stdout);
-#endif
-    nRetValue = wxTheApp->OnExit();
-#if wxUSE_CONSOLEDEBUG
-    printf("wxApp::CleanUp ");
-    fflush(stdout);
-#endif
-    wxApp::CleanUp();
-#if wxUSE_CONSOLEDEBUG
-    printf("return %i ", nRetValue);
-    fflush(stdout);
-#endif
-    return(nRetValue);
-} // end of wxEntry
-
 bool wxApp::OnInitGui()
 {
     ERRORID                         vError;
@@ -662,20 +448,11 @@ bool wxApp::OnInitGui()
     return TRUE;
 } // end of wxApp::OnInitGui
 
-//
-// Static member initialization
-//
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-
 wxApp::wxApp()
 {
-    m_topWindow = NULL;
-    wxTheApp = this;
-
     argc = 0;
     argv = NULL;
     m_nPrintMode = wxPRINT_WINDOWS;
-    m_bAuto3D = TRUE;
     m_hMq = 0;
     m_maxSocketHandles = 0;
     m_maxSocketNr = 0;
@@ -698,261 +475,6 @@ wxApp::~wxApp()
 #endif
 } // end of wxApp::~wxApp
 
-bool wxApp::Initialized()
-{
-    if (GetTopWindow())
-        return TRUE;
-    else
-        return FALSE;
-} // end of wxApp::Initialized
-
-//
-// Get and process a message, returning FALSE if WM_QUIT
-// received (and also set the flag telling the app to exit the main loop)
-//
-
-bool wxApp::DoMessage()
-{
-    BOOL                            bRc = ::WinGetMsg(vHabmain, &svCurrentMsg, HWND(NULL), 0, 0);
-
-    if (bRc == 0)
-    {
-        // got WM_QUIT
-        m_bKeepGoing = FALSE;
-        return FALSE;
-    }
-    else if (bRc == -1)
-    {
-        // should never happen, but let's test for it nevertheless
-        wxLogLastError("GetMessage");
-    }
-    else
-    {
-#if wxUSE_THREADS
-        wxASSERT_MSG( wxThread::IsMain()
-                     ,wxT("only the main thread can process Windows messages")
-                    );
-
-        static bool                 sbHadGuiLock = TRUE;
-        static wxMsgArray           svSavedMessages;
-
-        //
-        // If a secondary thread owns is doing GUI calls, save all messages for
-        // later processing - we can't process them right now because it will
-        // lead to recursive library calls (and we're not reentrant)
-        //
-        if (!wxGuiOwnedByMainThread())
-        {
-            sbHadGuiLock = FALSE;
-
-            //
-            // Leave out WM_COMMAND messages: too dangerous, sometimes
-            // the message will be processed twice
-            //
-            if ( !wxIsWaitingForThread() ||
-                    svCurrentMsg.msg != WM_COMMAND )
-            {
-                svSavedMessages.Add(svCurrentMsg);
-            }
-            return TRUE;
-        }
-        else
-        {
-            //
-            // Have we just regained the GUI lock? if so, post all of the saved
-            // messages
-            //
-            if (!sbHadGuiLock )
-            {
-                sbHadGuiLock = TRUE;
-
-                size_t             nCount = svSavedMessages.Count();
-
-                for (size_t n = 0; n < nCount; n++)
-                {
-                    QMSG            vMsg = svSavedMessages[n];
-
-                    DoMessage((WXMSG*)&vMsg);
-                }
-                svSavedMessages.Empty();
-            }
-        }
-#endif // wxUSE_THREADS
-
-        //
-        // Process the message
-        //
-        DoMessage((WXMSG *)&svCurrentMsg);
-    }
-    return TRUE;
-} // end of wxApp::DoMessage
-
-void wxApp::DoMessage(
-  WXMSG*                            pMsg
-)
-{
-    if (!ProcessMessage((WXMSG *)&svCurrentMsg))
-    {
-        ::WinDispatchMsg(vHabmain, (PQMSG)&svCurrentMsg);
-    }
-} // end of wxApp::DoMessage
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Keep trying to process messages until WM_QUIT
-// received.
-//
-// If there are messages to be processed, they will all be
-// processed and OnIdle will not be called.
-// When there are no more messages, OnIdle is called.
-// If OnIdle requests more time,
-// it will be repeatedly called so long as there are no pending messages.
-// A 'feature' of this is that once OnIdle has decided that no more processing
-// is required, then it won't get processing time until further messages
-// are processed (it'll sit in DoMessage).
-//
-//////////////////////////////////////////////////////////////////////////////
-int wxApp::MainLoop()
-{
-    m_bKeepGoing = TRUE;
-
-    while (m_bKeepGoing)
-    {
-#if wxUSE_THREADS
-        wxMutexGuiLeaveOrEnter();
-#endif // wxUSE_THREADS
-        while (!Pending() && ProcessIdle())
-        {
-            HandleSockets();
-            wxUsleep(10000);
-        }
-        HandleSockets();
-        if (Pending())
-            DoMessage();
-        else
-            wxUsleep(10000);
-
-    }
-    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);
-} // end of wxApp::ExitMainLoop
-
-bool wxApp::Pending()
-{
-    return (::WinPeekMsg(vHabmain, (PQMSG)&svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) != 0);
-} // end of wxApp::Pending
-
-void wxApp::Dispatch()
-{
-    DoMessage();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Give all windows a chance to preprocess
-// the message. Some may have accelerator tables, or have
-// MDI complications.
-//
-//////////////////////////////////////////////////////////////////////////////
-bool wxApp::ProcessMessage(
-  WXMSG*                            pWxmsg
-)
-{
-    QMSG*                           pMsg = (PQMSG)pWxmsg;
-    HWND                            hWnd = pMsg->hwnd;
-    wxWindow*                       pWndThis = wxFindWinFromHandle((WXHWND)hWnd);
-    wxWindow*                       pWnd;
-
-    //
-    // Pass non-system timer messages to the wxTimerProc
-    //
-    if (pMsg->msg == WM_TIMER &&
-        (SHORT1FROMMP(pMsg->mp1) != TID_CURSOR &&
-         SHORT1FROMMP(pMsg->mp1) != TID_FLASHWINDOW &&
-         SHORT1FROMMP(pMsg->mp1) != TID_SCROLL &&
-         SHORT1FROMMP(pMsg->mp1) != 0x0000
-        ))
-        wxTimerProc(NULL, 0, (int)pMsg->mp1, 0);
-
-    //
-    // Allow the window to prevent certain messages from being
-    // translated/processed (this is currently used by wxTextCtrl to always
-    // grab Ctrl-C/V/X, even if they are also accelerators in some parent)
-    //
-    if (pWndThis && !pWndThis->OS2ShouldPreProcessMessage(pWxmsg))
-    {
-        return FALSE;
-    }
-
-    //
-    // For some composite controls (like a combobox), wndThis might be NULL
-    // because the subcontrol is not a wxWindow, but only the control itself
-    // is - try to catch this case
-    //
-    while (hWnd && !pWndThis)
-    {
-        hWnd = ::WinQueryWindow(hWnd, QW_PARENT);
-        pWndThis = wxFindWinFromHandle((WXHWND)hWnd);
-    }
-
-    //
-    // Try translations first; find the youngest window with
-    // a translation table. OS/2 has case sensative accels, so
-    // this block, coded by BK, removes that and helps make them
-    // case insensative.
-    //
-    if(pMsg->msg == WM_CHAR)
-    {
-       PBYTE                        pChmsg = (PBYTE)&(pMsg->msg);
-       USHORT                       uSch  = CHARMSG(pChmsg)->chr;
-       bool                         bRc;
-
-       //
-       // Do not process keyup events
-       //
-       if(!(CHARMSG(pChmsg)->fs & KC_KEYUP))
-       {
-           if((CHARMSG(pChmsg)->fs & (KC_ALT | KC_CTRL)) && CHARMSG(pChmsg)->chr != 0)
-                CHARMSG(pChmsg)->chr = (USHORT)wxToupper((UCHAR)uSch);
-
-
-           for(pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() )
-           {
-               if((bRc = pWnd->OS2TranslateMessage(pWxmsg)) == TRUE)
-                   break;
-           }
-
-            if(!bRc)    // untranslated, should restore original value
-                CHARMSG(pChmsg)->chr = uSch;
-        }
-    }
-    //
-    // Anyone for a non-translation message? Try youngest descendants first.
-    //
-//  for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent())
-//  {
-//      if (pWnd->OS2ProcessMessage(pWxmsg))
-//          return TRUE;
-//  }
-    return FALSE;
-} // end of wxApp::ProcessMessage
-
 bool                                gbInOnIdle = FALSE;
 
 void wxApp::OnIdle(
@@ -966,26 +488,9 @@ void wxApp::OnIdle(
     if (gbInOnIdle)
         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();
+    gbInOnIdle = true;
 
-    //
-    // 'Garbage' collection of windows deleted with Close().
-    //
-    DeletePendingObjects();
-
-#if wxUSE_LOG
-    //
-    // Flush the logged messages if any
-    //
-    wxLog::FlushActive();
-#endif // wxUSE_LOG
+    wxAppBase::OnIdle(rEvent);
 
 #if wxUSE_DC_CACHEING
     // automated DC cache management: clear the cached DCs and bitmap
@@ -997,87 +502,9 @@ void wxApp::OnIdle(
         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
 
-// 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::DeletePendingObjects()
-{
-    wxNode*                         pNode = wxPendingDelete.First();
-
-    while (pNode)
-    {
-        wxObject*                   pObj = (wxObject *)pNode->Data();
-
-        delete pObj;
-
-        if (wxPendingDelete.Member(pObj))
-            delete pNode;
-
-        //
-        // Deleting one object may have deleted other pending
-        // objects, so start from beginning of list again.
-        //
-        pNode = wxPendingDelete.First();
-    }
-} // end of wxApp::DeletePendingObjects
-
 void wxApp::OnEndSession(
   wxCloseEvent&                     WXUNUSED(rEvent))
 {
@@ -1100,14 +527,6 @@ void wxApp::OnQueryEndSession(
     }
 } // end of wxApp::OnQueryEndSession
 
-void wxApp::Exit()
-{
-    wxApp::CleanUp();
-
-    // VZ: must really exit somehow, insert appropriate OS/2 syscall (FIXME)
-    wxAppConsole::Exit();
-} // end of wxExit
-
 //
 // Yield to incoming messages
 //
@@ -1145,7 +564,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 #if wxUSE_THREADS
         wxMutexGuiLeaveOrEnter();
 #endif // wxUSE_THREADS
-        if (!wxTheApp->DoMessage())
+        if (!wxTheApp->Dispatch())
             break;
     }
     //
@@ -1154,6 +573,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
     if (wxTheApp)
         wxTheApp->ProcessPendingEvents();
 
+    HandleSockets();
     //
     // Let the logs be flashed again
     //
@@ -1231,7 +651,7 @@ void wxApp::WakeUpIdle()
             //
             // Should never happen
             //
-            wxLogLastError("PostMessage(WM_NULL)");
+            wxLogLastError(wxT("PostMessage(WM_NULL)"));
         }
     }
 } // end of wxWakeUpIdle
@@ -1241,10 +661,7 @@ HAB wxGetInstance()
     return vHabmain;
 }
 
-void wxSetInstance(
-  HAB                               vHab
-)
+void wxSetInstance( HAB vHab )
 {
     vHabmain = vHab;
 }
-