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 9d46228d8bc357b316ab097ac609b5b2a4256cb0..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>
 


@@ -186,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))


@@ -502,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);