added support for wxALWAYS_SHOW_SB (finally closes patch 410865 -- first still opened...)

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index b3a40f84c392b78dc6c4fdc9a4fe7cc7370012fc..08579d8319220c449efcad9727e3bb84ff2e8a8b 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -5,717 +5,649 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

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

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #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/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"
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/msw/private.h"
-#include "wx/log.h"
+#include "wx/apptrait.h"
+#include "wx/filename.h"

 #include "wx/module.h"
 
 #include "wx/module.h"
 

-#if wxUSE_WX_RESOURCES
-  #include "wx/resource.h"
+#include "wx/msw/private.h"
+
+#if wxUSE_THREADS
+    #include "wx/thread.h"
+
+    // define the array of MSG strutures
+    WX_DECLARE_OBJARRAY(MSG, wxMsgArray);
+
+    #include "wx/arrimpl.cpp"
+
+    WX_DEFINE_OBJARRAY(wxMsgArray);
+#endif // wxUSE_THREADS
+
+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif // wxUSE_TOOLTIPS
+
+// OLE is used for drag-and-drop, clipboard, OLE Automation..., but some
+// compilers don't support it (missing headers, libs, ...)
+#if defined(__GNUWIN32_OLD__) || defined(__SYMANTEC__) || defined(__SALFORDC__)
+    #undef wxUSE_OLE
+
+    #define  wxUSE_OLE 0
+#endif // broken compilers
+
+#if wxUSE_OLE
+    #include <ole2.h>

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

-#if defined(__WIN95__) && !defined(__GNUWIN32__)
-  #include <commctrl.h>
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__WXMICROWIN__)) && !defined(__CYGWIN10__))
+    #include <commctrl.h>

 #endif
 
 #endif
 

-// use debug CRT functions for memory leak detections in VC++
-/* This still doesn't work for me, Vadim.
-#if defined(__WXDEBUG__) && defined(_MSC_VER)
-  // VC++ uses this macro as debug/release mode indicator
-  #ifndef _DEBUG
-    #define _DEBUG
-  #endif
+// ----------------------------------------------------------------------------
+// conditional compilation
+// ----------------------------------------------------------------------------
+
+// The macro _WIN32_IE is defined by commctrl.h (unless it had already been
+// defined before) and shows us what common control features are available
+// during the compile time (it doesn't mean that they will be available during
+// the run-time, use GetComCtl32Version() to test for them!). The possible
+// values are:
+//
+// 0x0200     for comctl32.dll 4.00 shipped with Win95/NT 4.0
+// 0x0300                      4.70              IE 3.x
+// 0x0400                      4.71              IE 4.0
+// 0x0401                      4.72              IE 4.01 and Win98
+// 0x0500                      5.00              IE 5.x and NT 5.0 (Win2000)
+
+#ifndef _WIN32_IE
+    // minimal set of features by default
+    #define _WIN32_IE 0x0200
+#endif

 
 

-  #include <crtdbg.h>
+#if _WIN32_IE >= 0x0300 && \
+    (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \
+    !defined(__CYGWIN__)
+    #include <shlwapi.h>

 #endif
 #endif

-*/

 
 

-extern char *wxBuffer;
-extern char *wxOsVersion;
-extern wxList *wxWinHandleList;
-extern wxList wxPendingDelete;
+// ---------------------------------------------------------------------------
+// global variables
+// ---------------------------------------------------------------------------
+
+extern wxList WXDLLEXPORT wxPendingDelete;
+#ifndef __WXMICROWIN__

 extern void wxSetKeyboardHook(bool doIt);
 extern void wxSetKeyboardHook(bool doIt);

-extern wxCursor *g_globalCursor;
+#endif

 
 

-HINSTANCE wxhInstance = 0;
-static MSG s_currentMsg;
-wxApp *wxTheApp = NULL;
+MSG s_currentMsg;

 
 

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

 
 

-HICON wxSTD_FRAME_ICON = NULL;
-HICON wxSTD_MDICHILDFRAME_ICON = NULL;
-HICON wxSTD_MDIPARENTFRAME_ICON = NULL;
+HBRUSH wxDisableButtonBrush = (HBRUSH) 0;

 
 

-HICON wxDEFAULT_FRAME_ICON = NULL;
-HICON wxDEFAULT_MDICHILDFRAME_ICON = NULL;
-HICON wxDEFAULT_MDIPARENTFRAME_ICON = NULL;
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------

 
 

-HBRUSH wxDisableButtonBrush = 0;
+LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);

 
 

-LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
+// ===========================================================================
+// wxGUIAppTraits implementation
+// ===========================================================================

 
 

-#if !USE_SHARED_LIBRARY
-  IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
+// private class which we use to pass parameters from BeforeChildWaitLoop() to
+// AfterChildWaitLoop()
+struct ChildWaitLoopData
+{
+    ChildWaitLoopData(wxWindowDisabler *wd_, wxWindow *winActive_)
+    {
+        wd = wd_;
+        winActive = winActive_;
+    }

 
 

-  BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-      EVT_IDLE(wxApp::OnIdle)
-      EVT_END_SESSION(wxApp::OnEndSession)
-      EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
-  END_EVENT_TABLE()
-#endif
+    wxWindowDisabler *wd;
+    wxWindow *winActive;
+};

 
 

-long wxApp::sm_lastMessageTime = 0;
+void *wxGUIAppTraits::BeforeChildWaitLoop()
+{
+    /*
+       We use a dirty hack here to disable all application windows (which we
+       must do because otherwise the calls to wxYield() could lead to some very
+       unexpected reentrancies in the users code) but to avoid losing
+       focus/activation entirely when the child process terminates which would
+       happen if we simply disabled everything using wxWindowDisabler. Indeed,
+       remember that Windows will never activate a disabled window and when the
+       last childs window is closed and Windows looks for a window to activate
+       all our windows are still disabled. There is no way to enable them in
+       time because we don't know when the childs windows are going to be
+       closed, so the solution we use here is to keep one special tiny frame
+       enabled all the time. Then when the child terminates it will get
+       activated and when we close it below -- after reenabling all the other
+       windows! -- the previously active window becomes activated again and
+       everything is ok.
+     */
+    wxBeginBusyCursor();
+
+    // first disable all existing windows
+    wxWindowDisabler *wd = new wxWindowDisabler;
+
+    // then create an "invisible" frame: it has minimal size, is positioned
+    // (hopefully) outside the screen and doesn't appear on the taskbar
+    wxWindow *winActive = new wxFrame
+                    (
+                        wxTheApp->GetTopWindow(),
+                        -1,
+                        _T(""),
+                        wxPoint(32600, 32600),
+                        wxSize(1, 1),
+                        wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR
+                    );
+    winActive->Show();
+
+    return new ChildWaitLoopData(wd, winActive);
+}

 
 

-#ifdef __WIN95__
-  static HINSTANCE gs_hRichEdit = NULL;
-#endif
+void wxGUIAppTraits::AlwaysYield()
+{
+    wxYield();
+}

 
 

-//// Initialize
+void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
+{
+    wxEndBusyCursor();

 
 

-bool wxApp::Initialize()
+    const ChildWaitLoopData * const data = (ChildWaitLoopData *)dataOrig;
+
+    delete data->wd;
+
+    // finally delete the dummy frame and, as wd has been already destroyed and
+    // the other windows reenabled, the activation is going to return to the
+    // window which had had it before
+    data->winActive->Destroy();
+}
+
+bool wxGUIAppTraits::DoMessageFromThreadWait()

 {
 {

-  wxBuffer = new char[1500];
+    return !wxTheApp || wxTheApp->DoMessage();
+}

 
 

-/*
-  #if defined(__WXDEBUG__) && defined(_MSC_VER)
-    // do check for memory leaks on program exit
-    // (another useful flag is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free
-    //  deallocated memory which may be used to simulate low-memory condition)
-    _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF);
-  #endif // debug build under MS VC++
-*/
+// ===========================================================================
+// wxApp implementation
+// ===========================================================================

 
 

-  #if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    #if defined(_WINDLL)
-      streambuf* sBuf = NULL;
-    #else  // EXE
-      streambuf* sBuf = new wxDebugStreamBuf;
-    #endif // DLL
+int wxApp::m_nCmdShow = SW_SHOWNORMAL;

 
 

-    ostream* oStr = new ostream(sBuf) ;
-    wxDebugContext::SetStream(oStr, sBuf);
-  #endif  // wxUSE_MEMORY_TRACING
+// ---------------------------------------------------------------------------
+// wxWin macros
+// ---------------------------------------------------------------------------

 
 

-  wxClassInfo::InitializeClasses();
+IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)

 
 

-  #if wxUSE_RESOURCES
-    wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
-  #endif
+BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
+    EVT_IDLE(wxApp::OnIdle)
+    EVT_END_SESSION(wxApp::OnEndSession)
+    EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
+END_EVENT_TABLE()

 
 

-  wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-  wxTheColourDatabase->Initialize();
+// class to ensure that wxAppBase::CleanUp() is called if our Initialize()
+// fails
+class wxCallBaseCleanup
+{
+public:
+    wxCallBaseCleanup(wxApp *app) : m_app(app) { }
+    ~wxCallBaseCleanup() { if ( m_app ) m_app->wxAppBase::CleanUp(); }

 
 

-  wxInitializeStockLists();
-  wxInitializeStockObjects();
+    void Dismiss() { m_app = NULL; }

 
 

-  #if wxUSE_WX_RESOURCES
-    wxInitializeResourceSystem();
-  #endif
+private:
+    wxApp *m_app;
+};

 
 

-  wxBitmap::InitStandardHandlers();
+//// Initialize
+bool wxApp::Initialize(int& argc, wxChar **argv)
+{
+    if ( !wxAppBase::Initialize(argc, argv) )
+        return false;

 
 

-  #if defined(__WIN95__)
-    InitCommonControls();
-    gs_hRichEdit = LoadLibrary("RICHED32.DLL");
+    // ensure that base cleanup is done if we return too early
+    wxCallBaseCleanup callBaseCleanup(this);

 
 

-    if (gs_hRichEdit == NULL)
+    // the first thing to do is to check if we're trying to run an Unicode
+    // program under Win9x w/o MSLU emulation layer - if so, abort right now
+    // as it has no chance to work
+#if wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
+    if ( wxGetOsVersion() != wxWINDOWS_NT )

     {
     {

-      wxMessageBox("Could not initialise Rich Edit DLL");
+        // note that we can use MessageBoxW() as it's implemented even under
+        // Win9x - OTOH, we can't use wxGetTranslation() because the file APIs
+        // used by wxLocale are not
+        ::MessageBox
+        (
+         NULL,
+         _T("This program uses Unicode and requires Windows NT/2000/XP.\nProgram aborted."),
+         _T("wxWindows Fatal Error"),
+         MB_ICONERROR | MB_OK
+        );
+
+        return FALSE;

     }
     }

-  #endif
+#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU

 
 

-  #if  defined(WX_DRAG_DROP)
+#if defined(__WIN95__) && !defined(__WXMICROWIN__)
+    InitCommonControls();
+#endif // __WIN95__
+
+#if wxUSE_OLE || wxUSE_DRAG_AND_DROP
+
+#ifdef __WIN16__
+    // for OLE, enlarge message queue to be as large as possible
+    int iMsg = 96;
+    while (!SetMessageQueue(iMsg) && (iMsg -= 8))
+        ;
+#endif // Win16
+
+#if wxUSE_OLE

     // we need to initialize OLE library
     if ( FAILED(::OleInitialize(NULL)) )
     // we need to initialize OLE library
     if ( FAILED(::OleInitialize(NULL)) )

-      wxFatalError(_("Cannot initialize OLE"));
-  #endif
+        wxLogError(_("Cannot initialize OLE"));
+#endif

 
 

-  #if CTL3D
+#endif // wxUSE_OLE
+
+#if wxUSE_CTL3D

     if (!Ctl3dRegister(wxhInstance))
     if (!Ctl3dRegister(wxhInstance))

-      wxFatalError("Cannot register CTL3D");
+        wxLogError(wxT("Cannot register CTL3D"));

 
     Ctl3dAutoSubclass(wxhInstance);
 
     Ctl3dAutoSubclass(wxhInstance);

-  #endif
-
-  g_globalCursor = new wxCursor;
-
-  wxSTD_FRAME_ICON = LoadIcon(wxhInstance, "wxSTD_FRAME");
-  wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, "wxSTD_MDIPARENTFRAME");
-  wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, "wxSTD_MDICHILDFRAME");
+#endif // wxUSE_CTL3D

 
 

-  wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_FRAME");
-  wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDIPARENTFRAME");
-  wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDICHILDFRAME");
+    RegisterWindowClasses();

 
 

-  RegisterWindowClasses();
+#ifndef __WXMICROWIN__
+    // Create the brush for disabling bitmap buttons

 
 

-  // Create the brush for disabling bitmap buttons
-
-  LOGBRUSH lb ;
-  lb.lbStyle = BS_PATTERN;
-  lb.lbHatch = (int)LoadBitmap( wxhInstance, "wxDISABLE_BUTTON_BITMAP" ) ;
-  wxDisableButtonBrush = ::CreateBrushIndirect( & lb ) ;
-  ::DeleteObject( (HGDIOBJ)lb.lbHatch ) ;
+    LOGBRUSH lb;
+    lb.lbStyle = BS_PATTERN;
+    lb.lbColor = 0;
+    lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") );
+    if ( lb.lbHatch )
+    {
+        wxDisableButtonBrush = ::CreateBrushIndirect( & lb );
+        ::DeleteObject( (HGDIOBJ)lb.lbHatch );
+    }
+    //else: wxWindows resources are probably not linked in
+#endif

 
 

-  #if wxUSE_PENWINDOWS
+#if wxUSE_PENWINDOWS

     wxRegisterPenWin();
     wxRegisterPenWin();

-  #endif
+#endif

 
 

-  wxWinHandleList = new wxList(wxKEY_INTEGER);
+    wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100);

 
 

-  // This is to foil optimizations in Visual C++ that
-  // throw out dummy.obj.
-  #if (_MSC_VER >= 800) && !defined(WXMAKINGDLL)
+    // This is to foil optimizations in Visual C++ that throw out dummy.obj.
+    // PLEASE DO NOT ALTER THIS.
+#if defined(__VISUALC__) && defined(__WIN16__) && !defined(WXMAKINGDLL)

     extern char wxDummyChar;
     if (wxDummyChar) wxDummyChar++;
     extern char wxDummyChar;
     if (wxDummyChar) wxDummyChar++;

-  #endif
+#endif

 
 

-  wxSetKeyboardHook(TRUE);
+#ifndef __WXMICROWIN__
+    wxSetKeyboardHook(TRUE);
+#endif

 
 

-  wxModule::RegisterModules();
-  if (!wxModule::InitializeModules())
-    return FALSE;
-  return TRUE;
+    callBaseCleanup.Dismiss();
+
+    return true;

 }
 
 }
 

-//// 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()
 {
 bool wxApp::RegisterWindowClasses()
 {

-///////////////////////////////////////////////////////////////////////
-// Register the frame window class.
-  WNDCLASS wndclass;   // Structure used to register Windows class.
-
-  wndclass.style         = CS_HREDRAW | CS_VREDRAW;
-  wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;
-  wndclass.cbClsExtra    = 0;
-  wndclass.cbWndExtra    = sizeof( DWORD ); // was 4
-  wndclass.hInstance     = wxhInstance;
-  wndclass.hIcon         = NULL;        // wxSTD_FRAME_ICON;
-  wndclass.hCursor       = LoadCursor( NULL, IDC_ARROW );
-  wndclass.hbrBackground =  (HBRUSH)(COLOR_APPWORKSPACE+1) ;
-//  wndclass.hbrBackground = GetStockObject( WHITE_BRUSH );
-  wndclass.lpszMenuName  = NULL;
-#ifdef _MULTIPLE_INSTANCES
-  sprintf( wxFrameClassName,"wxFrameClass%d", wxhInstance );
-#endif
-  wndclass.lpszClassName = wxFrameClassName;
-
-  if (!RegisterClass( &wndclass ))
-  {
-    // wxFatalError("Can't register Frame Window class");
-  }
-
-///////////////////////////////////////////////////////////////////////
-// Register the MDI frame window class.
-  WNDCLASS wndclass1;   // Structure used to register Windows class.
-
-  wndclass1.style         = CS_HREDRAW | CS_VREDRAW;
-  wndclass1.lpfnWndProc   = (WNDPROC)wxWndProc;
-  wndclass1.cbClsExtra    = 0;
-  wndclass1.cbWndExtra    = sizeof( DWORD ); // was 4
-  wndclass1.hInstance     = wxhInstance;
-  wndclass1.hIcon         = NULL; // wxSTD_MDIPARENTFRAME_ICON;
-  wndclass1.hCursor       = LoadCursor( NULL, IDC_ARROW );
-//  wndclass1.hbrBackground =  (HBRUSH)(COLOR_APPWORKSPACE+1) ;
-  wndclass1.hbrBackground = NULL;
-  wndclass1.lpszMenuName  = NULL;
-
-  wndclass1.lpszClassName = wxMDIFrameClassName;
-  if (!RegisterClass( &wndclass1 ))
-  {
-//    wxFatalError("Can't register MDI Frame window class");
-//  return FALSE;
-  }
-
-///////////////////////////////////////////////////////////////////////
-// Register the MDI child frame window class.
-  WNDCLASS wndclass4;   // Structure used to register Windows class.
-
-  wndclass4.style         = CS_HREDRAW | CS_VREDRAW;
-  wndclass4.lpfnWndProc   = (WNDPROC)wxWndProc;
-  wndclass4.cbClsExtra    = 0;
-  wndclass4.cbWndExtra    = sizeof( DWORD ); // was 4
-  wndclass4.hInstance     = wxhInstance;
-  wndclass4.hIcon         = NULL;       // wxSTD_MDICHILDFRAME_ICON;
-  wndclass4.hCursor       = LoadCursor( NULL, IDC_ARROW );
-  // TODO: perhaps this should be NULL so that Windows doesn't
-  // paint the background itself (would OnEraseBackground duplicate
-  // this?)
-  wndclass4.hbrBackground =  (HBRUSH)(COLOR_WINDOW+1) ;
-//  wndclass4.hbrBackground = NULL;
-  wndclass4.lpszMenuName  = NULL;
-  wndclass4.lpszClassName = wxMDIChildFrameClassName;
-
-  if (!RegisterClass( &wndclass4 ))
-  {
-//   wxFatalError("Can't register MDI child frame window class");
-//   return FALSE;
-  }
-
-///////////////////////////////////////////////////////////////////////
-// Register the panel window class.
-  WNDCLASS wndclass2;   // Structure used to register Windows class.
-  memset(&wndclass2, 0, sizeof(WNDCLASS));   // start with NULL defaults
-  // Use CS_OWNDC to avoid messing about restoring the context
-  // for every graphic operation.
-  wndclass2.style         = CS_HREDRAW | CS_VREDRAW;
-  wndclass2.lpfnWndProc   = (WNDPROC)wxWndProc;
-  wndclass2.cbClsExtra    = 0;
-  wndclass2.cbWndExtra    = sizeof( DWORD ); // was 4
-  wndclass2.hInstance     = wxhInstance;
-  wndclass2.hIcon         = NULL;
-  wndclass2.hCursor       = NULL;
-//  wndclass2.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1) ;
-  wndclass2.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
-  wndclass2.lpszMenuName  = NULL;
-  wndclass2.lpszClassName = wxPanelClassName;
-  if (!RegisterClass( &wndclass2 ))
-  {
-//   wxFatalError("Can't register Panel Window class");
-//   return FALSE;
-  }
-
-///////////////////////////////////////////////////////////////////////
-// Register the canvas and textsubwindow class name
-  WNDCLASS wndclass3;   // Structure used to register Windows class.
-  memset(&wndclass3, 0, sizeof(WNDCLASS));   // start with NULL defaults
-  // Use CS_OWNDC to avoid messing about restoring the context
-  // for every graphic operation.
-//  wndclass3.style         = CS_HREDRAW | CS_VREDRAW | CS_OWNDC | CS_DBLCLKS ;
-  // wxWin 2.0
-  wndclass3.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ;
-  wndclass3.lpfnWndProc   = (WNDPROC)wxWndProc;
-  wndclass3.cbClsExtra    = 0;
-  wndclass3.cbWndExtra    = sizeof( DWORD ); // was 4
-  wndclass3.hInstance     = wxhInstance;
-  wndclass3.hIcon         = NULL;
-  wndclass3.hCursor       = NULL;
-//  wndclass3.hbrBackground = (HBRUSH)(COLOR_WINDOW+1) ;
-  wndclass3.hbrBackground = NULL;
-  wndclass3.lpszMenuName  = NULL;
-  wndclass3.lpszClassName = wxCanvasClassName;
-  if (!RegisterClass( &wndclass3))
-  {
-//   wxFatalError("Can't register Canvas class");
-//   return FALSE;
-  }
-
-  return TRUE;
-}
+    WNDCLASS wndclass;
+    wxZeroMemory(wndclass);

 
 

-//// Convert Windows to argc, argv style
+    // for each class we register one with CS_(V|H)REDRAW style and one
+    // without for windows created with wxNO_FULL_REDRAW_ON_REPAINT flag
+    static const long styleNormal = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
+    static const long styleNoRedraw = CS_DBLCLKS;

 
 

-// FIXME this code should be rewritten (use wxArrayString instead...)
-void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
-{
-  // Split command line into tokens, as in usual main(argc, argv)
-  char **command = new char*[50]; // VZ: sure? why not 25 or 73 and a half??
-
-  int count = 0;
-  char *buf = new char[strlen(lpCmdLine) + 1];
-
-  /* Model independent strcpy */
-  int i;
-  for (i = 0; (buf[i] = lpCmdLine[i]) != 0; i++)
-  {
-    /* loop */;
-  }
-
-  // Get application name
-  char name[260]; // 260 is MAX_PATH value from windef.h
-  ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
-
-  // Is it only 16-bit Borland that already copies the program name
-  // to the first argv index?
-#if !defined(__GNUWIN32__)
-// #if ! (defined(__BORLANDC__) && !defined(__WIN32__))
-  command[count++] = copystring(name);
-// #endif
-#endif
+    // the fields which are common to all classes
+    wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;
+    wndclass.hInstance     = wxhInstance;
+    wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);

 
 

-  strcpy(name, wxFileNameFromPath(name));
-  wxStripExtension(name);
-  wxTheApp->SetAppName(name);
+    // Register the frame window class.
+    wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);
+    wndclass.lpszClassName = wxCanvasClassName;
+    wndclass.style         = styleNormal;

 
 

-  /* Break up string */
-  // Treat strings enclosed in double-quotes as single arguments
-  char* str = buf;
-  while (*str)
-  {
-/*
-       if ( count == WXSIZEOF(command) )
+    if ( !RegisterClass(&wndclass) )

     {
     {

-      wxFAIL_MSG("too many command line args.");
-      break;
+        wxLogLastError(wxT("RegisterClass(frame)"));

     }
     }

-*/
-    while ( *str && isspace(*str) )  // skip whitespace
-      str++;

 
 

-    if (*str == '"')
+    // "no redraw" frame
+    wndclass.lpszClassName = wxCanvasClassNameNR;
+    wndclass.style         = styleNoRedraw;
+
+    if ( !RegisterClass(&wndclass) )

     {
     {

-      str++;
-      command[count++] = str;
-      while (*str && *str != '"')
-        str++;
+        wxLogLastError(wxT("RegisterClass(no redraw frame)"));

     }
     }

-    else if (*str)
+
+    // Register the MDI frame window class.
+    wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves
+    wndclass.lpszClassName = wxMDIFrameClassName;
+    wndclass.style         = styleNormal;
+
+    if ( !RegisterClass(&wndclass) )

     {
     {

-      command[count++] = str;
-      while (*str && !isspace(*str))
-        str++;
+        wxLogLastError(wxT("RegisterClass(MDI parent)"));

     }
     }

-    if (*str)
-      *str++ = '\0';
-  }

 
 

-  wxTheApp->argv = new char*[count + 1];
-  wxTheApp->argv[count] = NULL; /* argv[] is NULL terminated list! */
-  wxTheApp->argc = count;
+    // "no redraw" MDI frame
+    wndclass.lpszClassName = wxMDIFrameClassNameNoRedraw;
+    wndclass.style         = styleNoRedraw;

 
 

-  for (i = 0; i < count; i++)
-  {
-    wxTheApp->argv[i] = copystring(command[i]);
-
-    delete [] command[i];
-  }
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError(wxT("RegisterClass(no redraw MDI parent frame)"));
+    }

 
 

-  delete [] command;
-  delete [] buf;
-}
+    // Register the MDI child frame window class.
+    wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+    wndclass.lpszClassName = wxMDIChildFrameClassName;
+    wndclass.style         = styleNormal;

 
 

-//// Cleans up any wxWindows internal structures left lying around
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError(wxT("RegisterClass(MDI child)"));
+    }

 
 

-void wxApp::CleanUp()
-{
-  //// COMMON CLEANUP
-  wxModule::CleanUpModules();
+    // "no redraw" MDI child frame
+    wndclass.lpszClassName = wxMDIChildFrameClassNameNoRedraw;
+    wndclass.style         = styleNoRedraw;

 
 

-#if wxUSE_WX_RESOURCES
-  wxCleanUpResourceSystem();
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError(wxT("RegisterClass(no redraw MDI child)"));
+    }

 
 

-//  wxDefaultResourceTable->ClearTable();
-#endif
+    return TRUE;
+}

 
 

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

 
 

-  wxDeleteStockObjects() ;
+bool wxApp::UnregisterWindowClasses()
+{
+    bool retval = TRUE;

 
 

-  // Destroy all GDI lists, etc.
-  wxDeleteStockLists();
+#ifndef __WXMICROWIN__
+    // MDI frame window class.
+    if ( !::UnregisterClass(wxMDIFrameClassName, wxhInstance) )
+    {
+        wxLogLastError(wxT("UnregisterClass(MDI parent)"));

 
 

-  delete wxTheColourDatabase;
-  wxTheColourDatabase = NULL;
+        retval = FALSE;
+    }

 
 

-  wxBitmap::CleanUpHandlers();
+    // "no redraw" MDI frame
+    if ( !::UnregisterClass(wxMDIFrameClassNameNoRedraw, wxhInstance) )
+    {
+        wxLogLastError(wxT("UnregisterClass(no redraw MDI parent frame)"));

 
 

-  delete[] wxBuffer;
-  wxBuffer = NULL;
+        retval = FALSE;
+    }

 
 

-  //// WINDOWS-SPECIFIC CLEANUP
+    // MDI child frame window class.
+    if ( !::UnregisterClass(wxMDIChildFrameClassName, wxhInstance) )
+    {
+        wxLogLastError(wxT("UnregisterClass(MDI child)"));

 
 

-  wxSetKeyboardHook(FALSE);
+        retval = FALSE;
+    }

 
 

-#ifdef __WIN95__
-  if (gs_hRichEdit != NULL)
-    FreeLibrary(gs_hRichEdit);
-#endif
+    // "no redraw" MDI child frame
+    if ( !::UnregisterClass(wxMDIChildFrameClassNameNoRedraw, wxhInstance) )
+    {
+        wxLogLastError(wxT("UnregisterClass(no redraw MDI child)"));

 
 

-#if wxUSE_PENWINDOWS
-  wxCleanUpPenWin();
-#endif
+        retval = FALSE;
+    }

 
 

-  if (wxSTD_FRAME_ICON)
-    DestroyIcon(wxSTD_FRAME_ICON);
-  if (wxSTD_MDICHILDFRAME_ICON)
-    DestroyIcon(wxSTD_MDICHILDFRAME_ICON);
-  if (wxSTD_MDIPARENTFRAME_ICON)
-    DestroyIcon(wxSTD_MDIPARENTFRAME_ICON);
-
-  if (wxDEFAULT_FRAME_ICON)
-    DestroyIcon(wxDEFAULT_FRAME_ICON);
-  if (wxDEFAULT_MDICHILDFRAME_ICON)
-    DestroyIcon(wxDEFAULT_MDICHILDFRAME_ICON);
-  if (wxDEFAULT_MDIPARENTFRAME_ICON)
-    DestroyIcon(wxDEFAULT_MDIPARENTFRAME_ICON);
-
-  if ( wxDisableButtonBrush )
-    ::DeleteObject( wxDisableButtonBrush ) ;
-
-#if     defined(WX_DRAG_DROP)
-  ::OleUninitialize();
-#endif
+    // canvas class name
+    if ( !::UnregisterClass(wxCanvasClassName, wxhInstance) )
+    {
+        wxLogLastError(wxT("UnregisterClass(canvas)"));

 
 

-#if CTL3D
-  Ctl3dUnregister(wxhInstance);
-#endif
+        retval = FALSE;
+    }

 
 

-  if (wxWinHandleList)
-    delete wxWinHandleList ;
+    if ( !::UnregisterClass(wxCanvasClassNameNR, wxhInstance) )
+    {
+        wxLogLastError(wxT("UnregisterClass(no redraw canvas)"));

 
 

-  wxClassInfo::CleanUpClasses();
+        retval = FALSE;
+    }
+#endif // __WXMICROWIN__

 
 

-  // do it as the very last thing because everything else can log messages
-  wxLog::DontCreateOnDemand();
-  delete wxLog::SetActiveTarget(NULL);
+    return retval;

 }
 
 }
 

-#if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
-
-//// Main wxWindows entry point
-int wxEntry(WXHINSTANCE hInstance,
-            WXHINSTANCE WXUNUSED(hPrevInstance),
-            char *lpCmdLine,
-            int nCmdShow,
-            bool enterLoop)
+void wxApp::CleanUp()

 {
 {

-#ifndef __WXDEBUG__ // take everything into a try-except block in release build
-  try {
+#ifndef __WXMICROWIN__
+    wxSetKeyboardHook(FALSE);

 #endif
 
 #endif
 

-  wxhInstance = (HINSTANCE) hInstance;
-
-  if (!wxApp::Initialize())
-    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,
-                 "No initializer - use IMPLEMENT_APP macro." );
-
-    wxTheApp = (*wxApp::GetInitializerFunction()) ();
-  }
-
-  wxCHECK_MSG( wxTheApp, 0, "You have to define an instance of wxApp!" );
-
-  // save the WinMain() parameters
-  wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);
-  wxTheApp->m_nCmdShow = nCmdShow;
-
-  // GUI-specific initialisation. In fact on Windows we don't have any,
-  // but this call is provided for compatibility across platforms.
-  wxTheApp->OnInitGui() ;
-
-  int retValue = 0;
-
-  if ( wxTheApp->OnInit() )
-  {
-      if ( enterLoop )
-      {
-          retValue = wxTheApp->OnRun();
-      }
-  }
-  //else: app initialization failed, so we skipped OnRun()
-
-  wxWindow *topWindow = wxTheApp->GetTopWindow();
-  if ( topWindow )
-  {
-      // Forcibly delete the window.
-      if ( topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
-           topWindow->IsKindOf(CLASSINFO(wxDialog)) )
-      {
-          topWindow->Close(TRUE);
-          wxTheApp->DeletePendingObjects();
-      }
-      else
-      {
-          delete topWindow;
-          wxTheApp->SetTopWindow(NULL);
-      }
-  }
-
-  wxTheApp->OnExit();
-  wxApp::CleanUp();
-
-  delete wxTheApp;
-  wxTheApp = NULL;
-
-#if (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);
+#if wxUSE_PENWINDOWS
+    wxCleanUpPenWin();

 #endif
 
 #endif
 

-  return retValue;
-#ifndef __WXDEBUG__ // catch exceptions only in release build
-  }
-  except ( EXCEPTION_EXECUTE_HANDLER ) {
-    /*
-    if ( wxTheApp )
-      wxTheApp->OnFatalException();
-    */
-
-    ::ExitProcess(3); // the same exit code as abort()
-  }
-#endif //debug
-}
+    if ( wxDisableButtonBrush )
+        ::DeleteObject( wxDisableButtonBrush );

 
 

-#else /*  _WINDLL  */
-
-//// Entry point for DLLs
-
-int wxEntry(WXHINSTANCE hInstance)
-{
-  wxhInstance = (HINSTANCE) hInstance;
-  wxApp::Initialize();
-
-  // 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.
-
-  if (!wxTheApp)
-  {
-    if (!wxApp::GetInitializerFunction())
-    {
-      MessageBox(NULL, "No initializer - use IMPLEMENT_APP macro.", "wxWindows Error", MB_APPLMODAL | MB_ICONSTOP | MB_OK);
-    return 0;
-    }
-
-    wxTheApp = (* wxApp::GetInitializerFunction()) ();
-  }
-
-  if (!wxTheApp) {
-    MessageBox(NULL, "You have to define an instance of wxApp!", "wxWindows Error", MB_APPLMODAL | MB_ICONSTOP | MB_OK);
-    return 0;
-  }
-
-  wxTheApp->argc = 0;
-  wxTheApp->argv = NULL;
+#if wxUSE_OLE
+    ::OleUninitialize();
+#endif

 
 

-  wxTheApp->OnInitGui();
+    // for an EXE the classes are unregistered when it terminates but DLL may
+    // be loaded several times (load/unload/load) into the same process in
+    // which case the registration will fail after the first time if we don't
+    // unregister the classes now
+    UnregisterWindowClasses();

 
 

-  wxTheApp->OnInit();
+#if wxUSE_CTL3D
+    Ctl3dUnregister(wxhInstance);
+#endif

 
 

-  if (wxTheApp->GetTopWindow() && wxTheApp->GetTopWindow()->GetHWND()) {
-    wxTheApp->GetTopWindow()->Show(TRUE);
-  }
+    delete wxWinHandleHash;
+    wxWinHandleHash = NULL;

 
 

-  return 1;
+    wxAppBase::CleanUp();

 }
 }

-#endif // _WINDLL

 
 

-//// Static member initialization
-
-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+// ----------------------------------------------------------------------------
+// wxApp ctor/dtor
+// ----------------------------------------------------------------------------

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

-  m_topWindow = NULL;
-  wxTheApp = this;
-  m_className = "";
-  m_wantDebugOutput = TRUE ;
-  m_appName = "";
-  argc = 0;
-  argv = NULL;
-#ifdef __WXMSW__
-  m_printMode = wxPRINT_WINDOWS;
-#else
-  m_printMode = wxPRINT_POSTSCRIPT;
-#endif
-  m_exitOnFrameDelete = TRUE;
-  m_auto3D = TRUE;
+    m_printMode = wxPRINT_WINDOWS;

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

-  // Delete command-line args
-  int i;
-  for (i = 0; i < argc; i++)
-  {
-    delete[] argv[i];
-  }
-  delete argv;
+    // our cmd line arguments are allocated inside wxEntry(HINSTANCE), they
+    // don't come from main(), so we have to free them
+
+    while ( argc )
+    {
+        // m_argv elements were allocated by wxStrdup()
+        free(argv[--argc]);
+    }
+
+    // but m_argv itself -- using new[]
+    delete [] argv;

 }
 
 bool wxApp::Initialized()
 {
 #ifndef _WINDLL
 }
 
 bool wxApp::Initialized()
 {
 #ifndef _WINDLL

-  if (GetTopWindow())
+    if (GetTopWindow())
+        return TRUE;
+    else
+        return FALSE;
+#else // Assume initialized if DLL (no way of telling)

     return TRUE;
     return TRUE;

-  else
-    return FALSE;
-#endif
-#ifdef _WINDLL // Assume initialized if DLL (no way of telling)
-  return TRUE;

 #endif
 }
 
 /*
  * Get and process a message, returning FALSE if WM_QUIT
 #endif
 }
 
 /*
  * Get and process a message, returning FALSE if WM_QUIT

- * received.
+ * received (and also set the flag telling the app to exit the main loop)

  *
  */
 bool wxApp::DoMessage()
 {
  *
  */
 bool wxApp::DoMessage()
 {

-  if (!::GetMessage(&s_currentMsg, (HWND) NULL, 0, 0))
-  {
-    return FALSE;
-  }
-
-  // Process the message
-  if (!ProcessMessage((WXMSG *)&s_currentMsg))
-  {
-    ::TranslateMessage(&s_currentMsg);
-    wxApp::sm_lastMessageTime = s_currentMsg.time; /* MATTHEW: timeStamp impl. */
-    ::DispatchMessage(&s_currentMsg);
-  }
-  return TRUE;
+    BOOL rc = ::GetMessage(&s_currentMsg, (HWND) NULL, 0, 0);
+    if ( rc == 0 )
+    {
+        // got WM_QUIT
+        m_keepGoing = FALSE;
+
+        return FALSE;
+    }
+    else if ( rc == -1 )
+    {
+        // should never happen, but let's test for it nevertheless
+        wxLogLastError(wxT("GetMessage"));
+    }
+    else
+    {
+#if wxUSE_THREADS
+        wxASSERT_MSG( wxThread::IsMain(),
+                      wxT("only the main thread can process Windows messages") );
+
+        static bool s_hadGuiLock = TRUE;
+        static wxMsgArray s_aSavedMessages;
+
+        // 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() )
+        {
+            s_hadGuiLock = FALSE;
+
+            // leave out WM_COMMAND messages: too dangerous, sometimes
+            // the message will be processed twice
+            if ( !wxIsWaitingForThread() ||
+                    s_currentMsg.message != WM_COMMAND )
+            {
+                s_aSavedMessages.Add(s_currentMsg);
+            }
+
+            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 ( !s_hadGuiLock )
+            {
+                s_hadGuiLock = TRUE;
+
+                size_t count = s_aSavedMessages.GetCount();
+                for ( size_t n = 0; n < count; n++ )
+                {
+                    MSG& msg = s_aSavedMessages[n];
+
+                    DoMessage((WXMSG *)&msg);
+                }
+
+                s_aSavedMessages.Empty();
+            }
+        }
+#endif // wxUSE_THREADS
+
+        // Process the message
+        DoMessage((WXMSG *)&s_currentMsg);
+    }
+
+    return TRUE;
+}
+
+void wxApp::DoMessage(WXMSG *pMsg)
+{
+    if ( !ProcessMessage(pMsg) )
+    {
+        ::TranslateMessage((MSG *)pMsg);
+        ::DispatchMessage((MSG *)pMsg);
+    }

 }
 
 /*
 }
 
 /*


@@ -734,16 +666,22 @@ bool wxApp::DoMessage()
 
 int wxApp::MainLoop()
 {
 
 int wxApp::MainLoop()
 {

-  m_keepGoing = TRUE;
-  while (m_keepGoing)
-  {
-    while (!::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) &&
-           ProcessIdle()) {}
-    if (!DoMessage())
-      m_keepGoing = FALSE;
-  }
-
-  return s_currentMsg.wParam;
+    m_keepGoing = TRUE;
+
+    while ( m_keepGoing )
+    {
+#if wxUSE_THREADS
+        wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS
+
+        while ( !Pending() && ProcessIdle() )
+            ;
+
+        // a message came or no more idle processing to do
+        DoMessage();
+    }
+
+    return s_currentMsg.wParam;

 }
 
 // Returns TRUE if more time is needed.
 }
 
 // Returns TRUE if more time is needed.


@@ -753,23 +691,25 @@ bool wxApp::ProcessIdle()
     event.SetEventObject(this);
     ProcessEvent(event);
 
     event.SetEventObject(this);
     ProcessEvent(event);
 

+    wxUpdateUIEvent::ResetUpdateTime();
+    

     return event.MoreRequested();
 }
 
 void wxApp::ExitMainLoop()
 {
     return event.MoreRequested();
 }
 
 void wxApp::ExitMainLoop()
 {

-  m_keepGoing = FALSE;
+    // this will set m_keepGoing to FALSE a bit later
+    ::PostQuitMessage(0);

 }
 
 bool wxApp::Pending()
 {
 }
 
 bool wxApp::Pending()
 {

-  return (::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) != 0) ;
+    return ::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) != 0;

 }
 
 void wxApp::Dispatch()
 {
 }
 
 void wxApp::Dispatch()
 {

-    if (!DoMessage())
-      m_keepGoing = FALSE;
+    DoMessage();

 }
 
 /*
 }
 
 /*


@@ -777,124 +717,187 @@ void wxApp::Dispatch()
  * the message. Some may have accelerator tables, or have
  * MDI complications.
  */
  * the message. Some may have accelerator tables, or have
  * MDI complications.
  */

-bool wxApp::ProcessMessage(WXMSG *Msg)
+
+bool wxApp::ProcessMessage(WXMSG *wxmsg)

 {
 {

-  MSG *msg = (MSG *)Msg;
+    MSG *msg = (MSG *)wxmsg;
+    HWND hwnd = msg->hwnd;
+    wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
+
+    // this may happen if the event occured in a standard modeless dialog (the
+    // only example of which I know of is the find/replace dialog) - then call
+    // IsDialogMessage() to make TAB navigation in it work
+    if ( !wndThis )
+    {
+        // we need to find the dialog containing this control as
+        // IsDialogMessage() just eats all the messages (i.e. returns TRUE for
+        // them) if we call it for the control itself
+        while ( hwnd && ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD )
+        {
+            hwnd = ::GetParent(hwnd);
+        }

 
 

-  HWND hWnd;
+        return hwnd && ::IsDialogMessage(hwnd, msg) != 0;
+    }

 
 

-  // Try translations first; find the youngest window with
-  // a translation table.
-  for (hWnd = msg->hwnd; hWnd != NULL; hWnd = ::GetParent(hWnd))
-  {
-    wxWindow *wnd = wxFindWinFromHandle((WXHWND) hWnd);
-    if (wnd)
+#if wxUSE_TOOLTIPS
+    // we must relay WM_MOUSEMOVE events to the tooltip ctrl if we want it to
+    // popup the tooltip bubbles
+    if ( (msg->message == WM_MOUSEMOVE) )

     {
     {

-       if (wnd->MSWTranslateMessage(Msg))
-         return TRUE;
+        wxToolTip *tt = wndThis->GetToolTip();
+        if ( tt )
+        {
+            tt->RelayEvent(wxmsg);
+        }

     }
     }

-  }
+#endif // wxUSE_TOOLTIPS

 
 

-  // Anyone for a non-translation message? Try youngest descendants first.
-  for (hWnd = msg->hwnd; hWnd != NULL; hWnd = ::GetParent(hWnd))
-  {
-    wxWindow *wnd = wxFindWinFromHandle((WXHWND) hWnd);
-    if (wnd)
+    // 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 ( !wndThis->MSWShouldPreProcessMessage(wxmsg) )

     {
     {

-       if (wnd->MSWProcessMessage(Msg))
-         return TRUE;
+        return FALSE;

     }
     }

-  }
-  return FALSE;
-}
-
-void wxApp::OnIdle(wxIdleEvent& event)
-{
-  static bool inOnIdle = FALSE;

 
 

-  // Avoid recursion (via ProcessEvent default case)
-  if (inOnIdle)
-    return;
+    // try translations first: the accelerators override everything
+    wxWindow *wnd;

 
 

-  inOnIdle = TRUE;
+    for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
+    {
+        if ( wnd->MSWTranslateMessage(wxmsg))
+            return TRUE;
+
+        // stop at first top level window, i.e. don't try to process the key
+        // strokes originating in a dialog using the accelerators of the parent
+        // frame - this doesn't make much sense
+        if ( wnd->IsTopLevel() )
+            break;
+    }

 
 

-  // 'Garbage' collection of windows deleted with Close().
-  DeletePendingObjects();
+    // now try the other hooks (kbd navigation is handled here): we start from
+    // wndThis->GetParent() because wndThis->MSWProcessMessage() was already
+    // called above
+    for ( wnd = wndThis->GetParent(); wnd; wnd = wnd->GetParent() )
+    {
+        if ( wnd->MSWProcessMessage(wxmsg) )
+            return TRUE;
+    }

 
 

-  // flush the logged messages if any
-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL && pLog->HasPendingMessages() )
-    pLog->Flush();
+    // no special preprocessing for this message, dispatch it normally
+    return FALSE;
+}

 
 

-  // Send OnIdle events to all windows
-  bool needMore = SendIdleEvents();
-//  bool needMore = FALSE;
+// this is a temporary hack and will be replaced by using wxEventLoop in the
+// future
+//
+// it is needed to allow other event loops (currently only one: the modal
+// dialog one) to reset the OnIdle() semaphore because otherwise OnIdle()
+// wouldn't do anything while a modal dialog shown from OnIdle() call is shown.
+bool wxIsInOnIdleFlag = FALSE;

 
 

-  if (needMore)
-    event.RequestMore(TRUE);
+void wxApp::OnIdle(wxIdleEvent& event)
+{
+    // Avoid recursion (via ProcessEvent default case)
+    if ( wxIsInOnIdleFlag )
+        return;
+
+    wxIsInOnIdleFlag = TRUE;
+
+    // If there are pending events, we must process them: pending events
+    // are either events to the threads other than main or events posted
+    // with wxPostEvent() functions
+    // GRG: I have moved this here so that all pending events are processed
+    //   before starting to delete any objects. This behaves better (in
+    //   particular, wrt wxPostEvent) and is coherent with wxGTK's current
+    //   behaviour. Changed Feb/2000 before 2.1.14
+    ProcessPendingEvents();
+
+    // 'Garbage' collection of windows deleted with Close().
+    DeletePendingObjects();
+
+#if wxUSE_LOG
+    // flush the logged messages if any
+    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 (!::GetKeyState(MK_LBUTTON) && !::GetKeyState(MK_MBUTTON) && !::GetKeyState(MK_RBUTTON))
+        wxDC::ClearCache();
+#endif // wxUSE_DC_CACHEING
+
+    // Send OnIdle events to all windows
+    if ( SendIdleEvents() )
+    {
+        // SendIdleEvents() returns TRUE if at least one window requested more
+        // idle events
+        event.RequestMore(TRUE);
+    }

 
 

-  inOnIdle = FALSE;
+    wxIsInOnIdleFlag = FALSE;

 }
 
 // Send idle event to all top-level windows
 bool wxApp::SendIdleEvents()
 {
     bool needMore = FALSE;
 }
 
 // Send idle event to all top-level windows
 bool wxApp::SendIdleEvents()
 {
     bool needMore = FALSE;

-  wxNode* node = wxTopLevelWindows.First();
-  while (node)
-  {
-    wxWindow* win = (wxWindow*) node->Data();
-    if (SendIdleEvents(win))
+
+    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
+    while (node)
+    {
+        wxWindow* win = node->GetData();
+        if (SendIdleEvents(win))

             needMore = TRUE;
             needMore = TRUE;

+        node = node->GetNext();
+    }

 
 

-    node = node->Next();
-  }

     return needMore;
 }
 
 // Send idle event to window and all subwindows
 bool wxApp::SendIdleEvents(wxWindow* win)
 {
     return needMore;
 }
 
 // Send idle event to window and all subwindows
 bool wxApp::SendIdleEvents(wxWindow* win)
 {

-  bool needMore = FALSE;
+    wxIdleEvent event;
+    event.SetEventObject(win);
+    win->GetEventHandler()->ProcessEvent(event);

 
 

-  wxIdleEvent event;
-  event.SetEventObject(win);
-  win->ProcessEvent(event);
+    bool needMore = event.MoreRequested();

 
 

-  if (event.MoreRequested())
-    needMore = TRUE;
+    wxWindowList::Node *node = win->GetChildren().GetFirst();
+    while ( node )
+    {
+        wxWindow *win = node->GetData();
+        if (SendIdleEvents(win))
+            needMore = TRUE;

 
 

-  wxNode* node = win->GetChildren()->First();
-  while (node)
-  {
-    wxWindow* win = (wxWindow*) node->Data();
-    if (SendIdleEvents(win))
-      needMore = TRUE;
+        node = node->GetNext();
+    }

 
 

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

 }
 
 }
 

-void wxApp::DeletePendingObjects()
+void wxApp::WakeUpIdle()

 {
 {

-  wxNode *node = wxPendingDelete.First();
-  while (node)
-  {
-    wxObject *obj = (wxObject *)node->Data();
-
-    delete obj;
-
-    if (wxPendingDelete.Member(obj))
-      delete node;
-
-    // Deleting one object may have deleted other pending
-    // objects, so start from beginning of list again.
-    node = wxPendingDelete.First();
-  }
+    // 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 *topWindow = wxTheApp->GetTopWindow();
+    if ( topWindow )
+    {
+        if ( !::PostMessage(GetHwndOf(topWindow), WM_NULL, 0, 0) )
+        {
+            // should never happen
+            wxLogLastError(wxT("PostMessage(WM_NULL)"));
+        }
+    }

 }
 
 }
 

-void wxApp::OnEndSession(wxCloseEvent& event)
+void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))

 {
     if (GetTopWindow())
         GetTopWindow()->Close(TRUE);
 {
     if (GetTopWindow())
         GetTopWindow()->Close(TRUE);


@@ -911,92 +914,169 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
     }
 }
 
     }
 }
 

-wxLog* wxApp::CreateLogTarget()
+typedef struct _WXADllVersionInfo

 {
 {

-    return new wxLogGui;
-}
+        DWORD cbSize;
+        DWORD dwMajorVersion;                   // Major version
+        DWORD dwMinorVersion;                   // Minor version
+        DWORD dwBuildNumber;                    // Build number
+        DWORD dwPlatformID;                     // DLLVER_PLATFORM_*
+} WXADLLVERSIONINFO;

 
 

-wxWindow* wxApp::GetTopWindow() const
-{
-    if (m_topWindow)
-        return m_topWindow;
-    else if (wxTopLevelWindows.Number() > 0)
-        return (wxWindow*) wxTopLevelWindows.First()->Data();
-    else
-        return NULL;
-}
+typedef HRESULT (CALLBACK* WXADLLGETVERSIONPROC)(WXADLLVERSIONINFO *);

 
 

-int wxApp::GetComCtl32Version() const
+/* static */
+int wxApp::GetComCtl32Version()

 {
 {

-    // have we loaded COMCTL32 yet?
-    HMODULE theModule = ::GetModuleHandle("COMCTL32");
-    int version = 0;
+#ifdef __WXMICROWIN__
+    return 0;
+#else
+    // cache the result
+    static int s_verComCtl32 = -1;
+
+    wxCRIT_SECT_DECLARE(csComCtl32);
+    wxCRIT_SECT_LOCKER(lock, csComCtl32);

 
 

-    // if so, then we can check for the version
-    if (theModule)
+    if ( s_verComCtl32 == -1 )

     {
     {

-        // InitCommonControlsEx is unique to 4.7 and later
-        FARPROC theProc = ::GetProcAddress(theModule, "InitCommonControlsEx");
+        // initally assume no comctl32.dll at all
+        s_verComCtl32 = 0;

 
 

-        if (! theProc)
-        {                    // not found, must be 4.00
-      version = 400;
+        // do we have it?
+        HMODULE hModuleComCtl32 = ::GetModuleHandle(wxT("COMCTL32"));
+        BOOL bFreeComCtl32 = FALSE ;
+        if(!hModuleComCtl32)
+        {
+            hModuleComCtl32 = ::LoadLibrary(wxT("COMCTL32.DLL")) ;
+            if(hModuleComCtl32)
+            {
+                bFreeComCtl32 = TRUE ;
+            }

         }
         }

-        else
+
+        // if so, then we can check for the version
+        if ( hModuleComCtl32 )
+        {
+            // try to use DllGetVersion() if available in _headers_
+                WXADLLGETVERSIONPROC pfnDllGetVersion = (WXADLLGETVERSIONPROC)
+                    ::GetProcAddress(hModuleComCtl32, "DllGetVersion");
+                if ( pfnDllGetVersion )
+                {
+                    WXADLLVERSIONINFO dvi;
+                    dvi.cbSize = sizeof(dvi);
+
+                    HRESULT hr = (*pfnDllGetVersion)(&dvi);
+                    if ( FAILED(hr) )
+                    {
+                        wxLogApiError(_T("DllGetVersion"), hr);
+                    }
+                    else
+                    {
+                        // this is incompatible with _WIN32_IE values, but
+                        // compatible with the other values returned by
+                        // GetComCtl32Version()
+                        s_verComCtl32 = 100*dvi.dwMajorVersion +
+                                            dvi.dwMinorVersion;
+                    }
+                }
+                // DllGetVersion() unavailable either during compile or
+                // run-time, try to guess the version otherwise
+                if ( !s_verComCtl32 )
+                {
+                    // InitCommonControlsEx is unique to 4.70 and later
+                    FARPROC theProc = ::GetProcAddress
+                                        (
+                                         hModuleComCtl32,
+                                         "InitCommonControlsEx"
+                                        );
+
+                    if ( !theProc )
+                    {
+                        // not found, must be 4.00
+                        s_verComCtl32 = 400;
+                    }
+                    else
+                    {
+                        // many symbols appeared in comctl32 4.71, could use
+                        // any of them except may be DllInstall
+                        theProc = ::GetProcAddress
+                                    (
+                                     hModuleComCtl32,
+                                     "InitializeFlatSB"
+                                    );
+                        if ( !theProc )
+                        {
+                            // not found, must be 4.70
+                            s_verComCtl32 = 470;
+                        }
+                        else
+                        {
+                            // found, must be 4.71
+                            s_verComCtl32 = 471;
+                        }
+                    }
+                }
+        }
+
+        if(bFreeComCtl32)

         {
         {

-      // The following symbol are unique to 4.71
-      //   DllInstall
-      //   FlatSB_EnableScrollBar FlatSB_GetScrollInfo FlatSB_GetScrollPos
-      //   FlatSB_GetScrollProp FlatSB_GetScrollRange FlatSB_SetScrollInfo
-      //   FlatSB_SetScrollPos FlatSB_SetScrollProp FlatSB_SetScrollRange
-      //   FlatSB_ShowScrollBar
-      //   _DrawIndirectImageList _DuplicateImageList
-      //   InitializeFlatSB
-      //   UninitializeFlatSB
-      // we could check for any of these - I chose DllInstall
-      FARPROC theProc = ::GetProcAddress(theModule, "DllInstall");
-      if (! theProc)
-      {
-        // not found, must be 4.70
-        version = 470;
-      }
-      else
-      {                         // found, must be 4.71
-        version = 471;
-      }
+            ::FreeLibrary(hModuleComCtl32) ;

         }
     }
         }
     }

-    return version;
-}

 
 

-void wxExit()
-{
-  wxApp::CleanUp();
-  FatalAppExit(0, "Fatal error: exiting");
+    return s_verComCtl32;
+#endif

 }
 
 // Yield to incoming messages
 }
 
 // Yield to incoming messages

-bool wxYield()
-{
-  MSG msg;
-  // We want to go back to the main message loop
-  // if we see a WM_QUIT. (?)
-  while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT)
-  {
-    if (!wxTheApp->DoMessage())
-      break;
-  }
-
-  return TRUE;
-}

 
 

-HINSTANCE wxGetInstance()
+bool wxApp::Yield(bool onlyIfNeeded)

 {
 {

-  return wxhInstance;
+    // MT-FIXME
+    static bool s_inYield = FALSE;
+
+#if wxUSE_LOG
+    // disable log flushing from here because a call to wxYield() shouldn't
+    // normally result in message boxes popping up &c
+    wxLog::Suspend();
+#endif // wxUSE_LOG
+
+    if ( s_inYield )
+    {
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( wxT("wxYield called recursively" ) );
+        }
+
+        return FALSE;
+    }
+
+    s_inYield = TRUE;
+
+    // we don't want to process WM_QUIT from here - it should be processed in
+    // the main event loop in order to stop it
+    MSG msg;
+    while ( PeekMessage(&msg, (HWND)0, 0, 0, PM_NOREMOVE) &&
+            msg.message != WM_QUIT )
+    {
+#if wxUSE_THREADS
+        wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS
+
+        if ( !wxTheApp->DoMessage() )
+            break;
+    }
+
+    // if there are pending events, we must process them.
+    ProcessPendingEvents();
+
+#if wxUSE_LOG
+    // let the logs be flashed again
+    wxLog::Resume();
+#endif // wxUSE_LOG
+
+    s_inYield = FALSE;
+
+    return TRUE;

 }
 
 }
 

-// For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
-// if in a separate file. So include it here to ensure it's linked.
-#if (defined(_MSC_VER) && !defined(__WIN32__)) || defined(__GNUWIN32__)
-  #include "main.cpp"
-#endif