Fixed toolbar crash for MinGW/Cygwin

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 480bb9b54d2f54827412ce075a6375b2c579f4ac..e77f69dd6518234b5e776f3796d4e182753fd1eb 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -193,8 +193,8 @@ END_EVENT_TABLE()
 bool wxApp::Initialize()
 {
     // the first thing to do is to check if we're trying to run an Unicode
-    // program under Win9x - if so, abort right now as it has no chance to
-    // work
+    // 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 )
     {
@@ -213,12 +213,6 @@ bool wxApp::Initialize()
     }
 #endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
 
-    // Some people may wish to use this, but
-    // probably it shouldn't be here by default.
-#ifdef __WXDEBUG__
-    //    wxRedirectIOToConsole();
-#endif
-
     wxBuffer = new wxChar[1500]; // FIXME
 
     wxClassInfo::InitializeClasses();
@@ -252,9 +246,11 @@ bool wxApp::Initialize()
         ;
 #endif // Win16
 
+#if wxUSE_OLE
     // we need to initialize OLE library
     if ( FAILED(::OleInitialize(NULL)) )
         wxLogError(_("Cannot initialize OLE"));
+#endif
 
 #endif // wxUSE_OLE