X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/193fe9890411e788f41648b95280d8979b378189..9b7e522ae97eb3d62bfb9ce6f527f1368c576e93:/src/msw/app.cpp?ds=inline diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 35c8510c48..d1a70a3d3c 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -69,11 +69,13 @@ #endif // OLE is used for drag-and-drop, clipboard, OLE Automation... +#ifndef wxUSE_NORLANDER_HEADERS #if defined(__GNUWIN32__) || defined(__SC__) || defined(__SALFORDC__) #undef wxUSE_OLE #define wxUSE_OLE 0 #endif // broken compilers +#endif #if wxUSE_OLE #include @@ -82,7 +84,7 @@ #include #include -#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) +#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS) #include #endif @@ -218,7 +220,6 @@ bool wxApp::Initialize() while (!SetMessageQueue(iMsg) && (iMsg -= 8)) ; #endif // Win16 - // we need to initialize OLE library if ( FAILED(::OleInitialize(NULL)) ) wxLogError(_("Cannot initialize OLE"));