projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
patch to fix various filename-related functions for cygwin
[wxWidgets.git]
/
src
/
msw
/
app.cpp
diff --git
a/src/msw/app.cpp
b/src/msw/app.cpp
index c59675e7f6c7a2d8e9d301ca0187e11fa764b646..4bbbd7f651892c16ca29e84f111e0006f5cb2a9b 100644
(file)
--- a/
src/msw/app.cpp
+++ b/
src/msw/app.cpp
@@
-193,9
+193,9
@@
END_EVENT_TABLE()
bool wxApp::Initialize()
{
// the first thing to do is to check if we're trying to run an Unicode
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
-#if wxUSE_UNICODE
+ // 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 )
{
// note that we can use MessageBoxW() as it's implemented even under
if ( wxGetOsVersion() != wxWINDOWS_NT )
{
// note that we can use MessageBoxW() as it's implemented even under
@@
-204,14
+204,14
@@
bool wxApp::Initialize()
::MessageBox
(
NULL,
::MessageBox
(
NULL,
- _T("This program uses Unicode and requires Windows NT/2000.\nProgram aborted."),
+ _T("This program uses Unicode and requires Windows NT/2000
/XP
.\nProgram aborted."),
_T("wxWindows Fatal Error"),
MB_ICONERROR | MB_OK
);
return FALSE;
}
_T("wxWindows Fatal Error"),
MB_ICONERROR | MB_OK
);
return FALSE;
}
-#endif // wxUSE_UNICODE
+#endif // wxUSE_UNICODE
&& !wxUSE_UNICODE_MSLU
// Some people may wish to use this, but
// probably it shouldn't be here by default.
// Some people may wish to use this, but
// probably it shouldn't be here by default.
@@
-252,9
+252,11
@@
bool wxApp::Initialize()
;
#endif // Win16
;
#endif // Win16
+#if wxUSE_OLE
// we need to initialize OLE library
if ( FAILED(::OleInitialize(NULL)) )
wxLogError(_("Cannot initialize OLE"));
// we need to initialize OLE library
if ( FAILED(::OleInitialize(NULL)) )
wxLogError(_("Cannot initialize OLE"));
+#endif
#endif // wxUSE_OLE
#endif // wxUSE_OLE