1. Pause()/Resume() implemented for wxMSW

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 76458c15a63439c7c5eac1590c041bf1b275d126..22e1baf8dfa6e2e8f43878eafced5c33a8cba404 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -43,6 +43,9 @@
   #include "wx/resource.h"
 #endif
 
   #include "wx/resource.h"
 #endif
 

+#if wxUSE_DRAG_AND_DROP
+#include <ole2.h>
+#endif

 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 


@@ -64,7 +67,17 @@
     #define _DEBUG
   #endif
 
     #define _DEBUG
   #endif
 

+  /* Need to undef new if including crtdbg.h */
+  #ifdef new
+  #undef new
+  #endif
+

   #include <crtdbg.h>
   #include <crtdbg.h>

+
+  #if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS
+  #define new new(__FILE__,__LINE__)
+  #endif
+

 #endif
 
 extern char *wxBuffer;
 #endif
 
 extern char *wxBuffer;


@@ -117,6 +130,12 @@ long wxApp::sm_lastMessageTime = 0;
 
 bool wxApp::Initialize()
 {
 
 bool wxApp::Initialize()
 {

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

     wxBuffer = new char[1500];
 
 #ifdef wxUSE_VC_CRTDBG
     wxBuffer = new char[1500];
 
 #ifdef wxUSE_VC_CRTDBG


@@ -170,10 +189,12 @@ bool wxApp::Initialize()
         return FALSE;
     }
 */
         return FALSE;
     }
 */

-       
+
+#ifndef __GNUWIN32__

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

+#endif

 
 #if CTL3D
     if (!Ctl3dRegister(wxhInstance))
 
 #if CTL3D
     if (!Ctl3dRegister(wxhInstance))


@@ -486,7 +507,9 @@ void wxApp::CleanUp()
   if ( wxDisableButtonBrush )
     ::DeleteObject( wxDisableButtonBrush ) ;
 
   if ( wxDisableButtonBrush )
     ::DeleteObject( wxDisableButtonBrush ) ;
 

+#ifndef __GNUWIN32__

   ::OleUninitialize();
   ::OleUninitialize();

+#endif

 
 #if CTL3D
   Ctl3dUnregister(wxhInstance);
 
 #if CTL3D
   Ctl3dUnregister(wxhInstance);