#ifdefed out Ole... functions for Cygwin.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 9d46228d8bc357b316ab097ac609b5b2a4256cb0..300ec55493318d9e44e4d752c243aaafb65754e3 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -186,10 +186,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 +504,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);