Fixed my utnpaste error (thanks to Marcin Wojdyr

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

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 9fd52c76b7ba756aa87684a7586fd853e4cc90b2..1e1a4a4456c19c7ccbc01c71a95484ffcc51b06c 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -27,8 +27,9 @@
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/dynarray.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/icon.h"
+    #include "wx/timer.h"

 #endif
 
 #include "wx/log.h"
 #endif
 
 #include "wx/log.h"


@@ -36,6 +37,30 @@
 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 

+#ifdef __EMX__
+
+#include <sys/ioctl.h>
+#include <sys/select.h>
+
+#else
+
+#include <nerrno.h>
+#include <sys/ioctl.h>
+#include <sys/select.h>
+#include <sys/time.h>
+
+#endif //
+
+#ifndef __EMX__
+
+#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
+

 #if wxUSE_THREADS
     #include "wx/thread.h"
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 


@@ -63,7 +88,6 @@
 // ---------------------------------------------------------------------------
 
 extern wxChar*                      wxBuffer;
 // ---------------------------------------------------------------------------
 
 extern wxChar*                      wxBuffer;

-extern wxChar*                      wxOsVersion;

 extern wxList*                      wxWinHandleList;
 extern wxList WXDLLEXPORT           wxPendingDelete;
 extern wxCursor*                    g_globalCursor;
 extern wxList*                      wxWinHandleList;
 extern wxList WXDLLEXPORT           wxPendingDelete;
 extern wxCursor*                    g_globalCursor;


@@ -72,16 +96,6 @@ HAB                                 vHabmain = NULLHANDLE;
 QMSG                                svCurrentMsg;
 wxApp*                              wxTheApp = NULL;
 
 QMSG                                svCurrentMsg;
 wxApp*                              wxTheApp = NULL;
 

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


@@ -93,16 +107,111 @@ 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 and wrapper functions are used here and in gsockpm.c
+#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;
+
+    // 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;
+        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++)
+            {
+                if (i == m_maxSocketNr)
+                    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;
+                        wxYield();
+                    }
+                }
+                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;
+                        wxYield();
+                    }
+                }
+            }
+            m_lastUsedHandle = i;
+        }
+        if (pendingEvent)
+            wxYield();
+    }
+}

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


@@ -122,30 +231,32 @@ bool wxApp::Initialize(
   HAB                               vHab
 )
 {
   HAB                               vHab
 )
 {

-    //
-    // OS2 has to have an anchorblock
-    //
-    vHab = WinInitialize(0);
-
-    if (!vHab)
-        return FALSE;
-    else
-        vHabmain = vHab;
-
-    // Some people may wish to use this, but
-    // probably it shouldn't be here by default.
-#ifdef __WXDEBUG__
-    //    wxRedirectIOToConsole();
+#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
 
     wxBuffer = new wxChar[1500]; // FIXME; why?
 
     wxClassInfo::InitializeClasses();
 
 #endif
 
     wxBuffer = new wxChar[1500]; // FIXME; why?
 
     wxClassInfo::InitializeClasses();
 

-#if wxUSE_RESOURCES
-    wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion);
-#endif
-

 #if wxUSE_THREADS
     wxPendingEventsLocker = new wxCriticalSection;
 #endif
 #if wxUSE_THREADS
     wxPendingEventsLocker = new wxCriticalSection;
 #endif


@@ -162,7 +273,22 @@ bool wxApp::Initialize(
 
     wxBitmap::InitStandardHandlers();
 
 
     wxBitmap::InitStandardHandlers();
 

-    RegisterWindowClasses(vHab);
+    //
+    // OS2 has to have an anchorblock
+    //
+    vHab = WinInitialize(0);
+
+    if (!vHab)
+        return FALSE;
+    else
+        vHabmain = vHab;
+
+    // Some people may wish to use this, but
+    // probably it shouldn't be here by default.
+#ifdef __WXDEBUG__
+    //    wxRedirectIOToConsole();
+#endif
+

     wxWinHandleList = new wxList(wxKEY_INTEGER);
 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.
     wxWinHandleList = new wxList(wxKEY_INTEGER);
 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.


@@ -177,9 +303,11 @@ bool wxApp::Initialize(
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules())
         return FALSE;
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules())
         return FALSE;

+    RegisterWindowClasses(vHab);

     return TRUE;
 } // end of wxApp::Initialize
 
     return TRUE;
 } // end of wxApp::Initialize
 

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

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


@@ -188,13 +316,12 @@ bool wxApp::RegisterWindowClasses(
   HAB                               vHab
 )
 {
   HAB                               vHab
 )
 {

-    APIRET                          rc;

     ERRORID                         vError = 0L;
     wxString                        sError;
 
     if (!::WinRegisterClass( vHab
                             ,wxFrameClassName
     ERRORID                         vError = 0L;
     wxString                        sError;
 
     if (!::WinRegisterClass( vHab
                             ,wxFrameClassName

-                            ,(PFNWP)wxWndProc
+                            ,wxFrameWndProc

                             ,CS_SIZEREDRAW | CS_SYNCPAINT
                             ,sizeof(ULONG)
                            ))
                             ,CS_SIZEREDRAW | CS_SYNCPAINT
                             ,sizeof(ULONG)
                            ))


@@ -207,9 +334,9 @@ bool wxApp::RegisterWindowClasses(
 
     if (!::WinRegisterClass( vHab
                             ,wxFrameClassNameNoRedraw
 
     if (!::WinRegisterClass( vHab
                             ,wxFrameClassNameNoRedraw

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

                             ,0
                             ,0

+                            ,sizeof(ULONG)

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


@@ -220,9 +347,9 @@ bool wxApp::RegisterWindowClasses(
 
     if (!::WinRegisterClass( vHab
                             ,wxMDIFrameClassName
 
     if (!::WinRegisterClass( vHab
                             ,wxMDIFrameClassName

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

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


@@ -233,9 +360,9 @@ bool wxApp::RegisterWindowClasses(
 
     if (!::WinRegisterClass( vHab
                             ,wxMDIFrameClassNameNoRedraw
 
     if (!::WinRegisterClass( vHab
                             ,wxMDIFrameClassNameNoRedraw

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

                             ,0
                             ,0

+                            ,sizeof(ULONG)

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


@@ -246,9 +373,9 @@ bool wxApp::RegisterWindowClasses(
 
     if (!::WinRegisterClass( vHab
                             ,wxMDIChildFrameClassName
 
     if (!::WinRegisterClass( vHab
                             ,wxMDIChildFrameClassName

-                            ,(PFNWP)wxWndProc
+                            ,wxWndProc

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

-                            ,0
+                            ,sizeof(ULONG)

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


@@ -259,9 +386,9 @@ bool wxApp::RegisterWindowClasses(
 
     if (!::WinRegisterClass( vHab
                             ,wxMDIChildFrameClassNameNoRedraw
 
     if (!::WinRegisterClass( vHab
                             ,wxMDIChildFrameClassNameNoRedraw

-                            ,(PFNWP)wxWndProc
+                            ,wxWndProc

                             ,CS_HITTEST
                             ,CS_HITTEST

-                            ,0
+                            ,sizeof(ULONG)

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


@@ -272,9 +399,9 @@ bool wxApp::RegisterWindowClasses(
 
     if (!::WinRegisterClass( vHab
                             ,wxPanelClassName
 
     if (!::WinRegisterClass( vHab
                             ,wxPanelClassName

-                            ,(PFNWP)wxWndProc
+                            ,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);
                            ))
     {
         vError = ::WinGetLastError(vHab);


@@ -285,9 +412,21 @@ bool wxApp::RegisterWindowClasses(
 
     if (!::WinRegisterClass( vHab
                             ,wxCanvasClassName
 
     if (!::WinRegisterClass( vHab
                             ,wxCanvasClassName

-                            ,(PFNWP)wxWndProc
-                            ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
-                            ,0
+                            ,wxWndProc
+                            ,CS_SIZEREDRAW | CS_HITTEST | CS_SYNCPAINT
+                            ,sizeof(ULONG)
+                           ))
+    {
+        vError = ::WinGetLastError(vHab);
+        sError = wxPMErrorToStr(vError);
+        wxLogLastError(sError);
+        return FALSE;
+    }
+    if (!::WinRegisterClass( vHab
+                            ,wxCanvasClassNameNR
+                            ,wxWndProc
+                            ,CS_HITTEST | CS_SYNCPAINT
+                            ,sizeof(ULONG)

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


@@ -386,6 +525,10 @@ void wxApp::CleanUp()
 
     wxClassInfo::CleanUpClasses();
 
 
     wxClassInfo::CleanUpClasses();
 

+    // Delete Message queue
+    if (wxTheApp->m_hMq)
+        ::WinDestroyMsgQueue(wxTheApp->m_hMq);
+

     delete wxTheApp;
     wxTheApp = NULL;
 
     delete wxTheApp;
     wxTheApp = NULL;
 


@@ -409,6 +552,9 @@ void wxApp::CleanUp()
 #endif // wxUSE_LOG
 } // end of wxApp::CleanUp
 
 #endif // wxUSE_LOG
 } // end of wxApp::CleanUp
 

+//----------------------------------------------------------------------
+// Main wxWindows entry point
+//----------------------------------------------------------------------

 int wxEntry(
   int                               argc
 , char*                             argv[]
 int wxEntry(
   int                               argc
 , char*                             argv[]


@@ -464,29 +610,43 @@ int wxEntry(
         if (wxTheApp->OnInit())
         {
             nRetValue = wxTheApp->OnRun();
         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
+        // Normal exit
+        wxWindow*                   pTopWindow = wxTheApp->GetTopWindow();
+        if (pTopWindow)

         {
         {

-            delete pTopWindow;
-            wxTheApp->SetTopWindow(NULL);
+            // 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

     wxTheApp->OnExit();
     wxTheApp->OnExit();

+#if wxUSE_CONSOLEDEBUG
+    printf("wxApp::CleanUp ");
+    fflush(stdout);
+#endif

     wxApp::CleanUp();
     wxApp::CleanUp();

+#if wxUSE_CONSOLEDEBUG
+    printf("return %i ", nRetValue);
+    fflush(stdout);
+#endif

     return(nRetValue);
 } // end of wxEntry
 
     return(nRetValue);
 } // end of wxEntry
 


@@ -495,6 +655,9 @@ 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)
     {


@@ -503,6 +666,7 @@ bool wxApp::OnInitGui()
         wxLogDebug(sError);
         return FALSE;
     }
         wxLogDebug(sError);
         return FALSE;
     }

+

     return TRUE;
 } // end of wxApp::OnInitGui
 
     return TRUE;
 } // end of wxApp::OnInitGui
 


@@ -515,13 +679,16 @@ wxApp::wxApp()
 {
     m_topWindow = NULL;
     wxTheApp = this;
 {
     m_topWindow = NULL;
     wxTheApp = this;

-    m_wantDebugOutput = TRUE;

 
     argc = 0;
     argv = NULL;
     m_nPrintMode = wxPRINT_WINDOWS;
     m_exitOnFrameDelete = TRUE;
     m_bAuto3D = TRUE;
 
     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()
 } // end of wxApp::wxApp
 
 wxApp::~wxApp()


@@ -529,6 +696,7 @@ wxApp::~wxApp()
     //
     // Delete command-line args
     //
     //
     // Delete command-line args
     //

+#if wxUSE_UNICODE

     int                             i;
 
     for (i = 0; i < argc; i++)
     int                             i;
 
     for (i = 0; i < argc; i++)


@@ -536,6 +704,7 @@ wxApp::~wxApp()
         delete[] argv[i];
     }
     delete[] argv;
         delete[] argv[i];
     }
     delete[] argv;

+#endif

 } // end of wxApp::~wxApp
 
 bool wxApp::Initialized()
 } // end of wxApp::~wxApp
 
 bool wxApp::Initialized()


@@ -550,9 +719,10 @@ bool 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)
 //
 // 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 wxApp::DoMessage()
 {

-    BOOL                            bRc = ::WinGetMsg(vHabmain, &m_vMsg, HWND(NULL), 0, 0);
+    BOOL                            bRc = ::WinGetMsg(vHabmain, &svCurrentMsg, HWND(NULL), 0, 0);

 
     if (bRc == 0)
     {
 
     if (bRc == 0)
     {


@@ -611,25 +781,31 @@ bool wxApp::DoMessage()
                 {
                     QMSG            vMsg = svSavedMessages[n];
 
                 {
                     QMSG            vMsg = svSavedMessages[n];
 

-                    if ( !ProcessMessage((WXMSG *)&vMsg) )
-                    {
-                        ::WinDispatchMsg(vHabmain, &vMsg);
-                    }
+                    DoMessage((WXMSG*)&vMsg);

                 }
                 svSavedMessages.Empty();
             }
         }
 #endif // wxUSE_THREADS
 
                 }
                 svSavedMessages.Empty();
             }
         }
 #endif // wxUSE_THREADS
 

+        //

         // Process the message
         // Process the message

-        if (!ProcessMessage((WXMSG *)&svCurrentMsg) )
-        {
-            ::WinDispatchMsg(vHabmain, (PQMSG)&svCurrentMsg);
-        }
+        //
+        DoMessage((WXMSG *)&svCurrentMsg);

     }
     return TRUE;
 } // end of wxApp::DoMessage
 
     }
     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
 //////////////////////////////////////////////////////////////////////////////
 //
 // Keep trying to process messages until WM_QUIT


@@ -656,8 +832,15 @@ int wxApp::MainLoop()
 #endif // wxUSE_THREADS
         while (!Pending() && ProcessIdle())
         {
 #endif // wxUSE_THREADS
         while (!Pending() && ProcessIdle())
         {

+            HandleSockets();
+            wxUsleep(10000);

         }
         }

-        DoMessage();
+        HandleSockets();
+        if (Pending())
+            DoMessage();
+        else
+            wxUsleep(10000);
+

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


@@ -700,25 +883,31 @@ bool wxApp::ProcessMessage(
   WXMSG*                            pWxmsg
 )
 {
   WXMSG*                            pWxmsg
 )
 {

-    QMSG*                           vMsg = (PQMSG)pWxmsg;
-    HWND                            hWnd = vMsg->hwnd;
+    QMSG*                           pMsg = (PQMSG)pWxmsg;
+    HWND                            hWnd = pMsg->hwnd;

     wxWindow*                       pWndThis = wxFindWinFromHandle((WXHWND)hWnd);
     wxWindow*                       pWnd;
 
     wxWindow*                       pWndThis = wxFindWinFromHandle((WXHWND)hWnd);
     wxWindow*                       pWnd;
 

-#if wxUSE_TOOLTIPS

     //
     //

-    // We must relay WM_MOUSEMOVE events to the tooltip ctrl if we want it to
-    // popup the tooltip bubbles
+    // 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 && (vMsg->msg == WM_MOUSEMOVE))
+    if (pWndThis && !pWndThis->OS2ShouldPreProcessMessage(pWxmsg))

     {
     {

-        wxToolTip*                  pToolTip = pWndThis->GetToolTip();
-        if (pToolTip)
-        {
-            pToolTip->RelayEvent(pWxmsg);
-        }
+        return FALSE;

     }
     }

-#endif // wxUSE_TOOLTIPS

 
     //
     // For some composite controls (like a combobox), wndThis might be NULL
 
     //
     // For some composite controls (like a combobox), wndThis might be NULL


@@ -732,13 +921,44 @@ bool wxApp::ProcessMessage(
     }
 
     //
     }
 
     //

-    // Anyone for a non-translation message? Try youngest descendants first.
+    // 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.

     //
     //

-    for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent())
+    if(pMsg->msg == WM_CHAR)

     {
     {

-        if (pWnd->OS2ProcessMessage(pWxmsg))
-            return TRUE;
+       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
 
     return FALSE;
 } // end of wxApp::ProcessMessage
 


@@ -751,7 +971,7 @@ void wxApp::OnIdle(
     //
     // Avoid recursion (via ProcessEvent default case)
     //
     //
     // Avoid recursion (via ProcessEvent default case)
     //

-    if (sbInOnIdle )
+    if (sbInOnIdle)

         return;
 
     sbInOnIdle = TRUE;
         return;
 
     sbInOnIdle = TRUE;


@@ -775,6 +995,16 @@ void wxApp::OnIdle(
     wxLog::FlushActive();
 #endif // wxUSE_LOG
 
     wxLog::FlushActive();
 #endif // wxUSE_LOG
 

+#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
+

     //
     // Send OnIdle events to all windows
     //
     //
     // Send OnIdle events to all windows
     //


@@ -888,8 +1118,20 @@ void wxExit()
 //
 // Yield to incoming messages
 //
 //
 // Yield to incoming messages
 //

-bool wxYield()
+bool wxApp::Yield(bool onlyIfNeeded)

 {
 {

+    static bool s_inYield = FALSE;
+
+    if ( s_inYield )
+    {
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( _T("wxYield() called recursively") );
+        }
+
+        return FALSE;
+    }
+

     HAB                             vHab = 0;
     QMSG                            vMsg;
 
     HAB                             vHab = 0;
     QMSG                            vMsg;
 


@@ -899,6 +1141,8 @@ bool wxYield()
     //
     wxLog::Suspend();
 
     //
     wxLog::Suspend();
 

+    s_inYield = TRUE;
+

     //
     // We want to go back to the main message loop
     // if we see a WM_QUIT. (?)
     //
     // We want to go back to the main message loop
     // if we see a WM_QUIT. (?)


@@ -921,33 +1165,57 @@ bool wxYield()
     // Let the logs be flashed again
     //
     wxLog::Resume();
     // Let the logs be flashed again
     //
     wxLog::Resume();

+    s_inYield = FALSE;

     return TRUE;
 } // end of wxYield
 
     return TRUE;
 } // end of wxYield
 

-wxIcon wxApp::GetStdIcon(
-  int                               nWhich
-) const
+int wxApp::AddSocketHandler(int handle, int mask,
+                            void (*callback)(void*), void * gsock)

 {
 {

-    switch(nWhich)
-    {
-        case wxICON_INFORMATION:
-            return wxIcon("wxICON_INFO");
+    int find;
+    struct GsocketCallbackInfo
+        *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;

 
 

-        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
+    for (find = 0; find < m_maxSocketHandles; find++)
+        if (CallbackInfo[find].handle == -1)
+            break;
+    if (find == m_maxSocketHandles)
+    {
+        // 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;
+}

 
 

-        case wxICON_HAND:
-            return wxIcon("wxICON_ERROR");
+void wxApp::RemoveSocketHandler(int handle)
+{
+    struct GsocketCallbackInfo
+        *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+    if (handle < m_maxSocketHandles)
+    {
+        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;

     }
     }

-    return wxIcon("wxICON_ERROR");
-} // end of wxApp::GetStdIcon
+}

 
 //-----------------------------------------------------------------------------
 // wxWakeUpIdle
 
 //-----------------------------------------------------------------------------
 // wxWakeUpIdle


@@ -975,13 +1243,15 @@ void wxWakeUpIdle()
     }
 } // end of wxWakeUpIdle
 
     }
 } // end of wxWakeUpIdle
 

-HINSTANCE wxGetInstance()
+HAB wxGetInstance()

 {
 {

-    return wxhInstance;
+    return vHabmain;

 }
 
 }
 

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

 {
 {

-    wxhInstance = hInst;
+    vHabmain = vHab;

 }
 
 }