Add accelerator back to label in GetItemLabel

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 9e1d6f64e44e497dec0b9fbc8ee4abce785d4500..537b447d18b39b03329cc172a0b0a7b784f08bce 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxApp
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxApp
 // Author:      Julian Smart
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "app.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -29,6 +25,8 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/msw/wrapcctl.h"
+    #include "wx/dynarray.h"

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


@@ -42,35 +40,37 @@
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"

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

 #endif
 
 #endif
 

-#include "wx/msw/private.h"
-#include "wx/log.h"
-#include "wx/module.h"
+#include "wx/apptrait.h"
+#include "wx/filename.h"
+#include "wx/dynlib.h"
+#include "wx/evtloop.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
+#include "wx/msw/private.h"
+#include "wx/msw/ole/oleutils.h"
+#include "wx/msw/private/timer.h"

 
 

-#if wxUSE_WX_RESOURCES
-    #include "wx/resource.h"
-#endif
+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif // wxUSE_TOOLTIPS

 
 

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

+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+    #include <ole2.h>
+    #include <aygshell.h>
+#endif
+

 #if wxUSE_OLE
     #include <ole2.h>
 #endif
 #if wxUSE_OLE
     #include <ole2.h>
 #endif


@@ -78,976 +78,516 @@
 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 

-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
-    #include <commctrl.h>
-#endif
+#include "wx/msw/missing.h"
+
+// instead of including <shlwapi.h> which is not part of the core SDK and not
+// shipped at all with other compilers, we always define the parts of it we
+// need here ourselves
+//
+// NB: DLLVER_PLATFORM_WINDOWS will be defined if shlwapi.h had been somehow
+//     included already
+#ifndef DLLVER_PLATFORM_WINDOWS
+    // hopefully we don't need to change packing as DWORDs should be already
+    // correctly aligned
+    struct DLLVERSIONINFO
+    {
+        DWORD cbSize;
+        DWORD dwMajorVersion;                   // Major version
+        DWORD dwMinorVersion;                   // Minor version
+        DWORD dwBuildNumber;                    // Build number
+        DWORD dwPlatformID;                     // DLLVER_PLATFORM_*
+    };
+
+    typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
+#endif // defined(DLLVERSIONINFO)

 
 

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

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

-extern char *wxBuffer;
-extern char *wxOsVersion;
-extern wxList *wxWinHandleList;
-extern wxList WXDLLEXPORT wxPendingDelete;
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

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

-extern wxCursor *g_globalCursor;
-
-HINSTANCE wxhInstance = 0;
-static 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";
-
-HICON wxSTD_FRAME_ICON = (HICON) NULL;
-HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL;
-HICON wxSTD_MDIPARENTFRAME_ICON = (HICON) NULL;
-
-HICON wxDEFAULT_FRAME_ICON = (HICON) NULL;
-HICON wxDEFAULT_MDICHILDFRAME_ICON = (HICON) NULL;
-HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL;
-
-HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
-
-LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
+#endif

 
 

-#if defined(__WIN95__) && !defined(__TWIN32__)
-    #define wxUSE_RICHEDIT 1
+// NB: all "NoRedraw" classes must have the same names as the "normal" classes
+//     with NR suffix - wxWindow::MSWCreate() supposes this
+#ifdef __WXWINCE__
+WXDLLIMPEXP_CORE       wxChar *wxCanvasClassName;
+WXDLLIMPEXP_CORE       wxChar *wxCanvasClassNameNR;

 #else
 #else

-    #define wxUSE_RICHEDIT 0
+WXDLLIMPEXP_CORE const wxChar *wxCanvasClassName        = wxT("wxWindowClass");
+WXDLLIMPEXP_CORE const wxChar *wxCanvasClassNameNR      = wxT("wxWindowClassNR");

 #endif
 #endif

+WXDLLIMPEXP_CORE const wxChar *wxMDIFrameClassName      = wxT("wxMDIFrameClass");
+WXDLLIMPEXP_CORE const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR");
+WXDLLIMPEXP_CORE const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass");
+WXDLLIMPEXP_CORE const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR");

 
 

-#if wxUSE_RICHEDIT
-    static HINSTANCE gs_hRichEdit = (HINSTANCE) NULL;
-#endif
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);

 
 // ===========================================================================
 
 // ===========================================================================

-// implementation
+// wxGUIAppTraits implementation

 // ===========================================================================
 
 // ===========================================================================
 

-// ---------------------------------------------------------------------------
-// wxApp
-// ---------------------------------------------------------------------------
-
-#if !USE_SHARED_LIBRARY
-    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
-
-long wxApp::sm_lastMessageTime = 0;
-
-//// Initialize
-bool wxApp::Initialize()
+// private class which we use to pass parameters from BeforeChildWaitLoop() to
+// AfterChildWaitLoop()
+struct ChildWaitLoopData

 {
 {

-    // 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
-
-    wxClassInfo::InitializeClasses();
-
-#if wxUSE_RESOURCES
-    wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
-#endif
-
-    wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-    wxTheColourDatabase->Initialize();
-
-    wxInitializeStockLists();
-    wxInitializeStockObjects();
-
-#if wxUSE_WX_RESOURCES
-    wxInitializeResourceSystem();
-#endif
-
-    wxBitmap::InitStandardHandlers();
-
-#if defined(__WIN95__)
-    InitCommonControls();
-
-#if wxUSE_RICHEDIT
-    gs_hRichEdit = LoadLibrary("RICHED32.DLL");
-
-    if (gs_hRichEdit == (HINSTANCE) NULL)
+    ChildWaitLoopData(wxWindowDisabler *wd_, wxWindow *winActive_)

     {
     {

-        wxLogError(_("Could not initialise Rich Edit DLL"));
+        wd = wd_;
+        winActive = winActive_;

     }
     }

-#endif // wxUSE_RICHEDIT
-
-#endif // __WIN95__

 
 

-    // for OLE, enlarge message queue to be as large as possible
-    int iMsg = 96;
-    while (!SetMessageQueue(iMsg) && (iMsg -= 8));
+    wxWindowDisabler *wd;
+    wxWindow *winActive;
+};

 
 

+void *wxGUIAppTraits::BeforeChildWaitLoop()
+{

     /*
     /*

-       DWORD dwOleVer;
-       dwOleVer = CoBuildVersion();
-
-    // check the OLE library version
-    if (rmm != HIWORD(dwOleVer))
-    {
-    wxMessageBox("Incorrect version of OLE libraries.");
-    return FALSE;
-    }
+       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(),
+                        wxID_ANY,
+                        wxEmptyString,
+                        wxPoint(32600, 32600),
+                        wxSize(1, 1),
+                        wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR
+                    );
+    winActive->Show();
+
+    return new ChildWaitLoopData(wd, winActive);
+}

 
 

-#if wxUSE_OLE
-    // we need to initialize OLE library
-    if ( FAILED(::OleInitialize(NULL)) )
-        wxLogError(_("Cannot initialize OLE"));
-#endif
-
-#if wxUSE_CTL3D
-    if (!Ctl3dRegister(wxhInstance))
-        wxLogError("Cannot register CTL3D");
-
-    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");
-
-    wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_FRAME");
-    wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDIPARENTFRAME");
-    wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDICHILDFRAME");
-
-    RegisterWindowClasses();
-
-    // 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 ) ;
+void wxGUIAppTraits::AlwaysYield()
+{
+    wxYield();
+}

 
 

-#if wxUSE_PENWINDOWS
-    wxRegisterPenWin();
-#endif
+void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
+{
+    wxEndBusyCursor();

 
 

-    wxWinHandleList = new wxList(wxKEY_INTEGER);
+    ChildWaitLoopData * const data = (ChildWaitLoopData *)dataOrig;

 
 

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

 
 

-    wxSetKeyboardHook(TRUE);
+    // 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();

 
 

-    wxModule::RegisterModules();
-    if (!wxModule::InitializeModules())
-        return FALSE;
-    return TRUE;
+    // also delete the temporary data object itself
+    delete data;

 }
 
 }
 

-//// RegisterWindowClasses
-
-bool wxApp::RegisterWindowClasses()
+bool wxGUIAppTraits::DoMessageFromThreadWait()

 {
 {

-    ///////////////////////////////////////////////////////////////////////
-    // Register the frame window class.
-    WNDCLASS wndclass;   // Structure used to register Windows class.
-
-    wndclass.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ;
-    wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;
-    wndclass.cbClsExtra    = 0;
-    wndclass.cbWndExtra    = sizeof( DWORD ); // was 4
-    wndclass.hInstance     = wxhInstance;
-    wndclass.hIcon         = (HICON) NULL;        // wxSTD_FRAME_ICON;
-    wndclass.hCursor       = LoadCursor( (HINSTANCE) 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 ))
+    // we should return false only if the app should exit, i.e. only if
+    // Dispatch() determines that the main event loop should terminate
+    wxEventLoopBase * const evtLoop = wxEventLoop::GetActive();
+    if ( !evtLoop || !evtLoop->Pending() )

     {
     {

-        // wxFatalError("Can't register Frame Window class");
+        // no events means no quit event
+        return true;

     }
 
     }
 

-    ///////////////////////////////////////////////////////////////////////
-    // Register the MDI frame window class.
-    WNDCLASS wndclass1;   // Structure used to register Windows class.
-
-    wndclass1.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ;
-    wndclass1.lpfnWndProc   = (WNDPROC)wxWndProc;
-    wndclass1.cbClsExtra    = 0;
-    wndclass1.cbWndExtra    = sizeof( DWORD ); // was 4
-    wndclass1.hInstance     = wxhInstance;
-    wndclass1.hIcon         = (HICON) NULL; // wxSTD_MDIPARENTFRAME_ICON;
-    wndclass1.hCursor       = LoadCursor( (HINSTANCE) NULL, IDC_ARROW );
-    //  wndclass1.hbrBackground =  (HBRUSH)(COLOR_APPWORKSPACE+1) ;
-    wndclass1.hbrBackground = (HBRUSH) NULL;
-    wndclass1.lpszMenuName  = NULL;
-
-    wndclass1.lpszClassName = wxMDIFrameClassName;
-    if (!RegisterClass( &wndclass1 ))
-    {
-        //    wxFatalError("Can't register MDI Frame window class");
-        //  return FALSE;
-    }
+    return evtLoop->Dispatch();
+}

 
 

-    ///////////////////////////////////////////////////////////////////////
-    // Register the MDI child frame window class.
-    WNDCLASS wndclass4;   // Structure used to register Windows class.
-
-    wndclass4.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ;
-    wndclass4.lpfnWndProc   = (WNDPROC)wxWndProc;
-    wndclass4.cbClsExtra    = 0;
-    wndclass4.cbWndExtra    = sizeof( DWORD ); // was 4
-    wndclass4.hInstance     = wxhInstance;
-    wndclass4.hIcon         = (HICON) NULL;       // wxSTD_MDICHILDFRAME_ICON;
-    wndclass4.hCursor       = LoadCursor( (HINSTANCE) 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;
-    }
+DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread)
+{
+    // if we don't have a running event loop, we shouldn't wait for the
+    // messages as we never remove them from the message queue and so we enter
+    // an infinite loop as MsgWaitForMultipleObjects() keeps returning
+    // WAIT_OBJECT_0 + 1
+    if ( !wxEventLoop::GetActive() )
+        return DoSimpleWaitForThread(hThread);
+
+    return ::MsgWaitForMultipleObjects
+             (
+               1,                   // number of objects to wait for
+               (HANDLE *)&hThread,  // the objects
+               false,               // wait for any objects, not all
+               INFINITE,            // no timeout
+               QS_ALLINPUT |        // return as soon as there are any events
+               QS_ALLPOSTMESSAGE
+             );
+}

 
 

-    ///////////////////////////////////////////////////////////////////////
-    // Register the panel window class.
-    WNDCLASS wndclass2;   // Structure used to register Windows class.
-    memset(&wndclass2, 0, sizeof(WNDCLASS));   // start with NULL defaults
-    wndclass2.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ;
-    wndclass2.lpfnWndProc   = (WNDPROC)wxWndProc;
-    wndclass2.cbClsExtra    = 0;
-    wndclass2.cbWndExtra    = sizeof( DWORD ); // was 4
-    wndclass2.hInstance     = wxhInstance;
-    wndclass2.hIcon         = (HICON) NULL;
-    wndclass2.hCursor       = LoadCursor( (HINSTANCE) NULL, IDC_ARROW );
-    //  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;
-    }
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
+{
+    OSVERSIONINFO info;
+    wxZeroMemory(info);

 
 

-    ///////////////////////////////////////////////////////////////////////
-    // 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         = (HICON) NULL;
-    wndclass3.hCursor       = LoadCursor( (HINSTANCE) NULL, IDC_ARROW );
-    //  wndclass3.hbrBackground = (HBRUSH)(COLOR_WINDOW+1) ;
-    wndclass3.hbrBackground = (HBRUSH) NULL;
-    wndclass3.lpszMenuName  = NULL;
-    wndclass3.lpszClassName = wxCanvasClassName;
-    if (!RegisterClass( &wndclass3))
+    // on Windows, the toolkit version is the same of the OS version
+    // as Windows integrates the OS kernel with the GUI toolkit.
+    info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+    if ( ::GetVersionEx(&info) )

     {
     {

-        //   wxFatalError("Can't register Canvas class");
-        //   return FALSE;
+        if ( majVer )
+            *majVer = info.dwMajorVersion;
+        if ( minVer )
+            *minVer = info.dwMinorVersion;

     }
 
     }
 

-    return TRUE;
+#if defined(__WXHANDHELD__) || defined(__WXWINCE__)
+    return wxPORT_WINCE;
+#else
+    return wxPORT_MSW;
+#endif

 }
 
 }
 

-//// Convert Windows to argc, argv style
+#if wxUSE_TIMER

 
 

-void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
+wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)

 {
 {

-    wxStringList args;
+    return new wxMSWTimerImpl(timer);
+}

 
 

-    wxString cmdLine(lpCmdLine);
-    int count = 0;
+#endif // wxUSE_TIMER

 
 

-    // Get application name
-    char name[260]; // 260 is MAX_PATH value from windef.h
-    ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
+{
+    return new wxEventLoop;
+}

 
 

-    // GNUWIN32 already fills in the first arg with the application name.
-    // JACS: apparently not now (b20 and above?)
-#if 0 // !defined(__GNUWIN32__)
-    args.Add(name);
-    count ++;
-#endif
+// ===========================================================================
+// wxApp implementation
+// ===========================================================================

 
 

-    strcpy(name, wxFileNameFromPath(name));
-    wxStripExtension(name);
-    wxTheApp->SetAppName(name);
+int wxApp::m_nCmdShow = SW_SHOWNORMAL;

 
 

-    // Break up string
-    // Treat strings enclosed in double-quotes as single arguments
-    int i = 0;
-    int len = cmdLine.Length();
-    while (i < len)
-    {
-        // Skip whitespace
-        while ((i < len) && isspace(cmdLine.GetChar(i)))
-            i ++;
+// ---------------------------------------------------------------------------
+// wxWin macros
+// ---------------------------------------------------------------------------

 
 

-        if (i < len)
-        {
-            if (cmdLine.GetChar(i) == '"') // We found the start of a string
-            {
-                i ++;
-                int first = i;
-                while ((i < len) && (cmdLine.GetChar(i) != '"'))
-                    i ++;
+IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)

 
 

-                wxString arg(cmdLine.Mid(first, (i - first)));
+BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
+    EVT_IDLE(wxApp::OnIdle)
+    EVT_END_SESSION(wxApp::OnEndSession)
+    EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
+END_EVENT_TABLE()

 
 

-                args.Add(arg);
-                count ++;
+// 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(); }

 
 

-                if (i < len)
-                    i ++; // Skip past 2nd quote
-            }
-            else // Unquoted argument
-            {
-                int first = i;
-                while ((i < len) && !isspace(cmdLine.GetChar(i)))
-                    i ++;
+    void Dismiss() { m_app = NULL; }

 
 

-                wxString arg(cmdLine.Mid(first, (i - first)));
+private:
+    wxApp *m_app;
+};

 
 

-                args.Add(arg);
-                count ++;
-            }
-        }
-    }
-
-    wxTheApp->argv = new char*[count + 1];
-    for (i = 0; i < count; i++)
+//// Initialize
+bool wxApp::Initialize(int& argc, wxChar **argv)
+{
+    if ( !wxAppBase::Initialize(argc, argv) )
+        return false;
+
+    // ensure that base cleanup is done if we return too early
+    wxCallBaseCleanup callBaseCleanup(this);
+
+#ifdef __WXWINCE__
+    wxString tmp = GetAppName();
+    tmp += wxT("ClassName");
+    wxCanvasClassName = wxStrdup( tmp.wc_str() );
+    tmp += wxT("NR");
+    wxCanvasClassNameNR = wxStrdup( tmp.wc_str() );
+    HWND hWnd = FindWindow( wxCanvasClassNameNR, NULL );
+    if (hWnd)

     {
     {

-        wxString arg(args[i]);
-        wxTheApp->argv[i] = copystring((const char*)arg);
+        SetForegroundWindow( (HWND)(((DWORD)hWnd)|0x01) );
+        return false;

     }
     }

-    wxTheApp->argv[count] = NULL; // argv[] is a NULL-terminated list
-    wxTheApp->argc = count;
-}
-
-//// Cleans up any wxWindows internal structures left lying around
-
-void wxApp::CleanUp()
-{
-    //// COMMON CLEANUP
-
-    // flush the logged messages if any and install a 'safer' log target: the
-    // default one (wxLogGui) can't be used after the resources are freed just
-    // below and the user suppliedo ne might be even more unsafe (using any
-    // wxWindows GUI function is unsafe starting from now)
-    wxLog::DontCreateOnDemand();
-
-    // this will flush the old messages if any
-    delete wxLog::SetActiveTarget(new wxLogStderr);
-
-    // One last chance for pending objects to be cleaned up
-    wxTheApp->DeletePendingObjects();
-
-    wxModule::CleanUpModules();
-
-#if wxUSE_WX_RESOURCES
-    wxCleanUpResourceSystem();
-
-    //  wxDefaultResourceTable->ClearTable();

 #endif
 
 #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;
-
-    wxDeleteStockObjects() ;
-
-    // Destroy all GDI lists, etc.
-    wxDeleteStockLists();
-
-    delete wxTheColourDatabase;
-    wxTheColourDatabase = NULL;
-
-    wxBitmap::CleanUpHandlers();
-
-    delete[] wxBuffer;
-    wxBuffer = NULL;
-
-    //// WINDOWS-SPECIFIC CLEANUP
-
-    wxSetKeyboardHook(FALSE);
-
-#ifdef __WIN95__
-
-#if wxUSE_RICHEDIT
-    if (gs_hRichEdit != (HINSTANCE) NULL)
-        FreeLibrary(gs_hRichEdit);
-#endif
+#if !defined(__WXMICROWIN__)
+    InitCommonControls();
+#endif // !defined(__WXMICROWIN__)

 
 

+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+    SHInitExtraControls();

 #endif
 
 #endif
 

-#if wxUSE_PENWINDOWS
-    wxCleanUpPenWin();
+#ifndef __WXWINCE__
+    // Don't show a message box if a function such as SHGetFileInfo
+    // fails to find a device.
+    SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX);

 #endif
 
 #endif
 

-    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);
+    wxOleInitialize();

 
 

-    if ( wxDisableButtonBrush )
-        ::DeleteObject( wxDisableButtonBrush ) ;
+    RegisterWindowClasses();

 
 

-#if wxUSE_OLE
-    ::OleUninitialize();
-#endif
+    wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100);

 
 

-#if wxUSE_CTL3D
-    Ctl3dUnregister(wxhInstance);
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+    wxSetKeyboardHook(true);

 #endif
 
 #endif
 

-    if (wxWinHandleList)
-        delete wxWinHandleList ;
-
-    wxClassInfo::CleanUpClasses();
-
-    delete wxTheApp;
-    wxTheApp = NULL;
+    callBaseCleanup.Dismiss();

 
 

-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    // At this point we want to check if there are any memory
-    // blocks that aren't part of the wxDebugContext itself,
-    // as a special case. Then when dumping we need to ignore
-    // wxDebugContext, too.
-    if (wxDebugContext::CountObjectsLeft() > 0)
-    {
-        wxLogDebug("There were memory leaks.");
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
-    }
-    //  wxDebugContext::SetStream(NULL, NULL);
-#endif
-
-    // do it as the very last thing because everything else can log messages
-    delete wxLog::SetActiveTarget(NULL);
+    return true;

 }
 
 }
 

-#if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
-
-// temporarily disable this warning which would be generated in release builds
-// because of __try
-#ifdef __VISUALC__
-    #pragma warning(disable: 4715) // not all control paths return a value
-#endif // Visual C++
+// ---------------------------------------------------------------------------
+// RegisterWindowClasses
+// ---------------------------------------------------------------------------

 
 

-//// Main wxWindows entry point
-int wxEntry(WXHINSTANCE hInstance,
-            WXHINSTANCE WXUNUSED(hPrevInstance),
-            char *lpCmdLine,
-            int nCmdShow,
-            bool enterLoop)
+// 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()

 {
 {

-    // 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)
-    wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
-
-    // 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
-
-    __try {
-#else
-    #undef  CATCH_PROGRAM_EXCEPTIONS
-#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
-                // We want to initialize, but not run or exit immediately.
-                return 1;
-        }
-        //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);
-            }
-        }
+    WNDCLASS wndclass;
+    wxZeroMemory(wndclass);

 
 

-        wxTheApp->OnExit();
+    // 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;

 
 

-        wxApp::CleanUp();
+    // the fields which are common to all classes
+    wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;
+    wndclass.hInstance     = wxhInstance;
+    wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);

 
 

-        return retValue;
+    // register the class for all normal windows
+    wndclass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
+    wndclass.lpszClassName = wxCanvasClassName;
+    wndclass.style         = styleNormal;

 
 

-#ifdef CATCH_PROGRAM_EXCEPTIONS
-    }
-    __except ( EXCEPTION_EXECUTE_HANDLER ) {
-        /*
-           if ( wxTheApp )
-           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
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError(wxT("RegisterClass(frame)"));

     }
     }

-#endif // CATCH_PROGRAM_EXCEPTIONS
-}
-
-// restore warning state
-#ifdef __VISUALC__
-    #pragma warning(default: 4715) // not all control paths return a value
-#endif // Visual C++

 
 

-#else /*  _WINDLL  */
+    // "no redraw" frame
+    wndclass.lpszClassName = wxCanvasClassNameNR;
+    wndclass.style         = styleNoRedraw;

 
 

-//// 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 ( !RegisterClass(&wndclass) )

     {
     {

-        wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
-                     "No initializer - use IMPLEMENT_APP macro." );
-
-        wxTheApp = (* wxApp::GetInitializerFunction()) ();
+        wxLogLastError(wxT("RegisterClass(no redraw frame)"));

     }
 
     }
 

-    wxCHECK_MSG( wxTheApp, 0, "You have to define an instance of wxApp!" );
-
-    wxTheApp->argc = 0;
-    wxTheApp->argv = NULL;
-
-    wxTheApp->OnInitGui();
-
-    wxTheApp->OnInit();
+    // Register the MDI frame window class.
+    wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves
+    wndclass.lpszClassName = wxMDIFrameClassName;
+    wndclass.style         = styleNormal;

 
 

-    wxWindow *topWindow = wxTheApp->GetTopWindow();
-    if ( topWindow && topWindow->GetHWND())
+    if ( !RegisterClass(&wndclass) )

     {
     {

-        topWindow->Show(TRUE);
+        wxLogLastError(wxT("RegisterClass(MDI parent)"));

     }
 
     }
 

-    return 1;
-}
-#endif // _WINDLL
-
-//// Static member initialization
+    // "no redraw" MDI frame
+    wndclass.lpszClassName = wxMDIFrameClassNameNoRedraw;
+    wndclass.style         = styleNoRedraw;

 
 

-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
-
-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;
-}
-
-wxApp::~wxApp()
-{
-    // Delete command-line args
-    int i;
-    for (i = 0; i < argc; i++)
+    if ( !RegisterClass(&wndclass) )

     {
     {

-        delete[] argv[i];
+        wxLogLastError(wxT("RegisterClass(no redraw MDI parent frame)"));

     }
     }

-    delete[] argv;
-}

 
 

-bool wxApp::Initialized()
-{
-#ifndef _WINDLL
-    if (GetTopWindow())
-        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
- * received (and also set the flag telling the app to exit the main loop)
- *
- */
-bool wxApp::DoMessage()
-{
-    BOOL rc = ::GetMessage(&s_currentMsg, (HWND) NULL, 0, 0);
-    if ( rc == 0 )
-    {
-        // got WM_QUIT
-        m_keepGoing = FALSE;
+    // Register the MDI child frame window class.
+    wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+    wndclass.lpszClassName = wxMDIChildFrameClassName;
+    wndclass.style         = styleNormal;

 
 

-        return FALSE;
-    }
-    else if ( rc == -1 )
+    if ( !RegisterClass(&wndclass) )

     {
     {

-        // should never happen, but let's test for it nevertheless
-        wxLogLastError("GetMessage");
+        wxLogLastError(wxT("RegisterClass(MDI child)"));

     }
     }

-    else
-    {
-#if wxUSE_THREADS
-        wxASSERT_MSG( wxThread::IsMain(),
-                      "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.Count();
-                for ( size_t n = 0; n < count; n++ )
-                {
-                    MSG& msg = s_aSavedMessages[n];
-
-                    if ( !ProcessMessage((WXMSG *)&msg) )
-                    {
-                        ::TranslateMessage(&msg);
-                        ::DispatchMessage(&msg);
-                    }
-                }
-
-                s_aSavedMessages.Empty();
-            }
-        }
-#endif // wxUSE_THREADS
+    // "no redraw" MDI child frame
+    wndclass.lpszClassName = wxMDIChildFrameClassNameNoRedraw;
+    wndclass.style         = styleNoRedraw;

 
 

-        // Process the message
-        if ( !ProcessMessage((WXMSG *)&s_currentMsg) )
-        {
-            ::TranslateMessage(&s_currentMsg);
-            wxApp::sm_lastMessageTime = s_currentMsg.time; /* MATTHEW: timeStamp impl. */
-            ::DispatchMessage(&s_currentMsg);
-        }
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError(wxT("RegisterClass(no redraw MDI child)"));

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 }
 

-/*
- * Keep trying to process messages until WM_QUIT
- * received.
- *
- * If there are messages to be processed, they will all be
- * processed and OnIdle will not be called.
- * When there are no more messages, OnIdle is called.
- * If OnIdle requests more time,
- * it will be repeatedly called so long as there are no pending messages.
- * A 'feature' of this is that once OnIdle has decided that no more processing
- * is required, then it won't get processing time until further messages
- * are processed (it'll sit in DoMessage).
- */
-
-int wxApp::MainLoop()
+// ---------------------------------------------------------------------------
+// UnregisterWindowClasses
+// ---------------------------------------------------------------------------
+
+bool wxApp::UnregisterWindowClasses()

 {
 {

-    m_keepGoing = TRUE;
+    bool retval = true;

 
 

-    while ( m_keepGoing )
+#ifndef __WXMICROWIN__
+    // MDI frame window class.
+    if ( !::UnregisterClass(wxMDIFrameClassName, wxhInstance) )

     {
     {

-#if wxUSE_THREADS
-        wxMutexGuiLeaveOrEnter();
-#endif // wxUSE_THREADS
-
-        while ( !::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) &&
-                ProcessIdle() )
-        {
-        }
+        wxLogLastError(wxT("UnregisterClass(MDI parent)"));

 
 

-        DoMessage();
+        retval = false;

     }
 
     }
 

-    return s_currentMsg.wParam;
-}
-
-// Returns TRUE if more time is needed.
-bool wxApp::ProcessIdle()
-{
-    wxIdleEvent event;
-    event.SetEventObject(this);
-    ProcessEvent(event);
+    // "no redraw" MDI frame
+    if ( !::UnregisterClass(wxMDIFrameClassNameNoRedraw, wxhInstance) )
+    {
+        wxLogLastError(wxT("UnregisterClass(no redraw MDI parent frame)"));

 
 

-    return event.MoreRequested();
-}
+        retval = false;
+    }

 
 

-void wxApp::ExitMainLoop()
-{
-    m_keepGoing = FALSE;
-}
+    // MDI child frame window class.
+    if ( !::UnregisterClass(wxMDIChildFrameClassName, wxhInstance) )
+    {
+        wxLogLastError(wxT("UnregisterClass(MDI child)"));

 
 

-bool wxApp::Pending()
-{
-    return (::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) != 0) ;
-}
+        retval = false;
+    }

 
 

-void wxApp::Dispatch()
-{
-    DoMessage();
-}
+    // "no redraw" MDI child frame
+    if ( !::UnregisterClass(wxMDIChildFrameClassNameNoRedraw, wxhInstance) )
+    {
+        wxLogLastError(wxT("UnregisterClass(no redraw MDI child)"));

 
 

-/*
- * Give all windows a chance to preprocess
- * the message. Some may have accelerator tables, or have
- * MDI complications.
- */
-bool wxApp::ProcessMessage(WXMSG *wxmsg)
-{
-    MSG *msg = (MSG *)wxmsg;
-    HWND hWnd = msg->hwnd;
-    wxWindow *wndThis = wxFindWinFromHandle((WXHWND)hWnd), *wnd;
+        retval = false;
+    }

 
 

-    // Try translations first; find the youngest window with
-    // a translation table.
-    for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
+    // canvas class name
+    if ( !::UnregisterClass(wxCanvasClassName, wxhInstance) )

     {
     {

-        if ( wnd->MSWTranslateMessage(wxmsg) )
-            return TRUE;
+        wxLogLastError(wxT("UnregisterClass(canvas)"));
+
+        retval = false;

     }
 
     }
 

-    // Anyone for a non-translation message? Try youngest descendants first.
-    for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
+    if ( !::UnregisterClass(wxCanvasClassNameNR, wxhInstance) )

     {
     {

-        if ( wnd->MSWProcessMessage(wxmsg) )
-            return TRUE;
+        wxLogLastError(wxT("UnregisterClass(no redraw canvas)"));
+
+        retval = false;

     }
     }

+#endif // __WXMICROWIN__

 
 

-    return FALSE;
+    return retval;

 }
 
 }
 

-void wxApp::OnIdle(wxIdleEvent& event)
+void wxApp::CleanUp()

 {
 {

-    static bool s_inOnIdle = FALSE;
-
-    // Avoid recursion (via ProcessEvent default case)
-    if ( s_inOnIdle )
-        return;
+    // all objects pending for deletion must be deleted first, otherwise we
+    // would crash when they use wxWinHandleHash (and UnregisterWindowClasses()
+    // call wouldn't succeed as long as any windows still exist), so call the
+    // base class method first and only then do our clean up
+    wxAppBase::CleanUp();
+
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+    wxSetKeyboardHook(false);
+#endif

 
 

-    s_inOnIdle = TRUE;
+    wxOleUninitialize();

 
 

-    // 'Garbage' collection of windows deleted with Close().
-    DeletePendingObjects();
+    // 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();

 
 

-    // flush the logged messages if any
-    wxLog *pLog = wxLog::GetActiveTarget();
-    if ( pLog != NULL && pLog->HasPendingMessages() )
-        pLog->Flush();
+    delete wxWinHandleHash;
+    wxWinHandleHash = NULL;

 
 

-    // Send OnIdle events to all windows
-    if ( SendIdleEvents() )
-    {
-        // SendIdleEvents() returns TRUE if at least one window requested more
-        // idle events
-        event.RequestMore(TRUE);
-    }
-
-    s_inOnIdle = FALSE;
+#ifdef __WXWINCE__
+    free( wxCanvasClassName );
+    free( wxCanvasClassNameNR );
+#endif

 }
 
 }
 

-// 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))
-            needMore = TRUE;
-
-        node = node->Next();
-    }
+// ----------------------------------------------------------------------------
+// wxApp ctor/dtor
+// ----------------------------------------------------------------------------

 
 

-    return needMore;
+wxApp::wxApp()
+{
+    m_printMode = wxPRINT_WINDOWS;

 }
 
 }
 

-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
+wxApp::~wxApp()

 {
 {

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

 
 

-    if (event.MoreRequested())
-        needMore = TRUE;
+// ----------------------------------------------------------------------------
+// wxApp idle handling
+// ----------------------------------------------------------------------------

 
 

-    wxNode* node = win->GetChildren().First();
-    while (node)
-    {
-        wxWindow* win = (wxWindow*) node->Data();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-
-        node = node->Next();
-    }
-    return needMore ;
+void wxApp::OnIdle(wxIdleEvent& WXUNUSED(event))
+{
+#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

 }
 
 }
 

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

 {
 {

-    wxNode *node = wxPendingDelete.First();
-    while (node)
+    // 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 )

     {
     {

-        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();
+        if ( !::PostMessage(GetHwndOf(topWindow), WM_NULL, 0, 0) )
+        {
+            // should never happen
+            wxLogLastError(wxT("PostMessage(WM_NULL)"));
+        }

     }
 }
 
     }
 }
 

+// ----------------------------------------------------------------------------
+// other wxApp event hanlders
+// ----------------------------------------------------------------------------
+

 void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
 {
     if (GetTopWindow())
 void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
 {
     if (GetTopWindow())

-        GetTopWindow()->Close(TRUE);
+        GetTopWindow()->Close(true);

 }
 
 // Default behaviour: close the application with prompts. The
 }
 
 // Default behaviour: close the application with prompts. The


@@ -1057,102 +597,188 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
     if (GetTopWindow())
     {
         if (!GetTopWindow()->Close(!event.CanVeto()))
     if (GetTopWindow())
     {
         if (!GetTopWindow()->Close(!event.CanVeto()))

-            event.Veto(TRUE);
+            event.Veto(true);

     }
 }
 
     }
 }
 

-wxLog* wxApp::CreateLogTarget()
-{
-    return new wxLogGui;
-}
+// ----------------------------------------------------------------------------
+// miscellaneous
+// ----------------------------------------------------------------------------

 
 

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

 {
 {

-    if (m_topWindow)
-        return m_topWindow;
-    else if (wxTopLevelWindows.Number() > 0)
-        return (wxWindow*) wxTopLevelWindows.First()->Data();
-    else
-        return NULL;
-}
-
-int wxApp::GetComCtl32Version() const
-{
-    // have we loaded COMCTL32 yet?
-    HMODULE theModule = ::GetModuleHandle("COMCTL32");
-    int version = 0;
+#if defined(__WXMICROWIN__) || defined(__WXWINCE__)
+    return 0;
+#else
+    // cache the result
+    //
+    // NB: this is MT-ok as in the worst case we'd compute s_verComCtl32 twice,
+    //     but as its value should be the same both times it doesn't matter
+    static int s_verComCtl32 = -1;

 
 

-    // 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
+        // we're prepared to handle the errors
+        wxLogNull noLog;
+
+#if wxUSE_DYNLIB_CLASS
+        // do we have it?
+        wxDynamicLibrary dllComCtl32(_T("comctl32.dll"), wxDL_VERBATIM);
+
+        // if so, then we can check for the version
+        if ( dllComCtl32.IsLoaded() )

         {
         {

-            // 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)
+            // now check if the function is available during run-time
+            wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 );
+            if ( pfnDllGetVersion )

             {
             {

-                // not found, must be 4.70
-                version = 470;
+                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;
+                }

             }
             }

-            else
-            {                         // found, must be 4.71
-                version = 471;
+
+            // if DllGetVersion() is unavailable either during compile or
+            // run-time, try to guess the version otherwise
+            if ( !s_verComCtl32 )
+            {
+                // InitCommonControlsEx is unique to 4.70 and later
+                void *pfn = dllComCtl32.GetSymbol(_T("InitCommonControlsEx"));
+                if ( !pfn )
+                {
+                    // not found, must be 4.00
+                    s_verComCtl32 = 400;
+                }
+                else // 4.70+
+                {
+                    // many symbols appeared in comctl32 4.71, could use any of
+                    // them except may be DllInstall()
+                    pfn = dllComCtl32.GetSymbol(_T("InitializeFlatSB"));
+                    if ( !pfn )
+                    {
+                        // not found, must be 4.70
+                        s_verComCtl32 = 470;
+                    }
+                    else
+                    {
+                        // found, must be 4.71 or later
+                        s_verComCtl32 = 471;
+                    }
+                }

             }
         }
             }
         }

+#endif

     }
     }

-    return version;
-}
-
-void wxExit()
-{
-    wxLogError(_("Fatal error: exiting"));

 
 

-    wxApp::CleanUp();
+    return s_verComCtl32;
+#endif // Microwin/!Microwin

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

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

 {
 {

+    // 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;
     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 ( !wxTheApp->DoMessage() )
+#if wxUSE_THREADS
+        wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS
+
+        if ( !wxTheApp->Dispatch() )

             break;
     }
 
             break;
     }
 

-    return TRUE;
-}
+    // if there are pending events, we must process them.
+    ProcessPendingEvents();

 
 

-HINSTANCE wxGetInstance()
-{
-    return wxhInstance;
+#if wxUSE_LOG
+    // let the logs be flashed again
+    wxLog::Resume();
+#endif // wxUSE_LOG
+
+    s_inYield = false;
+
+    return true;

 }
 
 }
 

-void wxSetInstance(HINSTANCE hInst)
+#if wxUSE_EXCEPTIONS
+
+// ----------------------------------------------------------------------------
+// exception handling
+// ----------------------------------------------------------------------------
+
+bool wxApp::OnExceptionInMainLoop()

 {
 {

-    wxhInstance = hInst;
+    // ask the user about what to do: use the Win32 API function here as it
+    // could be dangerous to use any wxWidgets code in this state
+    switch (
+            ::MessageBox
+              (
+                NULL,
+                _T("An unhandled exception occurred. Press \"Abort\" to \
+terminate the program,\r\n\
+\"Retry\" to exit the program normally and \"Ignore\" to try to continue."),
+                _T("Unhandled exception"),
+                MB_ABORTRETRYIGNORE |
+                MB_ICONERROR|
+                MB_TASKMODAL
+              )
+           )
+    {
+        case IDABORT:
+            throw;
+
+        default:
+            wxFAIL_MSG( _T("unexpected MessageBox() return code") );
+            // fall through
+
+        case IDRETRY:
+            return false;
+
+        case IDIGNORE:
+            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(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__))
-#include "main.cpp"
-#endif
+#endif // wxUSE_EXCEPTIONS