MDI child maximize bug fixed

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 3ea5ea736221beac3710821946a0fb7ac9afe801..13b18068061c866d5e725fbf0948df7501e258f9 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -43,12 +43,14 @@
     #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"

 #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"
 


@@ -88,23 +90,27 @@
 // global variables
 // ---------------------------------------------------------------------------
 
 // global variables
 // ---------------------------------------------------------------------------
 

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

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

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

 extern void wxSetKeyboardHook(bool doIt);
 extern wxCursor *g_globalCursor;
 
 HINSTANCE wxhInstance = 0;
 extern void wxSetKeyboardHook(bool doIt);
 extern wxCursor *g_globalCursor;
 
 HINSTANCE wxhInstance = 0;

-static MSG s_currentMsg;
+MSG s_currentMsg;

 wxApp *wxTheApp = NULL;
 
 // FIXME why not const? and not static?
 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";
+wxChar wxFrameClassName[]         = _T("wxFrameClass");
+wxChar wxMDIFrameClassName[]      = _T("wxMDIFrameClass");
+wxChar wxMDIChildFrameClassName[] = _T("wxMDIChildFrameClass");
+wxChar wxPanelClassName[]         = _T("wxPanelClass");
+wxChar wxCanvasClassName[]        = _T("wxCanvasClass");

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


@@ -146,8 +152,6 @@ LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
     END_EVENT_TABLE()
 #endif
 
     END_EVENT_TABLE()
 #endif
 

-long wxApp::sm_lastMessageTime = 0;
-

 //// Initialize
 bool wxApp::Initialize()
 {
 //// Initialize
 bool wxApp::Initialize()
 {


@@ -157,12 +161,19 @@ bool wxApp::Initialize()
     //    wxRedirectIOToConsole();
 #endif
 
     //    wxRedirectIOToConsole();
 #endif
 

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

 
     wxClassInfo::InitializeClasses();
 
 #if wxUSE_RESOURCES
 
     wxClassInfo::InitializeClasses();
 
 #if wxUSE_RESOURCES

-    wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
+    wxGetResource(_T("wxWindows"), _T("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
+    wxPendingEvents = new wxList();
+    wxPendingEventsLocker = new wxCriticalSection();

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


@@ -181,7 +192,7 @@ bool wxApp::Initialize()
     InitCommonControls();
 
 #if wxUSE_RICHEDIT
     InitCommonControls();
 
 #if wxUSE_RICHEDIT

-    gs_hRichEdit = LoadLibrary("RICHED32.DLL");
+    gs_hRichEdit = LoadLibrary(_T("RICHED32.DLL"));

 
     if (gs_hRichEdit == (HINSTANCE) NULL)
     {
 
     if (gs_hRichEdit == (HINSTANCE) NULL)
     {


@@ -195,18 +206,6 @@ bool wxApp::Initialize()
     int iMsg = 96;
     while (!SetMessageQueue(iMsg) && (iMsg -= 8));
 
     int iMsg = 96;
     while (!SetMessageQueue(iMsg) && (iMsg -= 8));
 

-    /*
-       DWORD dwOleVer;
-       dwOleVer = CoBuildVersion();
-
-    // check the OLE library version
-    if (rmm != HIWORD(dwOleVer))
-    {
-    wxMessageBox("Incorrect version of OLE libraries.");
-    return FALSE;
-    }
-     */
-

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


@@ -215,30 +214,34 @@ bool wxApp::Initialize()
 
 #if wxUSE_CTL3D
     if (!Ctl3dRegister(wxhInstance))
 
 #if wxUSE_CTL3D
     if (!Ctl3dRegister(wxhInstance))

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

 
     Ctl3dAutoSubclass(wxhInstance);
 #endif
 
     g_globalCursor = new wxCursor;
 
 
     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");
+    wxSTD_FRAME_ICON = LoadIcon(wxhInstance, _T("wxSTD_FRAME"));
+    wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, _T("wxSTD_MDIPARENTFRAME"));
+    wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, _T("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, _T("wxDEFAULT_FRAME"));
+    wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, _T("wxDEFAULT_MDIPARENTFRAME"));
+    wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, _T("wxDEFAULT_MDICHILDFRAME"));

 
     RegisterWindowClasses();
 
     // Create the brush for disabling bitmap buttons
 
 
     RegisterWindowClasses();
 
     // Create the brush for disabling bitmap buttons
 

-    LOGBRUSH lb ;
+    LOGBRUSH lb;

     lb.lbStyle = BS_PATTERN;
     lb.lbStyle = BS_PATTERN;

-    lb.lbHatch = (int)LoadBitmap( wxhInstance, "wxDISABLE_BUTTON_BITMAP" ) ;
-    wxDisableButtonBrush = ::CreateBrushIndirect( & lb ) ;
-    ::DeleteObject( (HGDIOBJ)lb.lbHatch ) ;
+    lb.lbHatch = (int)LoadBitmap( wxhInstance, _T("wxDISABLE_BUTTON_BITMAP") );
+    if ( lb.lbHatch )
+    {
+        wxDisableButtonBrush = ::CreateBrushIndirect( & lb );
+        ::DeleteObject( (HGDIOBJ)lb.lbHatch );
+    }
+    //else: wxWindows resources are probably not linked in

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


@@ -261,131 +264,88 @@ bool wxApp::Initialize()
     return TRUE;
 }
 
     return TRUE;
 }
 

-//// RegisterWindowClasses
+// ---------------------------------------------------------------------------
+// RegisterWindowClasses
+// ---------------------------------------------------------------------------

 
 bool wxApp::RegisterWindowClasses()
 {
 
 bool wxApp::RegisterWindowClasses()
 {

-    ///////////////////////////////////////////////////////////////////////
-    // Register the frame window class.
-    WNDCLASS wndclass;   // Structure used to register Windows class.
+    WNDCLASS wndclass;

 
 

-    wndclass.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ;
+    // 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 ); // was 4
+    wndclass.cbWndExtra    = sizeof( DWORD ); // what is this DWORD used for?

     wndclass.hInstance     = wxhInstance;
     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.hIcon         = (HICON) NULL;
+    wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);

     wndclass.lpszMenuName  = NULL;
     wndclass.lpszMenuName  = NULL;

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

 #ifdef _MULTIPLE_INSTANCES
     sprintf( wxFrameClassName,"wxFrameClass%d", wxhInstance );
 #endif
     wndclass.lpszClassName = wxFrameClassName;
 
 #ifdef _MULTIPLE_INSTANCES
     sprintf( wxFrameClassName,"wxFrameClass%d", wxhInstance );
 #endif
     wndclass.lpszClassName = wxFrameClassName;
 

-    if (!RegisterClass( &wndclass ))
+    if ( !RegisterClass(&wndclass) )

     {
     {

-        // wxFatalError("Can't register Frame Window class");
+        wxLogLastError("RegisterClass(frame)");
+
+        return FALSE;

     }
 
     }
 

-    ///////////////////////////////////////////////////////////////////////

     // Register the MDI frame window class.
     // 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 ))
+    wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves
+    wndclass.lpszClassName = wxMDIFrameClassName;
+
+    if ( !RegisterClass(&wndclass) )

     {
     {

-        //    wxFatalError("Can't register MDI Frame window class");
-        //  return FALSE;
+        wxLogLastError("RegisterClass(MDI parent)");
+
+        return FALSE;

     }
 
     }
 

-    ///////////////////////////////////////////////////////////////////////

     // Register the MDI child frame window class.
     // 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 ))
+    wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+    wndclass.lpszClassName = wxMDIChildFrameClassName;
+
+    if ( !RegisterClass(&wndclass) )

     {
     {

-        //   wxFatalError("Can't register MDI child frame window class");
-        //   return FALSE;
+        wxLogLastError("RegisterClass(MDI child)");
+
+        return FALSE;

     }
 
     }
 

-    ///////////////////////////////////////////////////////////////////////

     // Register the panel window class.
     // 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 ))
+    wndclass.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
+    wndclass.lpszClassName = wxPanelClassName;
+
+    if ( !RegisterClass(&wndclass) )

     {
     {

-        //   wxFatalError("Can't register Panel Window class");
-        //   return FALSE;
+        wxLogLastError("RegisterClass(panel)");
+
+        return FALSE;

     }
 
     }
 

-    ///////////////////////////////////////////////////////////////////////

     // Register the canvas and textsubwindow class name
     // 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))
+    wndclass.hbrBackground = (HBRUSH)NULL;
+    wndclass.lpszClassName = wxCanvasClassName;
+
+    if ( !RegisterClass(&wndclass) )

     {
     {

-        //   wxFatalError("Can't register Canvas class");
-        //   return FALSE;
+        wxLogLastError("RegisterClass(canvas)");
+
+        return FALSE;

     }
 
     return TRUE;
 }
 
     }
 
     return TRUE;
 }
 

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

 
 void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
 {
 
 void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
 {


@@ -395,13 +355,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);
 


@@ -412,16 +372,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) == _T('"')) // 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) != _T('"')))

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


@@ -435,7 +395,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)));


@@ -446,11 +406,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;


@@ -462,6 +422,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


@@ -470,6 +431,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();


@@ -489,7 +451,7 @@ void wxApp::CleanUp()
     delete g_globalCursor;
     g_globalCursor = NULL;
 
     delete g_globalCursor;
     g_globalCursor = NULL;
 

-    wxDeleteStockObjects() ;
+    wxDeleteStockObjects();

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


@@ -534,7 +496,7 @@ void wxApp::CleanUp()
         DestroyIcon(wxDEFAULT_MDIPARENTFRAME_ICON);
 
     if ( wxDisableButtonBrush )
         DestroyIcon(wxDEFAULT_MDIPARENTFRAME_ICON);
 
     if ( wxDisableButtonBrush )

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

 
 #if wxUSE_OLE
     ::OleUninitialize();
 
 #if wxUSE_OLE
     ::OleUninitialize();


@@ -545,7 +507,16 @@ void wxApp::CleanUp()
 #endif
 
     if (wxWinHandleList)
 #endif
 
     if (wxWinHandleList)

-        delete wxWinHandleList ;
+        delete wxWinHandleList;
+
+    // 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.
+#if wxUSE_THREADS
+    delete wxPendingEvents;
+    delete wxPendingEventsLocker;
+    // If we don't do the following, we get an apparent memory leak.
+    ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
+#endif

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


@@ -559,15 +530,17 @@ void wxApp::CleanUp()
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {

-        wxLogDebug("There were memory leaks.");
+        wxLogDebug(_T("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

 }
 
 #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
 }
 
 #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))


@@ -614,12 +587,12 @@ 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." );
+                         _T("No initializer - use IMPLEMENT_APP macro.") );

 
             wxTheApp = (*wxApp::GetInitializerFunction()) ();
         }
 
 
             wxTheApp = (*wxApp::GetInitializerFunction()) ();
         }
 

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

 
         // save the WinMain() parameters
         wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);
 
         // save the WinMain() parameters
         wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);


@@ -627,7 +600,7 @@ int wxEntry(WXHINSTANCE hInstance,
 
         // GUI-specific initialisation. In fact on Windows we don't have any,
         // but this call is provided for compatibility across platforms.
 
         // GUI-specific initialisation. In fact on Windows we don't have any,
         // but this call is provided for compatibility across platforms.

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

 
         int retValue = 0;
 
 
         int retValue = 0;
 


@@ -740,16 +713,11 @@ wxApp::wxApp()
 {
     m_topWindow = NULL;
     wxTheApp = this;
 {
     m_topWindow = NULL;
     wxTheApp = this;

-    m_className = "";
-    m_wantDebugOutput = TRUE ;
-    m_appName = "";
+    m_wantDebugOutput = TRUE;
+

     argc = 0;
     argv = NULL;
     argc = 0;
     argv = NULL;

-#ifdef __WXMSW__

     m_printMode = wxPRINT_WINDOWS;
     m_printMode = wxPRINT_WINDOWS;

-#else
-    m_printMode = wxPRINT_POSTSCRIPT;
-#endif

     m_exitOnFrameDelete = TRUE;
     m_auto3D = TRUE;
 }
     m_exitOnFrameDelete = TRUE;
     m_auto3D = TRUE;
 }


@@ -802,7 +770,7 @@ bool wxApp::DoMessage()
     {
 #if wxUSE_THREADS
         wxASSERT_MSG( wxThread::IsMain(),
     {
 #if wxUSE_THREADS
         wxASSERT_MSG( wxThread::IsMain(),

-                      "only the main thread can process Windows messages" );
+                      _T("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;


@@ -856,7 +824,6 @@ bool wxApp::DoMessage()
         if ( !ProcessMessage((WXMSG *)&s_currentMsg) )
         {
             ::TranslateMessage(&s_currentMsg);
         if ( !ProcessMessage((WXMSG *)&s_currentMsg) )
         {
             ::TranslateMessage(&s_currentMsg);

-            wxApp::sm_lastMessageTime = s_currentMsg.time; /* MATTHEW: timeStamp impl. */

             ::DispatchMessage(&s_currentMsg);
         }
     }
             ::DispatchMessage(&s_currentMsg);
         }
     }


@@ -893,6 +860,7 @@ int wxApp::MainLoop()
         {
         }
 
         {
         }
 

+

         DoMessage();
     }
 
         DoMessage();
     }
 


@@ -909,6 +877,25 @@ 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()
 {
     m_keepGoing = FALSE;
 void wxApp::ExitMainLoop()
 {
     m_keepGoing = FALSE;


@@ -916,7 +903,7 @@ void wxApp::ExitMainLoop()
 
 bool wxApp::Pending()
 {
 
 bool wxApp::Pending()
 {

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

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


@@ -936,6 +923,15 @@ bool wxApp::ProcessMessage(WXMSG *wxmsg)
     HWND hWnd = msg->hwnd;
     wxWindow *wndThis = wxFindWinFromHandle((WXHWND)hWnd), *wnd;
 
     HWND hWnd = msg->hwnd;
     wxWindow *wndThis = wxFindWinFromHandle((WXHWND)hWnd), *wnd;
 

+    // for some composite controls (like a combobox), wndThis might be NULL
+    // because the subcontrol is not a wxWindow, but only the control itself
+    // is - try to catch this case
+    while ( hWnd && !wndThis )
+    {
+        hWnd = ::GetParent(hWnd);
+        wndThis = wxFindWinFromHandle((WXHWND)hWnd);        
+    }
+

     // Try translations first; find the youngest window with
     // a translation table.
     for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
     // Try translations first; find the youngest window with
     // a translation table.
     for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )


@@ -967,10 +963,12 @@ void wxApp::OnIdle(wxIdleEvent& event)
     // '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
     wxLog *pLog = wxLog::GetActiveTarget();
     if ( pLog != NULL && pLog->HasPendingMessages() )
         pLog->Flush();
     // flush the logged messages if any
     wxLog *pLog = wxLog::GetActiveTarget();
     if ( pLog != NULL && pLog->HasPendingMessages() )
         pLog->Flush();

+#endif // wxUSE_LOG

 
     // Send OnIdle events to all windows
     if ( SendIdleEvents() )
 
     // Send OnIdle events to all windows
     if ( SendIdleEvents() )


@@ -980,6 +978,10 @@ 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;
 }
 


@@ -987,14 +989,14 @@ void wxApp::OnIdle(wxIdleEvent& event)
 bool wxApp::SendIdleEvents()
 {
     bool needMore = FALSE;
 bool wxApp::SendIdleEvents()
 {
     bool needMore = FALSE;

-    wxNode* node = wxTopLevelWindows.First();
+
+    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxWindow* win = (wxWindow*) node->Data();
+        wxWindow* win = node->GetData();

         if (SendIdleEvents(win))
             needMore = TRUE;
         if (SendIdleEvents(win))
             needMore = TRUE;

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

     }
 
     return needMore;
     }
 
     return needMore;


@@ -1021,7 +1023,7 @@ bool wxApp::SendIdleEvents(wxWindow* win)
 
         node = node->Next();
     }
 
         node = node->Next();
     }

-    return needMore ;
+    return needMore;

 }
 
 void wxApp::DeletePendingObjects()
 }
 
 void wxApp::DeletePendingObjects()


@@ -1068,8 +1070,8 @@ wxWindow* wxApp::GetTopWindow() const
 {
     if (m_topWindow)
         return m_topWindow;
 {
     if (m_topWindow)
         return m_topWindow;

-    else if (wxTopLevelWindows.Number() > 0)
-        return (wxWindow*) wxTopLevelWindows.First()->Data();
+    else if (wxTopLevelWindows.GetCount() > 0)
+        return wxTopLevelWindows.GetFirst()->GetData();

     else
         return NULL;
 }
     else
         return NULL;
 }


@@ -1077,7 +1079,7 @@ wxWindow* wxApp::GetTopWindow() const
 int wxApp::GetComCtl32Version() const
 {
     // have we loaded COMCTL32 yet?
 int wxApp::GetComCtl32Version() const
 {
     // have we loaded COMCTL32 yet?

-    HMODULE theModule = ::GetModuleHandle("COMCTL32");
+    HMODULE theModule = ::GetModuleHandle(_T("COMCTL32"));

     int version = 0;
 
     // if so, then we can check for the version
     int version = 0;
 
     // if so, then we can check for the version


@@ -1130,11 +1132,19 @@ bool wxYield()
     MSG msg;
     // We want to go back to the main message loop
     // if we see a WM_QUIT. (?)
     MSG msg;
     // We want to go back to the main message loop
     // if we see a WM_QUIT. (?)

+#ifdef __WXWINE__
+    while (PeekMessage(&msg, (HWND)NULL, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT)
+#else

     while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT)
     while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT)

+#endif

     {
         if ( !wxTheApp->DoMessage() )
             break;
     }
     {
         if ( !wxTheApp->DoMessage() )
             break;
     }

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

 
     return TRUE;
 }
 
     return TRUE;
 }