Added support for delayed deactivation of windows (for MDI)

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 7e26d1504f424f726f03109db06b6977e5d91f01..d5a953bbcbbf20e9a53d3ff0592599084171af98 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

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

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


@@ -65,17 +65,13 @@
     WX_DEFINE_OBJARRAY(wxMsgArray);
 #endif // wxUSE_THREADS
 
     WX_DEFINE_OBJARRAY(wxMsgArray);
 #endif // wxUSE_THREADS
 

-#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..., but some
 // compilers don't support it (missing headers, libs, ...)
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 
 // OLE is used for drag-and-drop, clipboard, OLE Automation..., but some
 // compilers don't support it (missing headers, libs, ...)

-#if defined(__GNUWIN32_OLD__) || defined(__SC__) || defined(__SALFORDC__)
+#if defined(__GNUWIN32_OLD__) || defined(__SYMANTEC__) || defined(__SALFORDC__)

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


@@ -88,7 +84,7 @@
 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 

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

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


@@ -155,7 +151,11 @@ HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL;
 
 HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
 
 
 HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
 

+#ifdef __DIGITALMARS__
+extern "C" LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
+#else

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

+#endif

 
 // FIXME wxUSE_ON_FATAL_EXCEPTION is only supported for VC++ now because it
 //       needs compiler support for Win32 SEH. Others (especially Borland)
 
 // FIXME wxUSE_ON_FATAL_EXCEPTION is only supported for VC++ now because it
 //       needs compiler support for Win32 SEH. Others (especially Borland)


@@ -191,7 +191,7 @@ 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 w/o MSLU emulation layer - if so, abort right now 
+    // 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 )
     // as it has no chance to work
 #if wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
     if ( wxGetOsVersion() != wxWINDOWS_NT )


@@ -225,10 +225,6 @@ bool wxApp::Initialize()
     wxInitializeStockLists();
     wxInitializeStockObjects();
 
     wxInitializeStockLists();
     wxInitializeStockObjects();
 

-#if wxUSE_WX_RESOURCES
-    wxInitializeResourceSystem();
-#endif
-

     wxBitmap::InitStandardHandlers();
 
 #if defined(__WIN95__) && !defined(__WXMICROWIN__)
     wxBitmap::InitStandardHandlers();
 
 #if defined(__WIN95__) && !defined(__WXMICROWIN__)


@@ -511,12 +507,6 @@ void wxApp::CleanUp()
 
     wxModule::CleanUpModules();
 
 
     wxModule::CleanUpModules();
 

-#if wxUSE_WX_RESOURCES
-    wxCleanUpResourceSystem();
-
-    //  wxDefaultResourceTable->ClearTable();
-#endif
-

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


@@ -574,13 +564,14 @@ void wxApp::CleanUp()
 #endif
 
     delete wxWinHandleHash;
 #endif
 
     delete wxWinHandleHash;

+    wxWinHandleHash = NULL; // Set to null in case anything later tries to ref it.

 
 

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

+    wxPendingEvents = NULL; // Set to null because wxAppBase::wxEvtHandler is destroyed later.

 
 #if wxUSE_THREADS
     delete wxPendingEventsLocker;
 
 #if wxUSE_THREADS
     delete wxPendingEventsLocker;

+    wxPendingEventsLocker = NULL; // Set to null because wxAppBase::wxEvtHandler is destroyed later.

     // If we don't do the following, we get an apparent memory leak
 #if wxUSE_VALIDATORS
     ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
     // If we don't do the following, we get an apparent memory leak
 #if wxUSE_VALIDATORS
     ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();


@@ -1140,33 +1131,31 @@ bool wxApp::SendIdleEvents()
 // Send idle event to window and all subwindows
 bool wxApp::SendIdleEvents(wxWindow* win)
 {
 // Send idle event to window and all subwindows
 bool wxApp::SendIdleEvents(wxWindow* win)
 {

-    bool needMore = FALSE;
-

     wxIdleEvent event;
     event.SetEventObject(win);
     win->GetEventHandler()->ProcessEvent(event);
 
     wxIdleEvent event;
     event.SetEventObject(win);
     win->GetEventHandler()->ProcessEvent(event);
 

-    if (event.MoreRequested())
-        needMore = TRUE;
+    bool needMore = event.MoreRequested();

 
 

-    wxNode* node = win->GetChildren().First();
-    while (node)
+    wxWindowList::Node *node = win->GetChildren().GetFirst();
+    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;
 }
 
 void wxApp::DeletePendingObjects()
 {
     return needMore;
 }
 
 void wxApp::DeletePendingObjects()
 {

-    wxNode *node = wxPendingDelete.First();
+    wxNode *node = wxPendingDelete.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxObject *obj = (wxObject *)node->Data();
+        wxObject *obj = node->GetData();

 
         delete obj;
 
 
         delete obj;
 


@@ -1175,7 +1164,7 @@ void wxApp::DeletePendingObjects()
 
         // Deleting one object may have deleted other pending
         // objects, so start from beginning of list again.
 
         // Deleting one object may have deleted other pending
         // objects, so start from beginning of list again.

-        node = wxPendingDelete.First();
+        node = wxPendingDelete.GetFirst();

     }
 }
 
     }
 }
 


@@ -1196,6 +1185,17 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
     }
 }
 
     }
 }
 

+typedef struct _WXADllVersionInfo
+{
+        DWORD cbSize;
+        DWORD dwMajorVersion;                   // Major version
+        DWORD dwMinorVersion;                   // Minor version
+        DWORD dwBuildNumber;                    // Build number
+        DWORD dwPlatformID;                     // DLLVER_PLATFORM_*
+} WXADLLVERSIONINFO;
+
+typedef HRESULT (CALLBACK* WXADLLGETVERSIONPROC)(WXADLLVERSIONINFO *);
+

 /* static */
 int wxApp::GetComCtl32Version()
 {
 /* static */
 int wxApp::GetComCtl32Version()
 {


@@ -1215,17 +1215,25 @@ int wxApp::GetComCtl32Version()
 
         // do we have it?
         HMODULE hModuleComCtl32 = ::GetModuleHandle(wxT("COMCTL32"));
 
         // do we have it?
         HMODULE hModuleComCtl32 = ::GetModuleHandle(wxT("COMCTL32"));

+        BOOL bFreeComCtl32 = FALSE ;
+        if(!hModuleComCtl32)
+        {
+            hModuleComCtl32 = ::LoadLibrary(wxT("COMCTL32.DLL")) ;
+            if(hModuleComCtl32)
+            {
+                bFreeComCtl32 = TRUE ;
+            }
+        }

 
         // if so, then we can check for the version
         if ( hModuleComCtl32 )
         {
             // try to use DllGetVersion() if available in _headers_
 
         // if so, then we can check for the version
         if ( hModuleComCtl32 )
         {
             // try to use DllGetVersion() if available in _headers_

-            #ifdef DLLVER_PLATFORM_WINDOWS // defined in shlwapi.h
-                DLLGETVERSIONPROC pfnDllGetVersion = (DLLGETVERSIONPROC)
+                WXADLLGETVERSIONPROC pfnDllGetVersion = (WXADLLGETVERSIONPROC)

                     ::GetProcAddress(hModuleComCtl32, "DllGetVersion");
                 if ( pfnDllGetVersion )
                 {
                     ::GetProcAddress(hModuleComCtl32, "DllGetVersion");
                 if ( pfnDllGetVersion )
                 {

-                    DLLVERSIONINFO dvi;
+                    WXADLLVERSIONINFO dvi;

                     dvi.cbSize = sizeof(dvi);
 
                     HRESULT hr = (*pfnDllGetVersion)(&dvi);
                     dvi.cbSize = sizeof(dvi);
 
                     HRESULT hr = (*pfnDllGetVersion)(&dvi);


@@ -1242,7 +1250,6 @@ int wxApp::GetComCtl32Version()
                                             dvi.dwMinorVersion;
                     }
                 }
                                             dvi.dwMinorVersion;
                     }
                 }

-            #endif

                 // DllGetVersion() unavailable either during compile or
                 // run-time, try to guess the version otherwise
                 if ( !s_verComCtl32 )
                 // DllGetVersion() unavailable either during compile or
                 // run-time, try to guess the version otherwise
                 if ( !s_verComCtl32 )


@@ -1281,6 +1288,11 @@ int wxApp::GetComCtl32Version()
                     }
                 }
         }
                     }
                 }
         }

+
+        if(bFreeComCtl32)
+        {
+            ::FreeLibrary(hModuleComCtl32) ;
+        }

     }
 
     return s_verComCtl32;
     }
 
     return s_verComCtl32;


@@ -1289,10 +1301,15 @@ int wxApp::GetComCtl32Version()
 
 void wxExit()
 {
 
 void wxExit()
 {

-    wxLogError(_("Fatal error: exiting"));
-
-    wxApp::CleanUp();
-    exit(0);
+    if ( wxTheApp )
+    {
+        wxTheApp->ExitMainLoop();
+    }
+    else
+    {
+        // what else can we do?
+        exit(-1);
+    }

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


@@ -1387,6 +1404,6 @@ void wxWakeUpIdle()
 
 // For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
 // if in a separate file. So include it here to ensure it's linked.
 
 // For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
 // if in a separate file. So include it here to ensure it's linked.

-#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__WINE__) && !defined(__TWIN32__) && !defined(WXMAKINGDLL))
+#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__WINE__) && !defined(WXMAKINGDLL))

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