no changes, just refactor the code sending spin update event to SendSpinUpdate()...

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

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 737de733cfca887bff142a9fa0f1d8a4bbdb5b78..65b080d5e955ec2d949e4b14c294dbe4b991d445 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.cpp
+// Name:        src/os2/app.cpp

 // Purpose:     wxApp
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxApp
 // Author:      David Webster
 // Modified by:


@@ -12,9 +12,11 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/app.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/dynarray.h"

     #include "wx/frame.h"
     #include "wx/frame.h"

-    #include "wx/app.h"

     #include "wx/utils.h"
     #include "wx/gdicmn.h"
     #include "wx/pen.h"
     #include "wx/utils.h"
     #include "wx/gdicmn.h"
     #include "wx/pen.h"


@@ -26,31 +28,52 @@
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"

-    #include "wx/dynarray.h"
-#   include "wx/wxchar.h"
-#   include "wx/icon.h"
+    #include "wx/wxchar.h"
+    #include "wx/log.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/log.h"
-#include "wx/module.h"
+#include "wx/stdpaths.h"
+#include "wx/filename.h"

 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 

-#if wxUSE_THREADS
-    #include "wx/thread.h"
+#ifdef __EMX__

 
 

-    // define the array of QMSG strutures
-    WX_DECLARE_OBJARRAY(QMSG, wxMsgArray);
+#include <sys/ioctl.h>
+#include <sys/select.h>

 
 

-    #include "wx/arrimpl.cpp"
+#else

 
 

-    WX_DEFINE_OBJARRAY(wxMsgArray);
-#endif // wxUSE_THREADS
+#include <nerrno.h>
+#include <sys/ioctl.h>
+#include <sys/select.h>
+#include <sys/time.h>
+
+#endif //
+
+#if defined(__WATCOMC__)
+
+#include <tcpustd.h>
+
+#elif !defined(__EMX__)

 
 

-#if wxUSE_WX_RESOURCES
-    #include "wx/resource.h"
+#define select(a,b,c,d,e) bsdselect(a,b,c,d,e)
+extern "C" int _System bsdselect(int,
+                                 struct fd_set *,
+                                 struct fd_set *,
+                                 struct fd_set *,
+                                 struct timeval *);

 #endif
 
 #endif
 

+#if wxUSE_THREADS
+    #include "wx/thread.h"
+#endif // wxUSE_THREADS
+
+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif // wxUSE_TOOLTIPS
+

 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 


@@ -58,29 +81,11 @@
 // global variables
 // ---------------------------------------------------------------------------
 
 // global variables
 // ---------------------------------------------------------------------------
 

-extern wxChar*                      wxBuffer;
-extern wxChar*                      wxOsVersion;
-extern wxList*                      wxWinHandleList;
-extern wxList WXDLLEXPORT           wxPendingDelete;
+WXDLLEXPORT_DATA(wxChar*) wxBuffer;

 extern wxCursor*                    g_globalCursor;
 
 extern wxCursor*                    g_globalCursor;
 

-HINSTANCE                           wxhInstance = 0;
-QMSG                                svCurrentMsg;
-wxApp*                              wxTheApp = NULL;
-HAB                                 vHabmain = NULL;
+HAB                                 vHabmain = NULLHANDLE;

 
 

-// FIXME why not const? and not static?
-
-// NB: all "NoRedraw" classes must have the same names as the "normal" classes
-//     with NR suffix - wxWindow::OS2Create() supposes this
-wxChar wxFrameClassName[]                 = wxT("wxFrameClass");
-wxChar wxFrameClassNameNoRedraw[]         = wxT("wxFrameClassNR");
-wxChar wxMDIFrameClassName[]              = wxT("wxMDIFrameClass");
-wxChar wxMDIFrameClassNameNoRedraw[]      = wxT("wxMDIFrameClassNR");
-wxChar wxMDIChildFrameClassName[]         = wxT("wxMDIChildFrameClass");
-wxChar wxMDIChildFrameClassNameNoRedraw[] = wxT("wxMDIChildFrameClassNR");
-wxChar wxPanelClassName[]                 = wxT("wxPanelClass");
-wxChar wxCanvasClassName[]                = wxT("wxCanvasClass");

 
 HICON wxSTD_FRAME_ICON          = (HICON) NULL;
 HICON wxSTD_MDICHILDFRAME_ICON  = (HICON) NULL;
 
 HICON wxSTD_FRAME_ICON          = (HICON) NULL;
 HICON wxSTD_MDICHILDFRAME_ICON  = (HICON) NULL;


@@ -92,16 +97,82 @@ HICON wxDEFAULT_MDIPARENTFRAME_ICON  = (HICON) NULL;
 
 HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
 
 
 HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
 

-MRESULT EXPENTRY wxWndProc( HWND
-                           ,ULONG
-                           ,MPARAM
-                           ,MPARAM
-                          );
+MRESULT EXPENTRY wxWndProc( HWND hWnd,ULONG message,MPARAM mp1,MPARAM mp2);
+MRESULT EXPENTRY wxFrameWndProc( HWND hWnd,ULONG message,MPARAM mp1,MPARAM mp2);

 
 // ===========================================================================
 // implementation
 // ===========================================================================
 
 
 // ===========================================================================
 // implementation
 // ===========================================================================
 

+// ---------------------------------------------------------------------------
+// helper struct and functions for socket handling
+// ---------------------------------------------------------------------------
+
+struct GsocketCallbackInfo{
+    void (*proc)(void *);
+    int type;
+    int handle;
+    void* gsock;
+};
+
+// These defines are used here and in gsockpm.cpp
+#define wxSockReadMask  0x01
+#define wxSockWriteMask 0x02
+
+void wxApp::HandleSockets()
+{
+    bool pendingEvent = false;
+
+    // Check whether it's time for Gsocket operation
+    if (m_maxSocketHandles > 0 && m_maxSocketNr > 0)
+    {
+        fd_set readfds = m_readfds;
+        fd_set writefds = m_writefds;
+        struct timeval timeout;
+        int i;
+        struct GsocketCallbackInfo
+          *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+        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 < m_maxSocketNr - 1) ? i++ : (i = 0))
+            {
+                if (FD_ISSET(i, &readfds))
+                {
+                    int r;
+                    for (r = 0; r < m_maxSocketHandles; r++){
+                        if(CallbackInfo[r].handle == i &&
+                           CallbackInfo[r].type == wxSockReadMask)
+                            break;
+                    }
+                    if (r < m_maxSocketHandles)
+                    {
+                        CallbackInfo[r].proc(CallbackInfo[r].gsock);
+                        pendingEvent = true;
+                    }
+                }
+                if (FD_ISSET(i, &writefds))
+                {
+                    int r;
+                    for (r = 0; r < m_maxSocketHandles; r++)
+                        if(CallbackInfo[r].handle == i &&
+                           CallbackInfo[r].type == wxSockWriteMask)
+                            break;
+                    if (r < m_maxSocketHandles)
+                    {
+                        CallbackInfo[r].proc(CallbackInfo[r].gsock);
+                        pendingEvent = true;
+                    }
+                }
+            }
+            m_lastUsedHandle = i;
+        }
+        if (pendingEvent)
+            ProcessPendingEvents();
+    }
+}

 // ---------------------------------------------------------------------------
 // wxApp
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxApp
 // ---------------------------------------------------------------------------


@@ -114,20 +185,52 @@ MRESULT EXPENTRY wxWndProc( HWND
         EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
     END_EVENT_TABLE()
 
         EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
     END_EVENT_TABLE()
 

-//// Initialize
-bool wxApp::Initialize(
-  HAB                               vHab
-)
+//
+// Initialize
+//
+bool wxApp::Initialize(int& argc, wxChar **argv)

 {
 {

+    if ( !wxAppBase::Initialize(argc, argv) )
+        return false;
+
+#if defined(wxUSE_CONSOLEDEBUG)
+  #if wxUSE_CONSOLEDEBUG
+/***********************************************/
+/* Code for using stdout debug                 */
+/* To use it you mast link app as "Window" - EK*/
+/***********************************************/
+  {
+     PPIB pib;
+     PTIB tib;
+
+    printf("In console\n");
+
+  DosGetInfoBlocks(&tib, &pib);
+/* Try morphing into a PM application. */
+//  if(pib->pib_ultype == 2)    /* VIO */
+    pib->pib_ultype = 3;
+   }
+/**********************************************/
+/**********************************************/
+  #endif //wxUSE_CONSOLEDEBUG
+#endif
+

     //
     // OS2 has to have an anchorblock
     //
     //
     // 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;
+        return false;
+    }
+
+    wxBuffer = new wxChar[1500]; // FIXME; why?

 
     // Some people may wish to use this, but
     // probably it shouldn't be here by default.
 
     // Some people may wish to use this, but
     // probably it shouldn't be here by default.


@@ -135,41 +238,7 @@ bool wxApp::Initialize(
     //    wxRedirectIOToConsole();
 #endif
 
     //    wxRedirectIOToConsole();
 #endif
 

-    wxBuffer = new wxChar[1500]; // FIXME; why?
-
-    wxClassInfo::InitializeClasses();
-
-#if wxUSE_RESOURCES
-    wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion);
-#endif
-
-    // I'm annoyed ... I don't know where to put this and I don't want to
-    // create a module for that as it's part of the core.
-    wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-    wxTheColourDatabase->Initialize();
-
-    wxInitializeStockLists();
-    wxInitializeStockObjects();
-
-#if wxUSE_WX_RESOURCES
-    wxInitializeResourceSystem();
-#endif
-
-    wxBitmap::InitStandardHandlers();
-
-    g_globalCursor = new wxCursor;
-
-#if 0
-    wxSTD_FRAME_ICON = ::WinLoadFileIcon(wxT("wxSTD_FRAME"), TRUE);
-    wxSTD_MDIPARENTFRAME_ICON = ::WinLoadFileIcon(wxT("wxSTD_MDIPARENTFRAME"), TRUE);
-    wxSTD_MDICHILDFRAME_ICON = ::WinLoadFileIcon(wxT("wxSTD_MDICHILDFRAME"), TRUE);
-
-    wxDEFAULT_FRAME_ICON = ::WinLoadFileIcon(wxT("wxDEFAULT_FRAME"), TRUE);
-    wxDEFAULT_MDIPARENTFRAME_ICON = ::WinLoadFileIcon(wxT("wxDEFAULT_MDIPARENTFRAME"), TRUE);
-    wxDEFAULT_MDICHILDFRAME_ICON = ::WinLoadFileIcon(wxT("wxDEFAULT_MDICHILDFRAME"), TRUE);
-#endif
-    RegisterWindowClasses(vHab);
-    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.
 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.
     // PLEASE DO NOT ALTER THIS.


@@ -180,184 +249,152 @@ bool wxApp::Initialize(
 
     // wxSetKeyboardHook(TRUE);
 
 
     // wxSetKeyboardHook(TRUE);
 

-    wxModule::RegisterModules();
-    if (!wxModule::InitializeModules())
-        return FALSE;
-    return TRUE;
-}
+    RegisterWindowClasses(vHabmain);
+
+    return true;
+} // end of wxApp::Initialize

 
 

+const char*                         CANTREGISTERCLASS = " Can't register Class ";

 // ---------------------------------------------------------------------------
 // RegisterWindowClasses
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // RegisterWindowClasses
 // ---------------------------------------------------------------------------
 

-// TODO we should only register classes really used by the app. For this it
-//      would be enough to just delay the class registration until an attempt
-//      to create a window of this class is made.
-bool wxApp::RegisterWindowClasses(
-  HAB                               vHab
-)
+bool wxApp::RegisterWindowClasses( HAB vHab )

 {
 {

-    APIRET                          rc;
-    ERRORID                         vError = 0L;
-    wxString                        sError;
+    ERRORID vError = 0L;
+    wxString sError;

 
     if (!::WinRegisterClass( vHab
 
     if (!::WinRegisterClass( vHab

-                            ,wxFrameClassName
-                            ,(PFNWP)wxWndProc
+                            ,(PSZ)wxFrameClassName
+                            ,wxFrameWndProc

                             ,CS_SIZEREDRAW | CS_SYNCPAINT
                             ,sizeof(ULONG)
                            ))
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
                             ,CS_SIZEREDRAW | CS_SYNCPAINT
                             ,sizeof(ULONG)
                            ))
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);

-        wxLogLastError(sError);
-        return FALSE;
+        wxLogLastError(sError.c_str());
+        return false;

     }
 
     if (!::WinRegisterClass( vHab
     }
 
     if (!::WinRegisterClass( vHab

-                            ,wxFrameClassNameNoRedraw
-                            ,(PFNWP)wxWndProc
-                            ,0
+                            ,(PSZ)wxFrameClassNameNoRedraw
+                            ,wxWndProc

                             ,0
                             ,0

+                            ,sizeof(ULONG)

                            ))
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
                            ))
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);

-        wxLogLastError(sError);
-        return FALSE;
+        wxLogLastError(sError.c_str());
+        return false;

     }
 
     if (!::WinRegisterClass( vHab
     }
 
     if (!::WinRegisterClass( vHab

-                            ,wxMDIFrameClassName
-                            ,(PFNWP)wxWndProc
-                            ,CS_SIZEREDRAW | CS_SYNCPAINT
-                            ,0
+                            ,(PSZ)wxMDIFrameClassName
+                            ,wxWndProc
+                            ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT
+                            ,sizeof(ULONG)

                            ))
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
                            ))
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);

-        wxLogLastError(sError);
-        return FALSE;
+        wxLogLastError(sError.c_str());
+        return false;

     }
 
     if (!::WinRegisterClass( vHab
     }
 
     if (!::WinRegisterClass( vHab

-                            ,wxMDIFrameClassNameNoRedraw
-                            ,(PFNWP)wxWndProc
-                            ,0
+                            ,(PSZ)wxMDIFrameClassNameNoRedraw
+                            ,wxWndProc

                             ,0
                             ,0

+                            ,sizeof(ULONG)

                            ))
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
                            ))
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);

-        wxLogLastError(sError);
-        return FALSE;
+        wxLogLastError(sError.c_str());
+        return false;

     }
 
     if (!::WinRegisterClass( vHab
     }
 
     if (!::WinRegisterClass( vHab

-                            ,wxMDIChildFrameClassName
-                            ,(PFNWP)wxWndProc
+                            ,(PSZ)wxMDIChildFrameClassName
+                            ,wxWndProc

                             ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST
                             ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST

-                            ,0
+                            ,sizeof(ULONG)

                            ))
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
                            ))
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);

-        wxLogLastError(sError);
-        return FALSE;
+        wxLogLastError(sError.c_str());
+        return false;

     }
 
     if (!::WinRegisterClass( vHab
     }
 
     if (!::WinRegisterClass( vHab

-                            ,wxMDIChildFrameClassNameNoRedraw
-                            ,(PFNWP)wxWndProc
+                            ,(PSZ)wxMDIChildFrameClassNameNoRedraw
+                            ,wxWndProc

                             ,CS_HITTEST
                             ,CS_HITTEST

-                            ,0
+                            ,sizeof(ULONG)

                            ))
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
                            ))
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);

-        wxLogLastError(sError);
-        return FALSE;
+        wxLogLastError(sError.c_str());
+        return false;

     }
 
     if (!::WinRegisterClass( vHab
     }
 
     if (!::WinRegisterClass( vHab

-                            ,wxPanelClassName
-                            ,(PFNWP)wxWndProc
+                            ,(PSZ)wxPanelClassName
+                            ,wxWndProc

                             ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
                             ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT

-                            ,0
+                            ,sizeof(ULONG)

                            ))
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
                            ))
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);

-        wxLogLastError(sError);
-        return FALSE;
+        wxLogLastError(sError.c_str());
+        return false;

     }
 
     if (!::WinRegisterClass( vHab
     }
 
     if (!::WinRegisterClass( vHab

-                            ,wxCanvasClassName
-                            ,(PFNWP)wxWndProc
-                            ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
-                            ,0
+                            ,(PSZ)wxCanvasClassName
+                            ,wxWndProc
+                            ,CS_SIZEREDRAW | CS_HITTEST | CS_SYNCPAINT
+                            ,sizeof(ULONG)

                            ))
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
                            ))
     {
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);

-        wxLogLastError(sError);
-        return FALSE;
+        wxLogLastError(sError.c_str());
+        return false;

     }
     }

-    return TRUE;
-}
-
-//// Cleans up any wxWindows internal structures left lying around
+    if (!::WinRegisterClass( vHab
+                            ,(PSZ)wxCanvasClassNameNR
+                            ,wxWndProc
+                            ,CS_HITTEST | CS_SYNCPAINT
+                            ,sizeof(ULONG)
+                           ))
+    {
+        vError = ::WinGetLastError(vHab);
+        sError = wxPMErrorToStr(vError);
+        wxLogLastError(sError.c_str());
+        return false;
+    }
+    return true;
+} // end of wxApp::RegisterWindowClasses

 
 

+//
+// Cleans up any wxWidgets internal structures left lying around
+//

 void wxApp::CleanUp()
 {
 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();
-
-#if wxUSE_WX_RESOURCES
-    wxCleanUpResourceSystem();
-
-    //  wxDefaultResourceTable->ClearTable();
-#endif
-
-    // Indicate that the cursor can be freed, so that cursor won't be deleted
-    // by deleting the bitmap list before g_globalCursor goes out of scope
-    // (double deletion of the cursor).
-    wxSetCursor(wxNullCursor);
-    delete g_globalCursor;
-    g_globalCursor = NULL;
-
-    wxDeleteStockObjects();
-
-    // Destroy all GDI lists, etc.
-    wxDeleteStockLists();
-
-    delete wxTheColourDatabase;
-    wxTheColourDatabase = NULL;
-
-    wxBitmap::CleanUpHandlers();
-

     delete[] wxBuffer;
     wxBuffer = NULL;
 
     delete[] wxBuffer;
     wxBuffer = NULL;
 

-    //// PM-SPECIFIC CLEANUP
+    //
+    // PM-SPECIFIC CLEANUP
+    //

 
 

-    // wxSetKeyboardHook(FALSE);
+    // wxSetKeyboardHook(false);

 
     if (wxSTD_FRAME_ICON)
         ::WinFreeFileIcon(wxSTD_FRAME_ICON);
 
     if (wxSTD_FRAME_ICON)
         ::WinFreeFileIcon(wxSTD_FRAME_ICON);


@@ -378,128 +415,23 @@ void wxApp::CleanUp()
 // TODO:        ::DeleteObject( wxDisableButtonBrush );
     }
 
 // TODO:        ::DeleteObject( wxDisableButtonBrush );
     }
 

-    if (wxWinHandleList)
-        delete wxWinHandleList;
-
-    // GL: I'm annoyed ... I don't know where to put this and I don't want to
-    // create a module for that as it's part of the core.
-#if wxUSE_THREADS
-    delete wxPendingEvents;
-    delete wxPendingEventsLocker;
-    // If we don't do the following, we get an apparent memory leak.
-    ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
-#endif
-
-    wxClassInfo::CleanUpClasses();
-
-    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
-}
-
-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];
+    delete wxWinHandleHash;
+    wxWinHandleHash = NULL;

 
 

-    int                             nArgc = 0;
+    // Delete Message queue
+    if (wxTheApp->m_hMq)
+        ::WinDestroyMsgQueue(wxTheApp->m_hMq);

 
 

-    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())
-        {
-            nRetValue = wxTheApp->OnRun();
-//          nRetValue = -1;
-        }
-    }
-
-    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);
-        }
-    }
-    wxTheApp->OnExit();
-    wxApp::CleanUp();
-    return(nRetValue);
-}
+    wxAppBase::CleanUp();
+} // end of wxApp::CleanUp

 
 bool wxApp::OnInitGui()
 {
 
 bool wxApp::OnInitGui()
 {

-    ERRORID                         vError;
-    wxString                        sError;
+    ERRORID vError;
+    wxString sError;
+
+    if (!wxAppBase::OnInitGui())
+        return false;

 
     m_hMq = ::WinCreateMsgQueue(vHabmain, 0);
     if (!m_hMq)
 
     m_hMq = ::WinCreateMsgQueue(vHabmain, 0);
     if (!m_hMq)


@@ -507,447 +439,221 @@ bool wxApp::OnInitGui()
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
         wxLogDebug(sError);
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
         wxLogDebug(sError);

-        return FALSE;
+        return false;

     }
     }

-    return TRUE;
-}

 
 

-//
-// Static member initialization
-//
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
+    return true;
+} // end of wxApp::OnInitGui

 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {

-    m_topWindow = NULL;
-    wxTheApp = this;
-    m_wantDebugOutput = TRUE;
-

     argc = 0;
     argv = NULL;
     m_nPrintMode = wxPRINT_WINDOWS;
     argc = 0;
     argv = NULL;
     m_nPrintMode = wxPRINT_WINDOWS;

-    m_exitOnFrameDelete = TRUE;
-    m_bAuto3D = TRUE;
-}
+    m_hMq = 0;
+    m_maxSocketHandles = 0;
+    m_maxSocketNr = 0;
+    m_sockCallbackInfo = 0;
+} // end of wxApp::wxApp

 
 wxApp::~wxApp()
 {
 
 wxApp::~wxApp()
 {

-#if wxUSE_UNICODE
+    //

     // Delete command-line args
     // Delete command-line args

-    int i;
+    //
+#if wxUSE_UNICODE
+    int                             i;
+

     for (i = 0; i < argc; i++)
     {
         delete[] argv[i];
     }
     delete[] argv;
 #endif
     for (i = 0; i < argc; i++)
     {
         delete[] argv[i];
     }
     delete[] argv;
 #endif

-}
+} // end of wxApp::~wxApp

 
 

-bool wxApp::Initialized()
-{
-    if (GetTopWindow())
-        return TRUE;
-    else
-        return FALSE;
-}
+bool gbInOnIdle = false;

 
 

-//
-// 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()
+void wxApp::OnIdle( wxIdleEvent& rEvent )

 {
 {

-    BOOL                            bRc = ::WinGetMsg(vHabmain, &m_vMsg, 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
-            //
-            // FIXME of course, it's not _exactly_ the same as processing the
-            //       messages normally - expect some things to break...
-            //
-            if (!sbHadGuiLock )
-            {
-                sbHadGuiLock = TRUE;
+    //
+    // Avoid recursion (via ProcessEvent default case)
+    //
+    if (gbInOnIdle)
+        return;

 
 

-                size_t             nCount = svSavedMessages.Count();
+    gbInOnIdle = true;

 
 

-                for (size_t n = 0; n < nCount; n++)
-                {
-                    QMSG            vMsg = svSavedMessages[n];
+    wxAppBase::OnIdle(rEvent);

 
 

-                    if ( !ProcessMessage((WXMSG *)&vMsg) )
-                    {
-                        ::WinDispatchMsg(vHabmain, &vMsg);
-                    }
-                }
-                svSavedMessages.Empty();
-            }
-        }
-#endif // wxUSE_THREADS
+#if wxUSE_DC_CACHEING
+    // automated DC cache management: clear the cached DCs and bitmap
+    // if it's likely that the app has finished with them, that is, we
+    // get an idle event and we're not dragging anything.
+    if (!::WinGetKeyState(HWND_DESKTOP, VK_BUTTON1) &&
+        !::WinGetKeyState(HWND_DESKTOP, VK_BUTTON3) &&
+        !::WinGetKeyState(HWND_DESKTOP, VK_BUTTON2))
+        wxDC::ClearCache();
+#endif // wxUSE_DC_CACHEING

 
 

-        // Process the message
-        if (!ProcessMessage((WXMSG *)&svCurrentMsg) )
-        {
-            ::WinDispatchMsg(vHabmain, (PQMSG)&svCurrentMsg);
-        }
-    }
-    return TRUE;
-}
+    gbInOnIdle = false;
+} // end of wxApp::OnIdle

 
 

-//////////////////////////////////////////////////////////////////////////////
-//
-// 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()
+void wxApp::OnEndSession(
+  wxCloseEvent&                     WXUNUSED(rEvent))

 {
 {

-    m_bKeepGoing = TRUE;
-
-    while (m_bKeepGoing)
-    {
-#if wxUSE_THREADS
-        wxMutexGuiLeaveOrEnter();
-#endif // wxUSE_THREADS
-        while (!::WinPeekMsg(vHabmain, &svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) &&
-                ProcessIdle() )
-        {
-        }
-        DoMessage();
-    }
-    return (int)svCurrentMsg.mp1;
-}
+    if (GetTopWindow())
+        GetTopWindow()->Close(true);
+} // end of wxApp::OnEndSession

 
 //
 
 //

-// Returns TRUE if more time is needed.
+// Default behaviour: close the application with prompts. The
+// user can veto the close, and therefore the end session.

 //
 //

-bool wxApp::ProcessIdle()
+void wxApp::OnQueryEndSession( wxCloseEvent& rEvent )

 {
 {

-    wxIdleEvent                     vEvent;
-
-    vEvent.SetEventObject(this);
-    ProcessEvent(vEvent);
-    return vEvent.MoreRequested();
-}
-
-#if wxUSE_THREADS
-void wxApp::ProcessPendingEvents()
-{
-    wxNode*                         pNode = wxPendingEvents->First();
-    wxCriticalSectionLocker         vLocker(*wxPendingEventsLocker);
-
-    while (pNode)
+    if (GetTopWindow())

     {
     {

-        wxEvtHandler*               pHandler = (wxEvtHandler *)pNode->Data();
-        pHandler->ProcessPendingEvents();
-
-        delete pNode;
-        pNode = wxPendingEvents->First();
+        if (!GetTopWindow()->Close(!rEvent.CanVeto()))
+            rEvent.Veto(true);

     }
     }

-}
-#endif
+} // end of wxApp::OnQueryEndSession

 
 

-void wxApp::ExitMainLoop()
-{
-    m_bKeepGoing = FALSE;
-}
-
-bool wxApp::Pending()
-{
-    return (::WinPeekMsg(vHabmain, (PQMSG)&svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) != 0);
-}
-
-void wxApp::Dispatch()
-{
-    DoMessage();
-}
-
-//////////////////////////////////////////////////////////////////////////////

 //
 //

-// Give all windows a chance to preprocess
-// the message. Some may have accelerator tables, or have
-// MDI complications.
+// Yield to incoming messages

 //
 //

-//////////////////////////////////////////////////////////////////////////////
-bool wxApp::ProcessMessage(
-  WXMSG*                            pWxmsg
-)
+bool wxApp::Yield(bool onlyIfNeeded)

 {
 {

-    QMSG*                           vMsg = (PQMSG)pWxmsg;
-    HWND                            hWnd = vMsg->hwnd;
-    wxWindow*                       pWndThis = wxFindWinFromHandle((WXHWND)hWnd);
-    wxWindow*                       pWnd;
+    static bool s_inYield = 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)
+    if ( s_inYield )

     {
     {

-        hWnd = ::WinQueryWindow(hWnd, QW_PARENT);
-        pWndThis = wxFindWinFromHandle((WXHWND)hWnd);
-    }
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( _T("wxYield() called recursively") );
+        }

 
 

-    // 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;

     }
     }

-    return FALSE;
-}

 
 

-void wxApp::OnIdle(
-  wxIdleEvent&                      rEvent
-)
-{
-    static bool                     sbInOnIdle = FALSE;
+    HAB vHab = 0;
+    QMSG vMsg;

 
     //
 
     //

-    // Avoid recursion (via ProcessEvent default case)
+    // Disable log flushing from here because a call to wxYield() shouldn't
+    // normally result in message boxes popping up &c

     //
     //

-    if (sbInOnIdle )
-        return;
+    wxLog::Suspend();

 
 

-    sbInOnIdle = TRUE;
+    s_inYield = true;

 
     //
 
     //

-    // 'Garbage' collection of windows deleted with Close().
+    // We want to go back to the main message loop
+    // if we see a WM_QUIT. (?)

     //
     //

-    DeletePendingObjects();
-
-#if wxUSE_LOG
-    // flush the logged messages if any
-    wxLog*                          pLog = wxLog::GetActiveTarget();
-
-    if (pLog != NULL && pLog->HasPendingMessages())
-        pLog->Flush();
-#endif // wxUSE_LOG
-
-    // Send OnIdle events to all windows
-    if (SendIdleEvents())
+    while (::WinPeekMsg(vHab, &vMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) && vMsg.msg != WM_QUIT)

     {
     {

-        //
-        // SendIdleEvents() returns TRUE if at least one window requested more
-        // idle events
-        //
-        rEvent.RequestMore(TRUE);
+#if wxUSE_THREADS
+        wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS
+        if (!wxTheApp->Dispatch())
+            break;

     }
     }

-

     //
     // If they are pending events, we must process them.
     //
     //
     // If they are pending events, we must process them.
     //

-#if wxUSE_THREADS
-    ProcessPendingEvents();
-#endif
-    sbInOnIdle = FALSE;
-}
-
-void wxWakeUpIdle()
-{
-    // **** please implement me! ****
-    // Wake up the idle handler processor, even if it is in another thread...
-}
-
-// 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 (wxTheApp)
+        wxTheApp->ProcessPendingEvents();

 
 

-        if (SendIdleEvents(pWin))
-            bNeedMore = TRUE;
-        pNode = pNode->GetNext();
-    }
-    return bNeedMore;
-}
-
-//
-// 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;
-}
+    HandleSockets();
+    //
+    // Let the logs be flashed again
+    //
+    wxLog::Resume();
+    s_inYield = false;
+    return true;
+} // end of wxYield

 
 

-void wxApp::DeletePendingObjects()
+int wxApp::AddSocketHandler(int handle, int mask,
+                            void (*callback)(void*), void * gsock)

 {
 {

-    wxNode*                         pNode = wxPendingDelete.First();
+    int find;
+    struct GsocketCallbackInfo
+        *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;

 
 

-    while (pNode)
+    for (find = 0; find < m_maxSocketHandles; find++)
+        if (CallbackInfo[find].handle == -1)
+            break;
+    if (find == m_maxSocketHandles)

     {
     {

-        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();
+        // Allocate new memory
+        m_sockCallbackInfo = realloc(m_sockCallbackInfo,
+                                     (m_maxSocketHandles+=10)*
+                                     sizeof(struct GsocketCallbackInfo));
+        CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+        for (find = m_maxSocketHandles - 10; find < m_maxSocketHandles; find++)
+            CallbackInfo[find].handle = -1;
+        find = m_maxSocketHandles - 10;

     }
     }

+    CallbackInfo[find].proc = callback;
+    CallbackInfo[find].type = mask;
+    CallbackInfo[find].handle = handle;
+    CallbackInfo[find].gsock = gsock;
+    if (mask & wxSockReadMask)
+        FD_SET(handle, &m_readfds);
+    if (mask & wxSockWriteMask)
+        FD_SET(handle, &m_writefds);
+    if (handle >= m_maxSocketNr)
+        m_maxSocketNr = handle + 1;
+    return find;

 }
 
 }
 

-void wxApp::OnEndSession(
-  wxCloseEvent&                     WXUNUSED(rEvent))
+void wxApp::RemoveSocketHandler(int handle)

 {
 {

-    if (GetTopWindow())
-        GetTopWindow()->Close(TRUE);
-}
-
-//
-// Default behaviour: close the application with prompts. The
-// user can veto the close, and therefore the end session.
-//
-void wxApp::OnQueryEndSession(
-  wxCloseEvent&                     rEvent
-)
-{
-    if (GetTopWindow())
+    struct GsocketCallbackInfo
+        *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+    if (handle < m_maxSocketHandles)

     {
     {

-        if (!GetTopWindow()->Close(!rEvent.CanVeto()))
-            rEvent.Veto(TRUE);
+        if (CallbackInfo[handle].type & wxSockReadMask)
+            FD_CLR(CallbackInfo[handle].handle, &m_readfds);
+        if (CallbackInfo[handle].type & wxSockWriteMask)
+            FD_CLR(CallbackInfo[handle].handle, &m_writefds);
+        CallbackInfo[handle].handle = -1;

     }
 }
 
     }
 }
 

-void wxExit()
-{
-    wxLogError(_("Fatal error: exiting"));
+//-----------------------------------------------------------------------------
+// wxWakeUpIdle
+//-----------------------------------------------------------------------------

 
 

-    wxApp::CleanUp();
-}
-
-// Yield to incoming messages
-bool wxYield()
+void wxApp::WakeUpIdle()

 {
 {

-    HAB                             vHab = 0;
-    QMSG                            vMsg;
-    // We want to go back to the main message loop
-    // if we see a WM_QUIT. (?)
-    while (::WinPeekMsg(vHab, &vMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) && vMsg.msg != WM_QUIT)
-    {
-        if (!wxTheApp->DoMessage())
-            break;
-    }
-    // If they are pending events, we must process them.
-#if wxUSE_THREADS
-    wxTheApp->ProcessPendingEvents();
-#endif
-    return TRUE;
-}
+    //
+    // Send the top window a dummy message so idle handler processing will
+    // start up again.  Doing it this way ensures that the idle handler
+    // wakes up in the right thread (see also wxWakeUpMainThread() which does
+    // the same for the main app thread only)
+    //
+    wxWindow*                       pTopWindow = wxTheApp->GetTopWindow();

 
 

-wxIcon wxApp::GetStdIcon(
-  int                               nWhich
-) const
-{
-    switch(nWhich)
+    if (pTopWindow)

     {
     {

-        case wxICON_INFORMATION:
-            return wxIcon("wxICON_INFO");
-
-        case wxICON_QUESTION:
-            return wxIcon("wxICON_QUESTION");
-
-        case wxICON_EXCLAMATION:
-            return wxIcon("wxICON_WARNING");
-
-        default:
-            wxFAIL_MSG(wxT("requested non existent standard icon"));
-            // still fall through
-
-        case wxICON_HAND:
-            return wxIcon("wxICON_ERROR");
+        if ( !::WinPostMsg(GetHwndOf(pTopWindow), WM_NULL, (MPARAM)0, (MPARAM)0))
+        {
+            //
+            // Should never happen
+            //
+            wxLogLastError(wxT("PostMessage(WM_NULL)"));
+        }

     }
     }

-    return wxIcon("wxICON_ERROR");
-}
+} // end of wxWakeUpIdle

 
 

-HINSTANCE wxGetInstance()
+HAB wxGetInstance()

 {
 {

-    return wxhInstance;
+    return vHabmain;

 }
 
 }
 

-void wxSetInstance(HINSTANCE hInst)
+void wxSetInstance( HAB vHab )

 {
 {

-    wxhInstance = hInst;
+    vHabmain = vHab;

 }
 }

-