(blind) fix for gcc 3.4 warning for an always true comparison in an assert

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

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index c30b689ba5fbeacc8e13197e41c7488a8be67fc3..3ea50a31ca2fdb54246fc01de155b62d32360d6c 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -1,382 +1,692 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        app.cpp
 // Purpose:     wxApp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        app.cpp
 // Purpose:     wxApp

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/13/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "app.h"
+    #pragma implementation "app.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/utils.h"
-#include "wx/gdicmn.h"
-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/cursor.h"
-#include "wx/icon.h"
-#include "wx/palette.h"
-#include "wx/dc.h"
-#include "wx/dialog.h"
-#include "wx/msgdlg.h"
-#include "wx/log.h"
-#include "wx/module.h"
-#include "wx/memory.h"
-
-#if wxUSE_WX_RESOURCES
-#include "wx/resource.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/gdicmn.h"
+    #include "wx/pen.h"
+    #include "wx/brush.h"
+    #include "wx/cursor.h"
+    #include "wx/icon.h"
+    #include "wx/palette.h"
+    #include "wx/dc.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"

 #endif
 
 #endif
 

-#include <string.h>
+#include "wx/log.h"
+#include "wx/module.h"

 
 

-extern char *wxBuffer;
-extern wxList wxPendingDelete;
+#include "wx/os2/private.h"

 
 

-wxApp *wxTheApp = NULL;
+#ifdef __EMX__

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxApp::OnIdle)
-END_EVENT_TABLE()
-#endif
+#include <sys/ioctl.h>
+#include <sys/select.h>

 
 

-long wxApp::sm_lastMessageTime = 0;
-
-bool wxApp::Initialize()
-{
-#ifdef __WXMSW__
-  wxBuffer = new char[1500];

 #else
 #else

-  wxBuffer = new char[BUFSIZ + 512];
-#endif

 
 

-  wxClassInfo::InitializeClasses();
+#include <nerrno.h>
+#include <sys/ioctl.h>
+#include <sys/select.h>
+#include <sys/time.h>

 
 

-  wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-  wxTheColourDatabase->Initialize();
+#endif //

 
 

-  wxInitializeStockLists();
-  wxInitializeStockObjects();
+#ifndef __EMX__

 
 

-#if wxUSE_WX_RESOURCES
-  wxInitializeResourceSystem();
+#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
 

-  wxBitmap::InitStandardHandlers();
-
-  wxModule::RegisterModules();
-  wxASSERT( wxModule::InitializeModules() == TRUE );
-
-  return TRUE;
-}
+#if wxUSE_THREADS
+    #include "wx/thread.h"
+#endif // wxUSE_THREADS

 
 

-void wxApp::CleanUp()
-{
-  wxModule::CleanUpModules();
+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif // wxUSE_TOOLTIPS

 
 

-#if wxUSE_WX_RESOURCES
-  wxCleanUpResourceSystem();
-#endif
+#include <string.h>
+#include <ctype.h>

 
 

-  wxDeleteStockObjects() ;
+// ---------------------------------------------------------------------------
+// global variables
+// ---------------------------------------------------------------------------

 
 

-  // Destroy all GDI lists, etc.
+extern wxChar*                      wxBuffer;
+extern wxList*                      wxWinHandleList;
+extern wxList WXDLLEXPORT           wxPendingDelete;
+extern wxCursor*                    g_globalCursor;

 
 

-  delete wxTheBrushList;
-  wxTheBrushList = NULL;
+HAB                                 vHabmain = NULLHANDLE;

 
 

-  delete wxThePenList;
-  wxThePenList = NULL;

 
 

-  delete wxTheFontList;
-  wxTheFontList = NULL;
+HICON wxSTD_FRAME_ICON          = (HICON) NULL;
+HICON wxSTD_MDICHILDFRAME_ICON  = (HICON) NULL;
+HICON wxSTD_MDIPARENTFRAME_ICON = (HICON) NULL;

 
 

-  delete wxTheBitmapList;
-  wxTheBitmapList = NULL;
+HICON wxDEFAULT_FRAME_ICON           = (HICON) NULL;
+HICON wxDEFAULT_MDICHILDFRAME_ICON   = (HICON) NULL;
+HICON wxDEFAULT_MDIPARENTFRAME_ICON  = (HICON) NULL;

 
 

-  delete wxTheColourDatabase;
-  wxTheColourDatabase = NULL;
+HBRUSH wxDisableButtonBrush = (HBRUSH) 0;

 
 

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

 
 

-  delete[] wxBuffer;
-  wxBuffer = NULL;
+// ===========================================================================
+// implementation
+// ===========================================================================

 
 

-  wxClassInfo::CleanUpClasses();
+// ---------------------------------------------------------------------------
+// helper struct and functions for socket handling
+// ---------------------------------------------------------------------------

 
 

-  delete wxTheApp;
-  wxTheApp = NULL;
+struct GsocketCallbackInfo{
+    void (*proc)(void *);
+    int type;
+    int handle;
+    void* gsock;
+};

 
 

-#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() > 0)
-  {
-    wxTrace("There were memory leaks.\n");
-    wxDebugContext::Dump();
-    wxDebugContext::PrintStatistics();
-  }
-//  wxDebugContext::SetStream(NULL, NULL);
-#endif
+// These defines and wrapper functions are used here and in gsockpm.c
+#define wxSockReadMask  0x01
+#define wxSockWriteMask 0x02

 
 

-  // do it as the very last thing because everything else can log messages
-  wxLog::DontCreateOnDemand();
-  // do it as the very last thing because everything else can log messages
-  delete wxLog::SetActiveTarget(NULL);
+#ifdef __EMX__
+extern "C"
+int wxAppAddSocketHandler(int handle, int mask,
+                           void (*callback)(void*), void * gsock)
+{
+    return wxTheApp->AddSocketHandler(handle, mask, callback, gsock);

 }
 }

-
-int wxEntry( int argc, char *argv[] )
+extern "C"
+void wxAppRemoveSocketHandler(int handle)

 {
 {

-  if (!wxApp::Initialize())
-    return FALSE;
-  if (!wxTheApp)
-  {
-    if (!wxApp::GetInitializerFunction())
-    {
-      printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
-      return 0;
-    };
+    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

 
 

-       wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
-  };
+void wxApp::HandleSockets()
+{
+    bool pendingEvent = FALSE;

 
 

-  if (!wxTheApp)
+    // 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
+// ---------------------------------------------------------------------------
+
+    IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
+
+    BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
+        EVT_IDLE(wxApp::OnIdle)
+        EVT_END_SESSION(wxApp::OnEndSession)
+        EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
+    END_EVENT_TABLE()
+
+//
+// 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*/
+/***********************************************/

   {
   {

-    printf( "wxWindows error: wxTheApp == NULL\n" );
-    return 0;
-  };
-
-  wxTheApp->argc = argc;
-  wxTheApp->argv = argv;
-
-  // GUI-specific initialization, such as creating an app context.
-  wxTheApp->OnInitGui();
+     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

 
 

-  // Here frames insert themselves automatically
-  // into wxTopLevelWindows by getting created
-  // in OnInit().
+    //
+    // OS2 has to have an anchorblock
+    //
+    vHabmain = WinInitialize(0);

 
 

-  if (!wxTheApp->OnInit()) return 0;
+    if (!vHabmain)
+    {
+        // TODO: at least give some error message here...
+        wxAppBase::CleanUp();

 
 

-  int retValue = 0;
+        return FALSE;
+    }

 
 

-  if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
+    wxBuffer = new wxChar[1500]; // FIXME; why?

 
 

-  if (wxTheApp->GetTopWindow())
-  {
-    delete wxTheApp->GetTopWindow();
-    wxTheApp->SetTopWindow(NULL);
-  }
+    // Some people may wish to use this, but
+    // probably it shouldn't be here by default.
+#ifdef __WXDEBUG__
+    //    wxRedirectIOToConsole();
+#endif

 
 

-  wxTheApp->DeletePendingObjects();
+    wxWinHandleList = new wxList(wxKEY_INTEGER);

 
 

-  wxTheApp->OnExit();
+    // This is to foil optimizations in Visual C++ that throw out dummy.obj.
+    // PLEASE DO NOT ALTER THIS.
+#if !defined(WXMAKINGDLL) && defined(__VISAGECPP__)
+    extern char wxDummyChar;
+    if (wxDummyChar) wxDummyChar++;
+#endif

 
 

-  wxApp::CleanUp();
+    // wxSetKeyboardHook(TRUE);

 
 

-  return retValue;
-};
+    RegisterWindowClasses(vHabmain);

 
 

-// Static member initialization
-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+    return TRUE;
+} // end of wxApp::Initialize

 
 

-wxApp::wxApp()
-{
-  m_topWindow = NULL;
-  wxTheApp = this;
-  m_className = "";
-  m_wantDebugOutput = TRUE ;
-  m_appName = "";
-  argc = 0;
-  argv = NULL;
-#ifdef __WXPM__
-  m_printMode = wxPRINT_WINDOWS;
-#else
-  m_printMode = wxPRINT_POSTSCRIPT;
-#endif
-  m_exitOnFrameDelete = TRUE;
-  m_auto3D = TRUE;
-}
+const char*                         CANTREGISTERCLASS = " Can't register Class ";
+// ---------------------------------------------------------------------------
+// RegisterWindowClasses
+// ---------------------------------------------------------------------------

 
 

-bool wxApp::Initialized()
+bool wxApp::RegisterWindowClasses(
+  HAB                               vHab
+)

 {
 {

-  if (GetTopWindow())
+    ERRORID                         vError = 0L;
+    wxString                        sError;
+
+    if (!::WinRegisterClass( vHab
+                            ,wxFrameClassName
+                            ,wxFrameWndProc
+                            ,CS_SIZEREDRAW | CS_SYNCPAINT
+                            ,sizeof(ULONG)
+                           ))
+    {
+        vError = ::WinGetLastError(vHab);
+        sError = wxPMErrorToStr(vError);
+        wxLogLastError(sError.c_str());
+        return FALSE;
+    }
+
+    if (!::WinRegisterClass( vHab
+                            ,wxFrameClassNameNoRedraw
+                            ,wxWndProc
+                            ,0
+                            ,sizeof(ULONG)
+                           ))
+    {
+        vError = ::WinGetLastError(vHab);
+        sError = wxPMErrorToStr(vError);
+        wxLogLastError(sError.c_str());
+        return FALSE;
+    }
+
+    if (!::WinRegisterClass( vHab
+                            ,wxMDIFrameClassName
+                            ,wxWndProc
+                            ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT
+                            ,sizeof(ULONG)
+                           ))
+    {
+        vError = ::WinGetLastError(vHab);
+        sError = wxPMErrorToStr(vError);
+        wxLogLastError(sError.c_str());
+        return FALSE;
+    }
+
+    if (!::WinRegisterClass( vHab
+                            ,wxMDIFrameClassNameNoRedraw
+                            ,wxWndProc
+                            ,0
+                            ,sizeof(ULONG)
+                           ))
+    {
+        vError = ::WinGetLastError(vHab);
+        sError = wxPMErrorToStr(vError);
+        wxLogLastError(sError.c_str());
+        return FALSE;
+    }
+
+    if (!::WinRegisterClass( vHab
+                            ,wxMDIChildFrameClassName
+                            ,wxWndProc
+                            ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST
+                            ,sizeof(ULONG)
+                           ))
+    {
+        vError = ::WinGetLastError(vHab);
+        sError = wxPMErrorToStr(vError);
+        wxLogLastError(sError.c_str());
+        return FALSE;
+    }
+
+    if (!::WinRegisterClass( vHab
+                            ,wxMDIChildFrameClassNameNoRedraw
+                            ,wxWndProc
+                            ,CS_HITTEST
+                            ,sizeof(ULONG)
+                           ))
+    {
+        vError = ::WinGetLastError(vHab);
+        sError = wxPMErrorToStr(vError);
+        wxLogLastError(sError.c_str());
+        return FALSE;
+    }
+
+    if (!::WinRegisterClass( vHab
+                            ,wxPanelClassName
+                            ,wxWndProc
+                            ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
+                            ,sizeof(ULONG)
+                           ))
+    {
+        vError = ::WinGetLastError(vHab);
+        sError = wxPMErrorToStr(vError);
+        wxLogLastError(sError.c_str());
+        return FALSE;
+    }
+
+    if (!::WinRegisterClass( vHab
+                            ,wxCanvasClassName
+                            ,wxWndProc
+                            ,CS_SIZEREDRAW | CS_HITTEST | CS_SYNCPAINT
+                            ,sizeof(ULONG)
+                           ))
+    {
+        vError = ::WinGetLastError(vHab);
+        sError = wxPMErrorToStr(vError);
+        wxLogLastError(sError.c_str());
+        return FALSE;
+    }
+    if (!::WinRegisterClass( vHab
+                            ,wxCanvasClassNameNR
+                            ,wxWndProc
+                            ,CS_HITTEST | CS_SYNCPAINT
+                            ,sizeof(ULONG)
+                           ))
+    {
+        vError = ::WinGetLastError(vHab);
+        sError = wxPMErrorToStr(vError);
+        wxLogLastError(sError.c_str());
+        return FALSE;
+    }

     return TRUE;
     return TRUE;

-  else
-    return FALSE;
-}
+} // end of wxApp::RegisterWindowClasses

 
 

-int wxApp::MainLoop()
-{
-  m_keepGoing = TRUE;
-
-/* TODO: implement your main loop here, calling ProcessIdle in idle time.
-  while (m_keepGoing)
-  {
-    while (!::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) &&
-           ProcessIdle()) {}
-    if (!DoMessage())
-      m_keepGoing = FALSE;
-  }
-*/
-
-  return 0;
-}
-
-// Returns TRUE if more time is needed.
-bool wxApp::ProcessIdle()
+//
+// Cleans up any wxWindows internal structures left lying around
+//
+void wxApp::CleanUp()

 {
 {

-    wxIdleEvent event;
-    event.SetEventObject(this);
-    ProcessEvent(event);
+    delete[] wxBuffer;
+    wxBuffer = NULL;
+
+    //
+    // PM-SPECIFIC CLEANUP
+    //
+
+    // wxSetKeyboardHook(FALSE);
+
+    if (wxSTD_FRAME_ICON)
+        ::WinFreeFileIcon(wxSTD_FRAME_ICON);
+    if (wxSTD_MDICHILDFRAME_ICON)
+        ::WinFreeFileIcon(wxSTD_MDICHILDFRAME_ICON);
+    if (wxSTD_MDIPARENTFRAME_ICON)
+        ::WinFreeFileIcon(wxSTD_MDIPARENTFRAME_ICON);
+
+    if (wxDEFAULT_FRAME_ICON)
+        ::WinFreeFileIcon(wxDEFAULT_FRAME_ICON);
+    if (wxDEFAULT_MDICHILDFRAME_ICON)
+        ::WinFreeFileIcon(wxDEFAULT_MDICHILDFRAME_ICON);
+    if (wxDEFAULT_MDIPARENTFRAME_ICON)
+        ::WinFreeFileIcon(wxDEFAULT_MDIPARENTFRAME_ICON);
+
+    if ( wxDisableButtonBrush )
+    {
+// TODO:        ::DeleteObject( wxDisableButtonBrush );
+    }

 
 

-    return event.MoreRequested();
-}
+    if (wxWinHandleList)
+        delete wxWinHandleList;

 
 

-void wxApp::ExitMainLoop()
-{
-  m_keepGoing = FALSE;
-}
+    // Delete Message queue
+    if (wxTheApp->m_hMq)
+        ::WinDestroyMsgQueue(wxTheApp->m_hMq);

 
 

-// Is a message/event pending?
-bool wxApp::Pending()
-{
-/* TODO.
- */
-  return FALSE;
-}
+    wxAppBase::CleanUp();
+} // end of wxApp::CleanUp

 
 

-// Dispatch a message.
-void wxApp::Dispatch()
+bool wxApp::OnInitGui()

 {
 {

-/* TODO.
- */
-}
-
-void wxApp::OnIdle(wxIdleEvent& event)
-{
-  static bool inOnIdle = FALSE;
-
-  // Avoid recursion (via ProcessEvent default case)
-  if (inOnIdle)
-    return;
-
-  inOnIdle = TRUE;
-
-  // 'Garbage' collection of windows deleted with Close().
-  DeletePendingObjects();
-
-  // flush the logged messages if any
-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL && pLog->HasPendingMessages() )
-    pLog->Flush();
+    ERRORID                         vError;
+    wxString                        sError;

 
 

-  // Send OnIdle events to all windows
-  bool needMore = SendIdleEvents();
+    if (!wxAppBase::OnInitGui())
+        return FALSE;

 
 

-  if (needMore)
-    event.RequestMore(TRUE);
+    m_hMq = ::WinCreateMsgQueue(vHabmain, 0);
+    if (!m_hMq)
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogDebug(sError);
+        return FALSE;
+    }

 
 

-  inOnIdle = FALSE;
-}
+    return TRUE;
+} // end of wxApp::OnInitGui

 
 

-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
+wxApp::wxApp()

 {
 {

-    bool needMore = FALSE;
-       wxNode* node = wxTopLevelWindows.First();
-       while (node)
-       {
-               wxWindow* win = (wxWindow*) node->Data();
-               if (SendIdleEvents(win))
-            needMore = TRUE;
-
-               node = node->Next();
-       }
-    return needMore;
-}
-
-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
+    argc = 0;
+    argv = NULL;
+    m_nPrintMode = wxPRINT_WINDOWS;
+    m_hMq = 0;
+    m_maxSocketHandles = 0;
+    m_maxSocketNr = 0;
+    m_sockCallbackInfo = 0;
+} // end of wxApp::wxApp
+
+wxApp::~wxApp()

 {
 {

-    bool needMore = FALSE;
-
-       wxIdleEvent event;
-       event.SetEventObject(win);
-       win->ProcessEvent(event);
+    //
+    // Delete command-line args
+    //
+#if wxUSE_UNICODE
+    int                             i;

 
 

-    if (event.MoreRequested())
-        needMore = TRUE;
-
-       wxNode* node = win->GetChildren().First();
-       while (node)
-       {
-               wxWindow* win = (wxWindow*) node->Data();
-               if (SendIdleEvents(win))
-            needMore = TRUE;
+    for (i = 0; i < argc; i++)
+    {
+        delete[] argv[i];
+    }
+    delete[] argv;
+#endif
+} // end of wxApp::~wxApp

 
 

-               node = node->Next();
-       }
-    return needMore ;
-}
+bool                                gbInOnIdle = FALSE;

 
 

-void wxApp::DeletePendingObjects()
+void wxApp::OnIdle(
+  wxIdleEvent&                      rEvent
+)

 {
 {

-  wxNode *node = wxPendingDelete.First();
-  while (node)
-  {
-    wxObject *obj = (wxObject *)node->Data();
-
-    delete obj;

 
 

-    if (wxPendingDelete.Member(obj))
-      delete node;
+    //
+    // Avoid recursion (via ProcessEvent default case)
+    //
+    if (gbInOnIdle)
+        return;
+
+    gbInOnIdle = TRUE;
+    
+    wxAppBase::OnIdle(rEvent);
+
+#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
+
+    gbInOnIdle = FALSE;
+} // end of wxApp::OnIdle
+
+void wxApp::OnEndSession(
+  wxCloseEvent&                     WXUNUSED(rEvent))
+{
+    if (GetTopWindow())
+        GetTopWindow()->Close(TRUE);
+} // end of wxApp::OnEndSession
+
+//
+// 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())
+    {
+        if (!GetTopWindow()->Close(!rEvent.CanVeto()))
+            rEvent.Veto(TRUE);
+    }
+} // end of wxApp::OnQueryEndSession
+
+//
+// Yield to incoming messages
+//
+bool wxApp::Yield(bool onlyIfNeeded)
+{
+    static bool s_inYield = FALSE;

 
 

-    // Deleting one object may have deleted other pending
-    // objects, so start from beginning of list again.
-    node = wxPendingDelete.First();
-  }
-}
+    if ( s_inYield )
+    {
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( _T("wxYield() called recursively") );
+        }
+
+        return FALSE;
+    }
+
+    HAB                             vHab = 0;
+    QMSG                            vMsg;
+
+    //
+    // Disable log flushing from here because a call to wxYield() shouldn't
+    // normally result in message boxes popping up &c
+    //
+    wxLog::Suspend();
+
+    s_inYield = TRUE;
+
+    //
+    // 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 wxUSE_THREADS
+        wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS
+        if (!wxTheApp->Dispatch())
+            break;
+    }
+    //
+    // If they are pending events, we must process them.
+    //
+    if (wxTheApp)
+        wxTheApp->ProcessPendingEvents();
+
+    HandleSockets();
+    //
+    // Let the logs be flashed again
+    //
+    wxLog::Resume();
+    s_inYield = FALSE;
+    return TRUE;
+} // end of wxYield

 
 

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

 {
 {

-    return new wxLogGui;
+    int find;
+    struct GsocketCallbackInfo
+        *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+
+    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;

 }
 
 }
 

-wxWindow* wxApp::GetTopWindow() const
+void wxApp::RemoveSocketHandler(int handle)

 {
 {

-    if (m_topWindow)
-        return m_topWindow;
-    else if (wxTopLevelWindows.Number() > 0)
-        return (wxWindow*) wxTopLevelWindows.First()->Data();
-    else
-        return NULL;
+    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;
+    }

 }
 
 }
 

-void wxExit()
+//-----------------------------------------------------------------------------
+// wxWakeUpIdle
+//-----------------------------------------------------------------------------
+
+void wxApp::WakeUpIdle()
+{
+    //
+    // 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();
+
+    if (pTopWindow)
+    {
+        if ( !::WinPostMsg(GetHwndOf(pTopWindow), WM_NULL, (MPARAM)0, (MPARAM)0))
+        {
+            //
+            // Should never happen
+            //
+            wxLogLastError("PostMessage(WM_NULL)");
+        }
+    }
+} // end of wxWakeUpIdle
+
+HAB wxGetInstance()

 {
 {

-  wxApp::CleanUp();
-/*
- * TODO: Exit in some platform-specific way. Not recommended that the app calls this:
- * only for emergencies.
- */
+    return vHabmain;

 }
 
 }
 

-// Yield to other processes
-bool wxYield()
+void wxSetInstance(
+  HAB                               vHab
+)

 {
 {

-  /*
-   * TODO
-   */
-  return TRUE;
+    vHabmain = vHab;

 }
 
 }