Updated documentation according to recent array changes.

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 399e734e84ed96bc1b1a7b982d2fd430af7ee2a9..598355cff1ec36a84c51dad5eaa8be0fedd6e2ec 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -45,9 +45,11 @@
     #include "wx/dynarray.h"
     #include "wx/wxchar.h"
     #include "wx/icon.h"
     #include "wx/dynarray.h"
     #include "wx/wxchar.h"
     #include "wx/icon.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"
+#include "wx/cmdline.h"
+#include "wx/filename.h"

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


@@ -86,11 +88,13 @@
 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 

-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || 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
 
 // ----------------------------------------------------------------------------
 // conditional compilation


@@ -113,7 +117,7 @@
     #define _WIN32_IE 0x0200
 #endif
 
     #define _WIN32_IE 0x0200
 #endif
 

-#if _WIN32_IE >= 0x0300
+#if _WIN32_IE >= 0x0300 && !defined(__MINGW32__)

     #include <shlwapi.h>
 #endif
 
     #include <shlwapi.h>
 #endif
 


@@ -122,25 +126,22 @@
 // ---------------------------------------------------------------------------
 
 extern wxChar *wxBuffer;
 // ---------------------------------------------------------------------------
 
 extern wxChar *wxBuffer;

-extern wxList *wxWinHandleList;

 extern wxList WXDLLEXPORT wxPendingDelete;
 extern wxList WXDLLEXPORT wxPendingDelete;

+#ifndef __WXMICROWIN__

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

+#endif

 
 MSG s_currentMsg;
 wxApp *wxTheApp = NULL;
 
 // NB: all "NoRedraw" classes must have the same names as the "normal" classes
 //     with NR suffix - wxWindow::MSWCreate() supposes this
 
 MSG s_currentMsg;
 wxApp *wxTheApp = NULL;
 
 // 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 *wxCanvasClassName        = wxT("wxWindowClass");
+const wxChar *wxCanvasClassNameNR      = wxT("wxWindowClassNR");

 const wxChar *wxMDIFrameClassName      = wxT("wxMDIFrameClass");
 const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR");
 const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass");
 const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR");
 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;


@@ -188,9 +189,9 @@ END_EVENT_TABLE()
 bool wxApp::Initialize()
 {
     // the first thing to do is to check if we're trying to run an Unicode
 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
+    // program under Win9x w/o MSLU emulation layer - if so, abort right now 
+    // as it has no chance to work
+#if wxUSE_UNICODE && !wxUSE_UNICODE_MSLU

     if ( wxGetOsVersion() != wxWINDOWS_NT )
     {
         // note that we can use MessageBoxW() as it's implemented even under
     if ( wxGetOsVersion() != wxWINDOWS_NT )
     {
         // note that we can use MessageBoxW() as it's implemented even under


@@ -199,20 +200,14 @@ bool wxApp::Initialize()
         ::MessageBox
         (
          NULL,
         ::MessageBox
         (
          NULL,

-         _T("This program uses Unicode and requires Windows NT/2000.\nProgram aborted."),
+         _T("This program uses Unicode and requires Windows NT/2000/XP.\nProgram aborted."),

          _T("wxWindows Fatal Error"),
          MB_ICONERROR | MB_OK
         );
 
         return FALSE;
     }
          _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
+#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU

 
     wxBuffer = new wxChar[1500]; // FIXME
 
 
     wxBuffer = new wxChar[1500]; // FIXME
 


@@ -234,12 +229,11 @@ bool wxApp::Initialize()
 
     wxBitmap::InitStandardHandlers();
 
 
     wxBitmap::InitStandardHandlers();
 

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

     InitCommonControls();
     InitCommonControls();

-

 #endif // __WIN95__
 
 #endif // __WIN95__
 

-#if wxUSE_OLE
+#if wxUSE_OLE || wxUSE_DRAG_AND_DROP

 
 #ifdef __WIN16__
     // for OLE, enlarge message queue to be as large as possible
 
 #ifdef __WIN16__
     // for OLE, enlarge message queue to be as large as possible


@@ -247,9 +241,13 @@ bool wxApp::Initialize()
     while (!SetMessageQueue(iMsg) && (iMsg -= 8))
         ;
 #endif // Win16
     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
 #endif // wxUSE_OLE
 
 #if wxUSE_CTL3D


@@ -257,7 +255,7 @@ bool wxApp::Initialize()
         wxLogError(wxT("Cannot register CTL3D"));
 
     Ctl3dAutoSubclass(wxhInstance);
         wxLogError(wxT("Cannot register CTL3D"));
 
     Ctl3dAutoSubclass(wxhInstance);

-#endif
+#endif // wxUSE_CTL3D

 
     // VZ: these icons are not in wx.rc anyhow (but should they?)!
 #if 0
 
     // VZ: these icons are not in wx.rc anyhow (but should they?)!
 #if 0


@@ -272,10 +270,12 @@ bool wxApp::Initialize()
 
     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.lbColor = 0;

     lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") );
     if ( lb.lbHatch )
     {
     lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") );
     if ( lb.lbHatch )
     {


@@ -283,12 +283,13 @@ bool wxApp::Initialize()
         ::DeleteObject( (HGDIOBJ)lb.lbHatch );
     }
     //else: wxWindows resources are probably not linked in
         ::DeleteObject( (HGDIOBJ)lb.lbHatch );
     }
     //else: wxWindows resources are probably not linked in

+#endif

 
 #if wxUSE_PENWINDOWS
     wxRegisterPenWin();
 #endif
 
 
 #if wxUSE_PENWINDOWS
     wxRegisterPenWin();
 #endif
 

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

 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.
     // PLEASE DO NOT ALTER THIS.
 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.
     // PLEASE DO NOT ALTER THIS.


@@ -297,7 +298,9 @@ bool wxApp::Initialize()
     if (wxDummyChar) wxDummyChar++;
 #endif
 
     if (wxDummyChar) wxDummyChar++;
 #endif
 

+#ifndef __WXMICROWIN__

     wxSetKeyboardHook(TRUE);
     wxSetKeyboardHook(TRUE);

+#endif

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


@@ -315,6 +318,7 @@ bool wxApp::Initialize()
 bool wxApp::RegisterWindowClasses()
 {
     WNDCLASS wndclass;
 bool wxApp::RegisterWindowClasses()
 {
     WNDCLASS wndclass;

+    wxZeroMemory(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
 
     // 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


@@ -323,16 +327,12 @@ bool wxApp::RegisterWindowClasses()
 
     // the fields which are common to all classes
     wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;
 
     // the fields which are common to all classes
     wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;

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

     wndclass.hInstance     = wxhInstance;
     wndclass.hInstance     = wxhInstance;

-    wndclass.hIcon         = (HICON) NULL;

     wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
     wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);

-    wndclass.lpszMenuName  = NULL;

 
     // Register the frame window class.
     wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);
 
     // Register the frame window class.
     wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);

-    wndclass.lpszClassName = wxFrameClassName;
+    wndclass.lpszClassName = wxCanvasClassName;

     wndclass.style         = styleNormal;
 
     if ( !RegisterClass(&wndclass) )
     wndclass.style         = styleNormal;
 
     if ( !RegisterClass(&wndclass) )


@@ -343,7 +343,7 @@ bool wxApp::RegisterWindowClasses()
     }
 
     // "no redraw" frame
     }
 
     // "no redraw" frame

-    wndclass.lpszClassName = wxFrameClassNameNoRedraw;
+    wndclass.lpszClassName = wxCanvasClassNameNR;

     wndclass.style         = styleNoRedraw;
 
     if ( !RegisterClass(&wndclass) )
     wndclass.style         = styleNoRedraw;
 
     if ( !RegisterClass(&wndclass) )


@@ -399,123 +399,102 @@ bool wxApp::RegisterWindowClasses()
         return FALSE;
     }
 
         return FALSE;
     }
 

-    // Register the panel window class.
-    wndclass.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
-    wndclass.lpszClassName = wxPanelClassName;
-    wndclass.style         = styleNormal;
+    return TRUE;
+}

 
 

-    if ( !RegisterClass(&wndclass) )
+// ---------------------------------------------------------------------------
+// UnregisterWindowClasses
+// ---------------------------------------------------------------------------
+
+bool wxApp::UnregisterWindowClasses()
+{
+    bool retval = TRUE;
+
+#ifndef __WXMICROWIN__
+    // MDI frame window class.
+    if ( !::UnregisterClass(wxMDIFrameClassName, wxhInstance) )

     {
     {

-        wxLogLastError(wxT("RegisterClass(panel)"));
+        wxLogLastError(wxT("UnregisterClass(MDI parent)"));

 
 

-        return FALSE;
+        retval = FALSE;

     }
 
     }
 

-    // Register the no redraw panel window class.
-    wndclass.lpszClassName = wxPanelClassNameNR;
-    wndclass.style         = styleNoRedraw;
+    // "no redraw" MDI frame
+    if ( !::UnregisterClass(wxMDIFrameClassNameNoRedraw, wxhInstance) )
+    {
+        wxLogLastError(wxT("UnregisterClass(no redraw MDI parent frame)"));

 
 

-    if ( !RegisterClass(&wndclass) )
+        retval = FALSE;
+    }
+
+    // MDI child frame window class.
+    if ( !::UnregisterClass(wxMDIChildFrameClassName, wxhInstance) )

     {
     {

-        wxLogLastError(wxT("RegisterClass(no redraw panel)"));
+        wxLogLastError(wxT("UnregisterClass(MDI child)"));

 
 

-        return FALSE;
+        retval = FALSE;

     }
 
     }
 

-    // Register the canvas and textsubwindow class name
-    wndclass.hbrBackground = (HBRUSH)NULL;
-    wndclass.lpszClassName = wxCanvasClassName;
+    // "no redraw" MDI child frame
+    if ( !::UnregisterClass(wxMDIChildFrameClassNameNoRedraw, wxhInstance) )
+    {
+        wxLogLastError(wxT("UnregisterClass(no redraw MDI child)"));

 
 

-    if ( !RegisterClass(&wndclass) )
+        retval = FALSE;
+    }
+
+    // canvas class name
+    if ( !::UnregisterClass(wxCanvasClassName, wxhInstance) )

     {
     {

-        wxLogLastError(wxT("RegisterClass(canvas)"));
+        wxLogLastError(wxT("UnregisterClass(canvas)"));

 
 

-        return FALSE;
+        retval = FALSE;

     }
 
     }
 

-    wndclass.lpszClassName = wxCanvasClassNameNR;
-    wndclass.style         = styleNoRedraw;
-    if ( !RegisterClass(&wndclass) )
+    if ( !::UnregisterClass(wxCanvasClassNameNR, wxhInstance) )

     {
     {

-        wxLogLastError(wxT("RegisterClass(no redraw canvas)"));
+        wxLogLastError(wxT("UnregisterClass(no redraw canvas)"));

 
 

-        return FALSE;
+        retval = FALSE;

     }
     }

+#endif // __WXMICROWIN__

 
 

-    return TRUE;
+    return retval;

 }
 
 // ---------------------------------------------------------------------------
 // Convert Windows to argc, argv style
 // ---------------------------------------------------------------------------
 
 }
 
 // ---------------------------------------------------------------------------
 // Convert Windows to argc, argv style
 // ---------------------------------------------------------------------------
 

-void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
+void wxApp::ConvertToStandardCommandArgs(const char* lpCmdLine)

 {
 {

-    wxStringList args;
-
-    wxString cmdLine(lpCmdLine);
-    int count = 0;
-
-    // Get application name
-    wxChar name[260]; // 260 is MAX_PATH value from windef.h
-    ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
-
-    args.Add(name);
-    count++;
-
-    wxStrcpy(name, wxFileNameFromPath(name));
-    wxStripExtension(name);
-    wxTheApp->SetAppName(name);
-
-    // 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) && wxIsspace(cmdLine.GetChar(i)))
-            i ++;
+    // break the command line in words
+    wxArrayString args =
+        wxCmdLineParser::ConvertStringToArgs(wxConvertMB2WX(lpCmdLine));

 
 

-        if (i < len)
-        {
-            if (cmdLine.GetChar(i) == wxT('"')) // We found the start of a string
-            {
-                i ++;
-                int first = i;
-                while ((i < len) && (cmdLine.GetChar(i) != wxT('"')))
-                    i ++;
+    // +1 here for the program name
+    argc = args.GetCount() + 1;

 
 

-                wxString arg(cmdLine.Mid(first, (i - first)));
+    // and +1 here for the terminating NULL
+    argv = new wxChar *[argc + 1];

 
 

-                args.Add(arg);
-                count ++;
+    argv[0] = new wxChar[260]; // 260 is MAX_PATH value from windef.h
+    ::GetModuleFileName(wxhInstance, argv[0], 260);

 
 

-                if (i < len)
-                    i ++; // Skip past 2nd quote
-            }
-            else // Unquoted argument
-            {
-                int first = i;
-                while ((i < len) && !wxIsspace(cmdLine.GetChar(i)))
-                    i ++;
+    // also set the app name from argv[0]
+    wxString name;
+    wxFileName::SplitPath(argv[0], NULL, &name, NULL);

 
 

-                wxString arg(cmdLine.Mid(first, (i - first)));
-
-                args.Add(arg);
-                count ++;
-            }
-        }
-    }
+    SetAppName(name);

 
 

-    wxTheApp->argv = new wxChar*[count + 1];
-    for (i = 0; i < count; i++)
+    // copy all the other arguments to wxApp::argv[]
+    for ( int i = 1; i < argc; i++ )

     {
     {

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

     }
     }

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

 }
 
 //// Cleans up any wxWindows internal structures left lying around
 }
 
 //// Cleans up any wxWindows internal structures left lying around


@@ -561,7 +540,9 @@ void wxApp::CleanUp()
 
     //// WINDOWS-SPECIFIC CLEANUP
 
 
     //// WINDOWS-SPECIFIC CLEANUP
 

+#ifndef __WXMICROWIN__

     wxSetKeyboardHook(FALSE);
     wxSetKeyboardHook(FALSE);

+#endif

 
 #if wxUSE_PENWINDOWS
     wxCleanUpPenWin();
 
 #if wxUSE_PENWINDOWS
     wxCleanUpPenWin();


@@ -588,21 +569,31 @@ void wxApp::CleanUp()
     ::OleUninitialize();
 #endif
 
     ::OleUninitialize();
 #endif
 

+#ifdef WXMAKINGDLL
+    // 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();
+#endif // WXMAKINGDLL
+

 #if wxUSE_CTL3D
     Ctl3dUnregister(wxhInstance);
 #endif
 
 #if wxUSE_CTL3D
     Ctl3dUnregister(wxhInstance);
 #endif
 

-    if (wxWinHandleList)
-        delete wxWinHandleList;
+    delete wxWinHandleHash;

 
     // 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.
     delete wxPendingEvents;
 
     // 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.
     delete wxPendingEvents;

+

 #if wxUSE_THREADS
     delete wxPendingEventsLocker;
 #if wxUSE_THREADS
     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();
 


@@ -640,8 +631,7 @@ int WXDLLEXPORT wxEntryStart( int WXUNUSED(argc), char** WXUNUSED(argv) )
 
 int WXDLLEXPORT wxEntryInitGui()
 {
 
 int WXDLLEXPORT wxEntryInitGui()
 {

-    wxTheApp->OnInitGui();
-    return 0;
+    return wxTheApp->OnInitGui();

 }
 
 void WXDLLEXPORT wxEntryCleanup()
 }
 
 void WXDLLEXPORT wxEntryCleanup()


@@ -670,7 +660,10 @@ 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
+

 #ifdef __MWERKS__
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     // This seems to be necessary since there are 'rogue'
 #ifdef __MWERKS__
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     // This seems to be necessary since there are 'rogue'


@@ -702,19 +695,16 @@ int wxEntry(WXHINSTANCE hInstance,
             wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
                          wxT("No initializer - use IMPLEMENT_APP macro.") );
 
             wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
                          wxT("No initializer - use IMPLEMENT_APP macro.") );
 

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

         }
 
         wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
 
         // save the WinMain() parameters
         }
 
         wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
 
         // save the WinMain() parameters

-        wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);
+        if (lpCmdLine) // MicroWindows passes NULL
+            wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);

         wxTheApp->m_nCmdShow = nCmdShow;
 
         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.
-        wxEntryInitGui();
-

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


@@ -734,7 +724,7 @@ int wxEntry(WXHINSTANCE hInstance,
         wxTheApp->SetExitOnFrameDelete(FALSE);
 
         // init the app
         wxTheApp->SetExitOnFrameDelete(FALSE);
 
         // init the app

-        retValue = wxTheApp->OnInit() ? 0 : -1;
+        retValue = wxEntryInitGui() && wxTheApp->OnInit() ? 0 : -1;

 
         // restore the old flag value
         wxTheApp->SetExitOnFrameDelete(exitOnLastFrameDelete);
 
         // restore the old flag value
         wxTheApp->SetExitOnFrameDelete(exitOnLastFrameDelete);


@@ -846,14 +836,9 @@ wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NUL
 
 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;
 }
 


@@ -955,16 +940,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.


@@ -1034,13 +1024,29 @@ 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 = wxGetWindowFromHWND((WXHWND)hWnd);
+    HWND hwnd = msg->hwnd;
+    wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
+
+    // this may happen if the event occured in a standard modeless dialog (the
+    // only example of which I know of is the find/replace dialog) - then call
+    // IsDialogMessage() to make TAB navigation in it work
+    if ( !wndThis )
+    {
+        // we need to find the dialog containing this control as
+        // IsDialogMessage() just eats all the messages (i.e. returns TRUE for
+        // them) if we call it for the control itself
+        while ( hwnd && ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD )
+        {
+            hwnd = ::GetParent(hwnd);
+        }
+
+        return hwnd && ::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 wxUSE_TOOLTIPS
     // we must relay WM_MOUSEMOVE events to the tooltip ctrl if we want it to
     // popup the tooltip bubbles

-    if ( wndThis && (msg->message == WM_MOUSEMOVE) )
+    if ( (msg->message == WM_MOUSEMOVE) )

     {
         wxToolTip *tt = wndThis->GetToolTip();
         if ( tt )
     {
         wxToolTip *tt = wndThis->GetToolTip();
         if ( tt )


@@ -1050,23 +1056,39 @@ bool wxApp::ProcessMessage(WXMSG *wxmsg)
     }
 #endif // wxUSE_TOOLTIPS
 
     }
 #endif // wxUSE_TOOLTIPS
 

-    // Try translations first; find the youngest window with
-    // a translation table.
+    // 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;
 
     for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
     {
     wxWindow *wnd;
 
     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;
 }
 


@@ -1097,6 +1119,14 @@ void wxApp::OnIdle(wxIdleEvent& event)
     wxLog::FlushActive();
 #endif // wxUSE_LOG
 
     wxLog::FlushActive();
 #endif // wxUSE_LOG
 

+#if wxUSE_DC_CACHEING
+    // automated DC cache management: clear the cached DCs and bitmap
+    // if it's likely that the app has finished with them, that is, we
+    // get an idle event and we're not dragging anything.
+    if (!::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() )
     {


@@ -1187,6 +1217,9 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
 /* static */
 int wxApp::GetComCtl32Version()
 {
 /* static */
 int wxApp::GetComCtl32Version()
 {

+#ifdef __WXMICROWIN__
+    return 0;
+#else

     // cache the result
     static int s_verComCtl32 = -1;
 
     // cache the result
     static int s_verComCtl32 = -1;
 


@@ -1269,6 +1302,7 @@ int wxApp::GetComCtl32Version()
     }
 
     return s_verComCtl32;
     }
 
     return s_verComCtl32;

+#endif

 }
 
 void wxExit()
 }
 
 void wxExit()


@@ -1280,12 +1314,28 @@ void wxExit()
 }
 
 // Yield to incoming messages
 }
 
 // Yield to incoming messages

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

 {
 {

+    // MT-FIXME
+    static bool s_inYield = FALSE;
+

     // disable log flushing from here because a call to wxYield() shouldn't
     // normally result in message boxes popping up &c
     wxLog::Suspend();
 
     // disable log flushing from here because a call to wxYield() shouldn't
     // normally result in message boxes popping up &c
     wxLog::Suspend();
 

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


@@ -1300,13 +1350,14 @@ bool wxYield()
             break;
     }
 
             break;
     }
 

-    // If they are pending events, we must process them.
-    if (wxTheApp)
-        wxTheApp->ProcessPendingEvents();
+    // if there are pending events, we must process them.
+    ProcessPendingEvents();

 
     // let the logs be flashed again
     wxLog::Resume();
 
 
     // let the logs be flashed again
     wxLog::Resume();
 

+    s_inYield = FALSE;
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -1318,8 +1369,9 @@ bool wxHandleFatalExceptions(bool doit)
 
     return TRUE;
 #else
 
     return TRUE;
 #else

-    wxFAIL_MSG(_T("set wxUSE_ON_FATAL_EXCEPTION to 1 to sue this function"));
+    wxFAIL_MSG(_T("set wxUSE_ON_FATAL_EXCEPTION to 1 to use this function"));

 
 

+    (void)doit;

     return FALSE;
 #endif
 }
     return FALSE;
 #endif
 }


@@ -1347,29 +1399,6 @@ void wxWakeUpIdle()
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 

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