added container class source

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 33f10ba51a1c269146653578c519ed60db20f54b..72d8437e63cf690832c1acdc218c5fd79db1c2b0 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -43,12 +43,15 @@
     #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"

 #endif
 
 #endif
 

-#include "wx/msw/private.h"

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

+#include "wx/msw/private.h"
+

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


@@ -64,8 +67,13 @@
     #include "wx/resource.h"
 #endif
 
     #include "wx/resource.h"
 #endif
 

-// OLE is used for drag-and-drop, clipboard, OLE Automation...
-#if defined(__GNUWIN32__) || defined(__SC__) || defined(__SALFORDC__)
+#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(__SC__) || defined(__SALFORDC__)

     #undef wxUSE_OLE
 
     #define  wxUSE_OLE 0
     #undef wxUSE_OLE
 
     #define  wxUSE_OLE 0


@@ -78,37 +86,66 @@
 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 

-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__) || defined(__WXMICROWIN__)) && !defined(__CYGWIN10__))

     #include <commctrl.h>
 #endif
 
     #include <commctrl.h>
 #endif
 

+#ifndef __WXMICROWIN__

 #include "wx/msw/msvcrt.h"
 #include "wx/msw/msvcrt.h"

+#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
+
+#if _WIN32_IE >= 0x0300 \
+    && !( defined(__MINGW32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )
+    #include <shlwapi.h>
+#endif

 
 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------
 

-extern char *wxBuffer;
-extern char *wxOsVersion;
+extern wxChar *wxBuffer;

 extern wxList *wxWinHandleList;
 extern wxList WXDLLEXPORT wxPendingDelete;
 extern wxList *wxWinHandleList;
 extern wxList WXDLLEXPORT wxPendingDelete;

-#if wxUSE_THREADS
-extern wxList *wxPendingEvents;
-extern wxCriticalSection *wxPendingEventsLocker;
-#endif
+#ifndef __WXMICROWIN__

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

-extern wxCursor *g_globalCursor;
+#endif

 
 

-HINSTANCE wxhInstance = 0;

 MSG s_currentMsg;
 wxApp *wxTheApp = NULL;
 
 MSG s_currentMsg;
 wxApp *wxTheApp = NULL;
 

-// FIXME 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 *wxFrameClassName         = wxT("wxFrameClass");
+const wxChar *wxFrameClassNameNoRedraw = wxT("wxFrameClassNR");
+const wxChar *wxMDIFrameClassName      = wxT("wxMDIFrameClass");
+const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR");
+const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass");
+const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR");
+const wxChar *wxPanelClassName         = wxT("wxPanelClass");
+const wxChar *wxPanelClassNameNR       = wxT("wxPanelClassNR");
+const wxChar *wxCanvasClassName        = wxT("wxCanvasClass");
+const wxChar *wxCanvasClassNameNR      = wxT("wxCanvasClassNR");

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


@@ -120,16 +157,20 @@ HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL;
 
 HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
 
 
 HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
 

-LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
+LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);

 
 

-#if defined(__WIN95__) && !defined(__TWIN32__)
-    #define wxUSE_RICHEDIT 1
-#else
-    #define wxUSE_RICHEDIT 0
-#endif
+// FIXME wxUSE_ON_FATAL_EXCEPTION is only supported for VC++ now because it
+//       needs compiler support for Win32 SEH. Others (especially Borland)
+//       probably have it too, but I'm not sure about how it works
+// JACS: get 'Cannot use __try in functions that require unwinding
+// in Unicode mode, so disabling.
+#if !defined(__VISUALC__) || defined(__WIN16__) || defined(UNICODE)
+    #undef wxUSE_ON_FATAL_EXCEPTION
+    #define wxUSE_ON_FATAL_EXCEPTION 0
+#endif // VC++

 
 

-#if wxUSE_RICHEDIT
-    static HINSTANCE gs_hRichEdit = (HINSTANCE) NULL;
+#if wxUSE_ON_FATAL_EXCEPTION
+    static bool gs_handleExceptions = FALSE;

 #endif
 
 // ===========================================================================
 #endif
 
 // ===========================================================================


@@ -140,38 +181,50 @@ LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
 // wxApp
 // ---------------------------------------------------------------------------
 
 // wxApp
 // ---------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
+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()
-#endif
+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()
 {
 
 //// Initialize
 bool wxApp::Initialize()
 {

+    // the first thing to do is to check if we're trying to run an Unicode
+    // program under Win9x - if so, abort right now as it has no chance to
+    // work
+#if wxUSE_UNICODE
+    if ( wxGetOsVersion() != wxWINDOWS_NT )
+    {
+        // 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.\nProgram aborted."),
+         _T("wxWindows Fatal Error"),
+         MB_ICONERROR | MB_OK
+        );
+
+        return FALSE;
+    }
+#endif // wxUSE_UNICODE
+

     // Some people may wish to use this, but
     // probably it shouldn't be here by default.
 #ifdef __WXDEBUG__
     //    wxRedirectIOToConsole();
 #endif
 
     // Some people may wish to use this, but
     // probably it shouldn't be here by default.
 #ifdef __WXDEBUG__
     //    wxRedirectIOToConsole();
 #endif
 

-    wxBuffer = new char[1500]; // FIXME
+    wxBuffer = new wxChar[1500]; // FIXME

 
     wxClassInfo::InitializeClasses();
 
 
     wxClassInfo::InitializeClasses();
 

-#if wxUSE_RESOURCES
-    wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
-#endif
-
-    // I'm annoyed ... I don't know where to put this and I don't want to
-    // create a module for that as it's part of the core.

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-    wxPendingEvents = new wxList();
-    wxPendingEventsLocker = new wxCriticalSection();
+    wxPendingEventsLocker = new wxCriticalSection;

 #endif
 
     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
 #endif
 
     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);


@@ -186,56 +239,58 @@ bool wxApp::Initialize()
 
     wxBitmap::InitStandardHandlers();
 
 
     wxBitmap::InitStandardHandlers();
 

-#if defined(__WIN95__)
+#if defined(__WIN95__) && !defined(__WXMICROWIN__)

     InitCommonControls();
     InitCommonControls();

-
-#if wxUSE_RICHEDIT
-    gs_hRichEdit = LoadLibrary("RICHED32.DLL");
-
-    if (gs_hRichEdit == (HINSTANCE) NULL)
-    {
-        wxLogError(_("Could not initialise Rich Edit DLL"));
-    }
-#endif // wxUSE_RICHEDIT
-

 #endif // __WIN95__
 
 #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;
     // for OLE, enlarge message queue to be as large as possible
     int iMsg = 96;

-    while (!SetMessageQueue(iMsg) && (iMsg -= 8));
+    while (!SetMessageQueue(iMsg) && (iMsg -= 8))
+        ;
+#endif // Win16

 
 

-#if wxUSE_OLE

     // we need to initialize OLE library
     if ( FAILED(::OleInitialize(NULL)) )
         wxLogError(_("Cannot initialize OLE"));
     // we need to initialize OLE library
     if ( FAILED(::OleInitialize(NULL)) )
         wxLogError(_("Cannot initialize OLE"));

-#endif
+
+#endif // wxUSE_OLE

 
 #if wxUSE_CTL3D
     if (!Ctl3dRegister(wxhInstance))
 
 #if wxUSE_CTL3D
     if (!Ctl3dRegister(wxhInstance))

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

 
     Ctl3dAutoSubclass(wxhInstance);
 
     Ctl3dAutoSubclass(wxhInstance);

-#endif
+#endif // wxUSE_CTL3D

 
 

-    g_globalCursor = new wxCursor;
+    // VZ: these icons are not in wx.rc anyhow (but should they?)!
+#if 0
+    wxSTD_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_FRAME"));
+    wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_MDIPARENTFRAME"));
+    wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_MDICHILDFRAME"));

 
 

-    wxSTD_FRAME_ICON = LoadIcon(wxhInstance, "wxSTD_FRAME");
-    wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, "wxSTD_MDIPARENTFRAME");
-    wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, "wxSTD_MDICHILDFRAME");
-
-    wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_FRAME");
-    wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDIPARENTFRAME");
-    wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDICHILDFRAME");
+    wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_FRAME"));
+    wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_MDIPARENTFRAME"));
+    wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_MDICHILDFRAME"));
+#endif // 0

 
     RegisterWindowClasses();
 
 
     RegisterWindowClasses();
 

+#ifndef __WXMICROWIN__

     // Create the brush for disabling bitmap buttons
 
     LOGBRUSH lb;
     lb.lbStyle = BS_PATTERN;
     // 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 );
+    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
     wxRegisterPenWin();
 
 #if wxUSE_PENWINDOWS
     wxRegisterPenWin();


@@ -245,12 +300,14 @@ bool wxApp::Initialize()
 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.
     // PLEASE DO NOT ALTER THIS.
 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.
     // PLEASE DO NOT ALTER THIS.

-#if defined(__VISUALC__) && !defined(WXMAKINGDLL)
+#if defined(__VISUALC__) && defined(__WIN16__) && !defined(WXMAKINGDLL)

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

+#ifndef __WXMICROWIN__

     wxSetKeyboardHook(TRUE);
     wxSetKeyboardHook(TRUE);

+#endif

 
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules())
 
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules())


@@ -262,15 +319,22 @@ bool wxApp::Initialize()
 // 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()
 {
     WNDCLASS wndclass;
 
 bool wxApp::RegisterWindowClasses()
 {
     WNDCLASS wndclass;
 

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

     // the fields which are common to all classes
     // the fields which are common to all classes

-    wndclass.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;

     wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;
     wndclass.cbClsExtra    = 0;
     wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;
     wndclass.cbClsExtra    = 0;

-    wndclass.cbWndExtra    = sizeof( DWORD ); // what is this DWORD used for?
+    wndclass.cbWndExtra    = sizeof( DWORD ); // VZ: what is this DWORD used for?

     wndclass.hInstance     = wxhInstance;
     wndclass.hIcon         = (HICON) NULL;
     wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
     wndclass.hInstance     = wxhInstance;
     wndclass.hIcon         = (HICON) NULL;
     wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);


@@ -278,14 +342,23 @@ bool wxApp::RegisterWindowClasses()
 
     // Register the frame window class.
     wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);
 
     // Register the frame window class.
     wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);

-#ifdef _MULTIPLE_INSTANCES
-    sprintf( wxFrameClassName,"wxFrameClass%d", wxhInstance );
-#endif

     wndclass.lpszClassName = wxFrameClassName;
     wndclass.lpszClassName = wxFrameClassName;

+    wndclass.style         = styleNormal;

 
     if ( !RegisterClass(&wndclass) )
     {
 
     if ( !RegisterClass(&wndclass) )
     {

-        wxLogLastError("RegisterClass(frame)");
+        wxLogLastError(wxT("RegisterClass(frame)"));
+
+        return FALSE;
+    }
+
+    // "no redraw" frame
+    wndclass.lpszClassName = wxFrameClassNameNoRedraw;
+    wndclass.style         = styleNoRedraw;
+
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError(wxT("RegisterClass(no redraw frame)"));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -293,10 +366,22 @@ bool wxApp::RegisterWindowClasses()
     // Register the MDI frame window class.
     wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves
     wndclass.lpszClassName = wxMDIFrameClassName;
     // Register the MDI frame window class.
     wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves
     wndclass.lpszClassName = wxMDIFrameClassName;

+    wndclass.style         = styleNormal;
+
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError(wxT("RegisterClass(MDI parent)"));
+
+        return FALSE;
+    }
+
+    // "no redraw" MDI frame
+    wndclass.lpszClassName = wxMDIFrameClassNameNoRedraw;
+    wndclass.style         = styleNoRedraw;

 
     if ( !RegisterClass(&wndclass) )
     {
 
     if ( !RegisterClass(&wndclass) )
     {

-        wxLogLastError("RegisterClass(MDI parent)");
+        wxLogLastError(wxT("RegisterClass(no redraw MDI parent frame)"));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -304,10 +389,22 @@ bool wxApp::RegisterWindowClasses()
     // Register the MDI child frame window class.
     wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndclass.lpszClassName = wxMDIChildFrameClassName;
     // Register the MDI child frame window class.
     wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndclass.lpszClassName = wxMDIChildFrameClassName;

+    wndclass.style         = styleNormal;

 
     if ( !RegisterClass(&wndclass) )
     {
 
     if ( !RegisterClass(&wndclass) )
     {

-        wxLogLastError("RegisterClass(MDI child)");
+        wxLogLastError(wxT("RegisterClass(MDI child)"));
+
+        return FALSE;
+    }
+
+    // "no redraw" MDI child frame
+    wndclass.lpszClassName = wxMDIChildFrameClassNameNoRedraw;
+    wndclass.style         = styleNoRedraw;
+
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError(wxT("RegisterClass(no redraw MDI child)"));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -315,10 +412,22 @@ bool wxApp::RegisterWindowClasses()
     // Register the panel window class.
     wndclass.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
     wndclass.lpszClassName = wxPanelClassName;
     // Register the panel window class.
     wndclass.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
     wndclass.lpszClassName = wxPanelClassName;

+    wndclass.style         = styleNormal;

 
     if ( !RegisterClass(&wndclass) )
     {
 
     if ( !RegisterClass(&wndclass) )
     {

-        wxLogLastError("RegisterClass(panel)");
+        wxLogLastError(wxT("RegisterClass(panel)"));
+
+        return FALSE;
+    }
+
+    // Register the no redraw panel window class.
+    wndclass.lpszClassName = wxPanelClassNameNR;
+    wndclass.style         = styleNoRedraw;
+
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError(wxT("RegisterClass(no redraw panel)"));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -329,7 +438,16 @@ bool wxApp::RegisterWindowClasses()
 
     if ( !RegisterClass(&wndclass) )
     {
 
     if ( !RegisterClass(&wndclass) )
     {

-        wxLogLastError("RegisterClass(canvas)");
+        wxLogLastError(wxT("RegisterClass(canvas)"));
+
+        return FALSE;
+    }
+
+    wndclass.lpszClassName = wxCanvasClassNameNR;
+    wndclass.style         = styleNoRedraw;
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError(wxT("RegisterClass(no redraw canvas)"));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -349,13 +467,13 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
     int count = 0;
 
     // Get application name
     int count = 0;
 
     // Get application name

-    char name[260]; // 260 is MAX_PATH value from windef.h
+    wxChar name[260]; // 260 is MAX_PATH value from windef.h

     ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
 
     args.Add(name);
     count++;
 
     ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
 
     args.Add(name);
     count++;
 

-    strcpy(name, wxFileNameFromPath(name));
+    wxStrcpy(name, wxFileNameFromPath(name));

     wxStripExtension(name);
     wxTheApp->SetAppName(name);
 
     wxStripExtension(name);
     wxTheApp->SetAppName(name);
 


@@ -366,16 +484,16 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
     while (i < len)
     {
         // Skip whitespace
     while (i < len)
     {
         // Skip whitespace

-        while ((i < len) && isspace(cmdLine.GetChar(i)))
+        while ((i < len) && wxIsspace(cmdLine.GetChar(i)))

             i ++;
 
         if (i < len)
         {
             i ++;
 
         if (i < len)
         {

-            if (cmdLine.GetChar(i) == '"') // We found the start of a string
+            if (cmdLine.GetChar(i) == wxT('"')) // We found the start of a string

             {
                 i ++;
                 int first = i;
             {
                 i ++;
                 int first = i;

-                while ((i < len) && (cmdLine.GetChar(i) != '"'))
+                while ((i < len) && (cmdLine.GetChar(i) != wxT('"')))

                     i ++;
 
                 wxString arg(cmdLine.Mid(first, (i - first)));
                     i ++;
 
                 wxString arg(cmdLine.Mid(first, (i - first)));


@@ -389,7 +507,7 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
             else // Unquoted argument
             {
                 int first = i;
             else // Unquoted argument
             {
                 int first = i;

-                while ((i < len) && !isspace(cmdLine.GetChar(i)))
+                while ((i < len) && !wxIsspace(cmdLine.GetChar(i)))

                     i ++;
 
                 wxString arg(cmdLine.Mid(first, (i - first)));
                     i ++;
 
                 wxString arg(cmdLine.Mid(first, (i - first)));


@@ -400,11 +518,11 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
         }
     }
 
         }
     }
 

-    wxTheApp->argv = new char*[count + 1];
+    wxTheApp->argv = new wxChar*[count + 1];

     for (i = 0; i < count; i++)
     {
         wxString arg(args[i]);
     for (i = 0; i < count; i++)
     {
         wxString arg(args[i]);

-        wxTheApp->argv[i] = copystring((const char*)arg);
+        wxTheApp->argv[i] = copystring((const wxChar*)arg);

     }
     wxTheApp->argv[count] = NULL; // argv[] is a NULL-terminated list
     wxTheApp->argc = count;
     }
     wxTheApp->argv[count] = NULL; // argv[] is a NULL-terminated list
     wxTheApp->argc = count;


@@ -416,6 +534,7 @@ void wxApp::CleanUp()
 {
     //// COMMON CLEANUP
 
 {
     //// COMMON CLEANUP
 

+#if wxUSE_LOG

     // flush the logged messages if any and install a 'safer' log target: the
     // default one (wxLogGui) can't be used after the resources are freed just
     // below and the user suppliedo ne might be even more unsafe (using any
     // flush the logged messages if any and install a 'safer' log target: the
     // default one (wxLogGui) can't be used after the resources are freed just
     // below and the user suppliedo ne might be even more unsafe (using any


@@ -424,6 +543,7 @@ void wxApp::CleanUp()
 
     // this will flush the old messages if any
     delete wxLog::SetActiveTarget(new wxLogStderr);
 
     // this will flush the old messages if any
     delete wxLog::SetActiveTarget(new wxLogStderr);

+#endif // wxUSE_LOG

 
     // One last chance for pending objects to be cleaned up
     wxTheApp->DeletePendingObjects();
 
     // One last chance for pending objects to be cleaned up
     wxTheApp->DeletePendingObjects();


@@ -436,13 +556,6 @@ void wxApp::CleanUp()
     //  wxDefaultResourceTable->ClearTable();
 #endif
 
     //  wxDefaultResourceTable->ClearTable();
 #endif
 

-    // Indicate that the cursor can be freed, so that cursor won't be deleted
-    // by deleting the bitmap list before g_globalCursor goes out of scope
-    // (double deletion of the cursor).
-    wxSetCursor(wxNullCursor);
-    delete g_globalCursor;
-    g_globalCursor = NULL;
-

     wxDeleteStockObjects();
 
     // Destroy all GDI lists, etc.
     wxDeleteStockObjects();
 
     // Destroy all GDI lists, etc.


@@ -458,15 +571,8 @@ void wxApp::CleanUp()
 
     //// WINDOWS-SPECIFIC CLEANUP
 
 
     //// WINDOWS-SPECIFIC CLEANUP
 

+#ifndef __WXMICROWIN__

     wxSetKeyboardHook(FALSE);
     wxSetKeyboardHook(FALSE);

-
-#ifdef __WIN95__
-
-#if wxUSE_RICHEDIT
-    if (gs_hRichEdit != (HINSTANCE) NULL)
-        FreeLibrary(gs_hRichEdit);
-#endif
-

 #endif
 
 #if wxUSE_PENWINDOWS
 #endif
 
 #if wxUSE_PENWINDOWS


@@ -501,14 +607,17 @@ void wxApp::CleanUp()
     if (wxWinHandleList)
         delete wxWinHandleList;
 
     if (wxWinHandleList)
         delete wxWinHandleList;
 

-    // GL: I'm annoyed ... I don't know where to put this and I don't want to 
+    // GL: I'm annoyed ... I don't know where to put this and I don't want to

     // create a module for that as it's part of the core.
     // create a module for that as it's part of the core.

-#if wxUSE_THREADS

     delete wxPendingEvents;
     delete wxPendingEvents;

+
+#if wxUSE_THREADS

     delete wxPendingEventsLocker;
     delete wxPendingEventsLocker;

-    // If we don't do the following, we get an apparent memory leak.
+    // If we don't do the following, we get an apparent memory leak
+#if wxUSE_VALIDATORS

     ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
     ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();

-#endif
+#endif // wxUSE_VALIDATORS
+#endif // wxUSE_THREADS

 
     wxClassInfo::CleanUpClasses();
 
 
     wxClassInfo::CleanUpClasses();
 


@@ -522,17 +631,39 @@ void wxApp::CleanUp()
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {

-        wxLogDebug("There were memory leaks.");
+        wxLogMessage(wxT("There were memory leaks."));

         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
     //  wxDebugContext::SetStream(NULL, NULL);
 #endif
 
         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
     //  wxDebugContext::SetStream(NULL, NULL);
 #endif
 

+#if wxUSE_LOG

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

+#endif // wxUSE_LOG
+}
+
+//----------------------------------------------------------------------
+// Entry point helpers, used by wxPython
+//----------------------------------------------------------------------
+
+int WXDLLEXPORT wxEntryStart( int WXUNUSED(argc), char** WXUNUSED(argv) )
+{
+    return wxApp::Initialize();
+}
+
+int WXDLLEXPORT wxEntryInitGui()
+{
+    return wxTheApp->OnInitGui();
+}
+
+void WXDLLEXPORT wxEntryCleanup()
+{
+    wxApp::CleanUp();

 }
 
 }
 

+

 #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
 
 // temporarily disable this warning which would be generated in release builds
 #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
 
 // temporarily disable this warning which would be generated in release builds


@@ -541,7 +672,9 @@ void wxApp::CleanUp()
     #pragma warning(disable: 4715) // not all control paths return a value
 #endif // Visual C++
 
     #pragma warning(disable: 4715) // not all control paths return a value
 #endif // Visual C++
 

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

 int wxEntry(WXHINSTANCE hInstance,
             WXHINSTANCE WXUNUSED(hPrevInstance),
             char *lpCmdLine,
 int wxEntry(WXHINSTANCE hInstance,
             WXHINSTANCE WXUNUSED(hPrevInstance),
             char *lpCmdLine,


@@ -551,23 +684,30 @@ int wxEntry(WXHINSTANCE hInstance,
     // 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)
     // 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)

+#ifndef __WXMICROWIN__

     wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
     wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);

+#endif

 
 

-    // take everything into a try-except block in release build
-    // FIXME other compilers must support Win32 SEH (structured exception
-    //       handling) too, just find the appropriate keyword in their docs!
-    //       Please note that it's _not_ the same as C++ exceptions!
-#if !defined(__WXDEBUG__) && defined(__VISUALC__)
-    #define CATCH_PROGRAM_EXCEPTIONS
+#ifdef __MWERKS__
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+    // This seems to be necessary since there are 'rogue'
+    // objects present at this point (perhaps global objects?)
+    // Setting a checkpoint will ignore them as far as the
+    // memory checking facility is concerned.
+    // Of course you may argue that memory allocated in globals should be
+    // checked, but this is a reasonable compromise.
+    wxDebugContext::SetCheckpoint();
+#endif
+#endif

 
 

+    // take everything into a try-except block to be able to call
+    // OnFatalException() if necessary
+#if wxUSE_ON_FATAL_EXCEPTION

     __try {
     __try {

-#else
-    #undef  CATCH_PROGRAM_EXCEPTIONS

 #endif
 #endif

-

         wxhInstance = (HINSTANCE) hInstance;
 
         wxhInstance = (HINSTANCE) hInstance;
 

-        if (!wxApp::Initialize())
+        if (!wxEntryStart(0,0))

             return 0;
 
         // create the application object or ensure that one already exists
             return 0;
 
         // create the application object or ensure that one already exists


@@ -577,32 +717,53 @@ int wxEntry(WXHINSTANCE hInstance,
             // the IMPLEMENT_APP macro is used instead, which sets an initializer
             // function for delayed, dynamic app object construction.
             wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
             // 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." );
+                         wxT("No initializer - use IMPLEMENT_APP macro.") );

 
 

-            wxTheApp = (*wxApp::GetInitializerFunction()) ();
+            wxTheApp = (wxApp*) (*wxApp::GetInitializerFunction()) ();

         }
 
         }
 

-        wxCHECK_MSG( wxTheApp, 0, "You have to define an instance of wxApp!" );
+        wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );

 
         // save the WinMain() parameters
         wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);
         wxTheApp->m_nCmdShow = nCmdShow;
 
 
         // 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();
+        // We really don't want timestamps by default, because it means
+        // we can't simply double-click on the error message and get to that
+        // line in the source. So VC++ at least, let's have a sensible default.
+#ifdef __VISUALC__
+        wxLog::SetTimestamp(NULL);
+#endif

 
         int retValue = 0;
 
 
         int retValue = 0;
 

-        if ( wxTheApp->OnInit() )
+        // it is common to create a modal dialog in OnInit() (to ask/notify the
+        // user about something) but it wouldn't work if we don't change the
+        // "exit on delete last frame" flag here as when this dialog is
+        // deleted, the app would terminate (it was the last top level window
+        // as the main frame wasn't created yet!), so disable this behaviour
+        // temproarily
+        bool exitOnLastFrameDelete = wxTheApp->GetExitOnFrameDelete();
+        wxTheApp->SetExitOnFrameDelete(FALSE);
+
+        // init the app
+        retValue = wxEntryInitGui() && wxTheApp->OnInit() ? 0 : -1;
+
+        // restore the old flag value
+        wxTheApp->SetExitOnFrameDelete(exitOnLastFrameDelete);
+
+        if ( retValue == 0 )

         {
             if ( enterLoop )
             {
         {
             if ( enterLoop )
             {

+                // run the main loop

                 retValue = wxTheApp->OnRun();
             }
             else
                 retValue = wxTheApp->OnRun();
             }
             else

-                // We want to initialize, but not run or exit immediately.
+            {
+                // we want to initialize, but not run or exit immediately.

                 return 1;
                 return 1;

+            }

         }
         //else: app initialization failed, so we skipped OnRun()
 
         }
         //else: app initialization failed, so we skipped OnRun()
 


@@ -625,30 +786,25 @@ int wxEntry(WXHINSTANCE hInstance,
 
         wxTheApp->OnExit();
 
 
         wxTheApp->OnExit();
 

-        wxApp::CleanUp();
+        wxEntryCleanup();

 
         return retValue;
 
 
         return retValue;
 

-#ifdef CATCH_PROGRAM_EXCEPTIONS
+#if wxUSE_ON_FATAL_EXCEPTION

     }
     }

-    __except ( EXCEPTION_EXECUTE_HANDLER ) {
-        /*
-           if ( wxTheApp )
+    __except ( gs_handleExceptions ? EXCEPTION_EXECUTE_HANDLER
+                                   : EXCEPTION_CONTINUE_SEARCH ) {
+        if ( wxTheApp )
+        {
+           // give the user a chance to do something special about this

            wxTheApp->OnFatalException();
            wxTheApp->OnFatalException();

-         */
-
-        // using wxLog would be unsafe here
-        ::MessageBox(NULL,
-                     _("Unrecoverable program error detected: "
-                     " the application will terminate."),
-                     _("Fatal Error"),
-                     MB_APPLMODAL | MB_ICONSTOP | MB_OK);
+        }

 
         ::ExitProcess(3); // the same exit code as abort()
 
         // NOTREACHED
     }
 
         ::ExitProcess(3); // the same exit code as abort()
 
         // NOTREACHED
     }

-#endif // CATCH_PROGRAM_EXCEPTIONS
+#endif // wxUSE_ON_FATAL_EXCEPTION

 }
 
 // restore warning state
 }
 
 // restore warning state


@@ -658,12 +814,14 @@ int wxEntry(WXHINSTANCE hInstance,
 
 #else /*  _WINDLL  */
 
 
 #else /*  _WINDLL  */
 

-//// Entry point for DLLs
+//----------------------------------------------------------------------
+// Entry point for wxWindows + the App in a DLL
+//----------------------------------------------------------------------

 
 int wxEntry(WXHINSTANCE hInstance)
 {
     wxhInstance = (HINSTANCE) hInstance;
 
 int wxEntry(WXHINSTANCE hInstance)
 {
     wxhInstance = (HINSTANCE) hInstance;

-    wxApp::Initialize();
+    wxEntryStart(0, 0);

 
     // The app may have declared a global application object, but we recommend
     // the IMPLEMENT_APP macro is used instead, which sets an initializer function
 
     // The app may have declared a global application object, but we recommend
     // the IMPLEMENT_APP macro is used instead, which sets an initializer function


@@ -681,7 +839,7 @@ int wxEntry(WXHINSTANCE hInstance)
     wxTheApp->argc = 0;
     wxTheApp->argv = NULL;
 
     wxTheApp->argc = 0;
     wxTheApp->argv = NULL;
 

-    wxTheApp->OnInitGui();
+    wxEntryInitGui();

 
     wxTheApp->OnInit();
 
 
     wxTheApp->OnInit();
 


@@ -697,18 +855,13 @@ int wxEntry(WXHINSTANCE hInstance)
 
 //// Static member initialization
 
 
 //// Static member initialization
 

-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;

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

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

     argc = 0;
     argv = NULL;
     m_printMode = wxPRINT_WINDOWS;
     argc = 0;
     argv = NULL;
     m_printMode = wxPRINT_WINDOWS;

-    m_exitOnFrameDelete = TRUE;

     m_auto3D = TRUE;
 }
 
     m_auto3D = TRUE;
 }
 


@@ -730,8 +883,7 @@ bool wxApp::Initialized()
         return TRUE;
     else
         return FALSE;
         return TRUE;
     else
         return FALSE;

-#endif
-#ifdef _WINDLL // Assume initialized if DLL (no way of telling)
+#else // Assume initialized if DLL (no way of telling)

     return TRUE;
 #endif
 }
     return TRUE;
 #endif
 }


@@ -754,13 +906,13 @@ bool wxApp::DoMessage()
     else if ( rc == -1 )
     {
         // should never happen, but let's test for it nevertheless
     else if ( rc == -1 )
     {
         // should never happen, but let's test for it nevertheless

-        wxLogLastError("GetMessage");
+        wxLogLastError(wxT("GetMessage"));

     }
     else
     {
 #if wxUSE_THREADS
         wxASSERT_MSG( wxThread::IsMain(),
     }
     else
     {
 #if wxUSE_THREADS
         wxASSERT_MSG( wxThread::IsMain(),

-                      "only the main thread can process Windows messages" );
+                      wxT("only the main thread can process Windows messages") );

 
         static bool s_hadGuiLock = TRUE;
         static wxMsgArray s_aSavedMessages;
 
         static bool s_hadGuiLock = TRUE;
         static wxMsgArray s_aSavedMessages;


@@ -811,16 +963,21 @@ bool wxApp::DoMessage()
 #endif // wxUSE_THREADS
 
         // Process the message
 #endif // wxUSE_THREADS
 
         // Process the message

-        if ( !ProcessMessage((WXMSG *)&s_currentMsg) )
-        {
-            ::TranslateMessage(&s_currentMsg);
-            ::DispatchMessage(&s_currentMsg);
-        }
+        DoMessage((WXMSG *)&s_currentMsg);

     }
 
     return TRUE;
 }
 
     }
 
     return TRUE;
 }
 

+void wxApp::DoMessage(WXMSG *pMsg)
+{
+    if ( !ProcessMessage(pMsg) )
+    {
+        ::TranslateMessage((MSG *)pMsg);
+        ::DispatchMessage((MSG *)pMsg);
+    }
+}
+

 /*
  * Keep trying to process messages until WM_QUIT
  * received.
 /*
  * Keep trying to process messages until WM_QUIT
  * received.


@@ -845,12 +1002,10 @@ int wxApp::MainLoop()
         wxMutexGuiLeaveOrEnter();
 #endif // wxUSE_THREADS
 
         wxMutexGuiLeaveOrEnter();
 #endif // wxUSE_THREADS
 

-        while ( !::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) &&
-                ProcessIdle() )
-        {
-        }
-
+        while ( !Pending() && ProcessIdle() )
+            ;

 
 

+        // a message came or no more idle processing to do

         DoMessage();
     }
 
         DoMessage();
     }
 


@@ -867,33 +1022,15 @@ bool wxApp::ProcessIdle()
     return event.MoreRequested();
 }
 
     return event.MoreRequested();
 }
 

-#if wxUSE_THREADS
-void wxApp::ProcessPendingEvents()
-{
-    wxNode *node = wxPendingEvents->First();
-    wxCriticalSectionLocker locker(*wxPendingEventsLocker);
-
-    while (node)
-    {
-        wxEvtHandler *handler = (wxEvtHandler *)node->Data();
-
-        handler->ProcessPendingEvents();
-
-        delete node;
-        node = wxPendingEvents->First();
-    }
-}
-#endif
-
-

 void wxApp::ExitMainLoop()
 {
 void wxApp::ExitMainLoop()
 {

+    // VZ: why not ::PostQuitMessage()?

     m_keepGoing = FALSE;
 }
 
 bool wxApp::Pending()
 {
     m_keepGoing = FALSE;
 }
 
 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()


@@ -910,24 +1047,71 @@ void wxApp::Dispatch()
 bool wxApp::ProcessMessage(WXMSG *wxmsg)
 {
     MSG *msg = (MSG *)wxmsg;
 bool wxApp::ProcessMessage(WXMSG *wxmsg)
 {
     MSG *msg = (MSG *)wxmsg;

-    HWND hWnd = msg->hwnd;
-    wxWindow *wndThis = wxFindWinFromHandle((WXHWND)hWnd), *wnd;
+    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 ( ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD )
+        {
+            hwnd = ::GetParent(hwnd);
+        }
+
+        return ::IsDialogMessage(hwnd, msg) != 0;
+    }
+
+#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) )
+    {
+        wxToolTip *tt = wndThis->GetToolTip();
+        if ( tt )
+        {
+            tt->RelayEvent(wxmsg);
+        }
+    }
+#endif // wxUSE_TOOLTIPS
+
+    // 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) )
+    {
+        return FALSE;
+    }
+
+    // try translations first: the accelerators override everything
+    wxWindow *wnd;

 
 

-    // Try translations first; find the youngest window with
-    // a translation table.

     for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
     {
     for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
     {

-        if ( wnd->MSWTranslateMessage(wxmsg) )
+        if ( wnd->MSWTranslateMessage(wxmsg))

             return TRUE;
             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;

     }
 
     }
 

-    // Anyone for a non-translation message? Try youngest descendants first.
-    for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
+    // 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;
     }
 
     {
         if ( wnd->MSWProcessMessage(wxmsg) )
             return TRUE;
     }
 

+    // no special preprocessing for this message, dispatch it normally

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -941,13 +1125,30 @@ void wxApp::OnIdle(wxIdleEvent& event)
 
     s_inOnIdle = TRUE;
 
 
     s_inOnIdle = 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();
 
     // 'Garbage' collection of windows deleted with Close().
     DeletePendingObjects();
 

+#if wxUSE_LOG

     // flush the logged messages if any
     // flush the logged messages if any

-    wxLog *pLog = wxLog::GetActiveTarget();
-    if ( pLog != NULL && pLog->HasPendingMessages() )
-        pLog->Flush();
+    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() )
 
     // Send OnIdle events to all windows
     if ( SendIdleEvents() )


@@ -957,10 +1158,6 @@ void wxApp::OnIdle(wxIdleEvent& event)
         event.RequestMore(TRUE);
     }
 
         event.RequestMore(TRUE);
     }
 

-    // If they are pending events, we must process them.
-#if wxUSE_THREADS
-    ProcessPendingEvents();
-#endif

     s_inOnIdle = FALSE;
 }
 
     s_inOnIdle = FALSE;
 }
 


@@ -1040,62 +1237,95 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
     }
 }
 
     }
 }
 

-wxLog* wxApp::CreateLogTarget()
-{
-    return new wxLogGui;
-}
-
-wxWindow* wxApp::GetTopWindow() const
+/* static */
+int wxApp::GetComCtl32Version()

 {
 {

-    if (m_topWindow)
-        return m_topWindow;
-    else if (wxTopLevelWindows.GetCount() > 0)
-        return wxTopLevelWindows.GetFirst()->GetData();
-    else
-        return NULL;
-}
+#ifdef __WXMICROWIN__
+    return 0;
+#else
+    // cache the result
+    static int s_verComCtl32 = -1;

 
 

-int wxApp::GetComCtl32Version() const
-{
-    // have we loaded COMCTL32 yet?
-    HMODULE theModule = ::GetModuleHandle("COMCTL32");
-    int version = 0;
+    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;
-        }
-        else
+        // do we have it?
+        HMODULE hModuleComCtl32 = ::GetModuleHandle(wxT("COMCTL32"));
+
+        // if so, then we can check for the version
+        if ( hModuleComCtl32 )

         {
         {

-            // 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;
-            }
+            // try to use DllGetVersion() if available in _headers_
+            #ifdef DLLVER_PLATFORM_WINDOWS // defined in shlwapi.h
+                DLLGETVERSIONPROC pfnDllGetVersion = (DLLGETVERSIONPROC)
+                    ::GetProcAddress(hModuleComCtl32, "DllGetVersion");
+                if ( pfnDllGetVersion )
+                {
+                    DLLVERSIONINFO 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;
+                    }
+                }
+            #endif
+                // 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;
+                        }
+                    }
+                }

         }
     }
         }
     }

-    return version;
+
+    return s_verComCtl32;
+#endif

 }
 
 void wxExit()
 }
 
 void wxExit()


@@ -1103,39 +1333,124 @@ void wxExit()
     wxLogError(_("Fatal error: exiting"));
 
     wxApp::CleanUp();
     wxLogError(_("Fatal error: exiting"));
 
     wxApp::CleanUp();

+    exit(0);

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

+
+static bool gs_inYield = FALSE;
+

 bool wxYield()
 {
 bool wxYield()
 {

+    // disable log flushing from here because a call to wxYield() shouldn't
+    // normally result in message boxes popping up &c
+    wxLog::Suspend();
+
+#ifdef __WXDEBUG__
+    if (gs_inYield)
+        wxFAIL_MSG( wxT("wxYield called recursively" ) );
+#endif
+
+    gs_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;
     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)
+    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 ( !wxTheApp->DoMessage() )
             break;
     }

+

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

-#if wxUSE_THREADS
-    wxTheApp->ProcessPendingEvents();
-#endif
+    if (wxTheApp)
+        wxTheApp->ProcessPendingEvents();
+
+    // let the logs be flashed again
+    wxLog::Resume();
+
+    gs_inYield = FALSE;

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

-HINSTANCE wxGetInstance()
+// Yield to incoming messages; but fail silently if recursion is detected.
+bool wxYieldIfNeeded()

 {
 {

-    return wxhInstance;
+    if (gs_inYield)
+        return FALSE;
+
+    return wxYield();

 }
 
 }
 

-void wxSetInstance(HINSTANCE hInst)
+bool wxHandleFatalExceptions(bool doit)

 {
 {

-    wxhInstance = hInst;
+#if wxUSE_ON_FATAL_EXCEPTION
+    // assume this can only be called from the main thread
+    gs_handleExceptions = doit;
+
+    return TRUE;
+#else
+    wxFAIL_MSG(_T("set wxUSE_ON_FATAL_EXCEPTION to 1 to sue this function"));
+       
+       (void)doit;
+    return FALSE;
+#endif
+}
+
+//-----------------------------------------------------------------------------
+// wxWakeUpIdle
+//-----------------------------------------------------------------------------
+
+void wxWakeUpIdle()
+{
+    // 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)"));
+        }
+    }
+}
+
+//-----------------------------------------------------------------------------
+
+wxIcon
+wxApp::GetStdIcon(int which) const
+{
+    switch(which)
+    {
+        case wxICON_INFORMATION:
+            return wxIcon("wxICON_INFO");
+
+        case wxICON_QUESTION:
+            return wxIcon("wxICON_QUESTION");
+
+        case wxICON_EXCLAMATION:
+            return wxIcon("wxICON_WARNING");
+
+        default:
+            wxFAIL_MSG(wxT("requested non existent standard icon"));
+            // still fall through
+
+        case wxICON_HAND:
+            return wxIcon("wxICON_ERROR");
+    }

 }
 
 // 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.
 }
 
 // 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(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__))
+#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__) && !defined(WXMAKINGDLL))

 #include "main.cpp"
 #endif
 #include "main.cpp"
 #endif