projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no new install of event handler
[wxWidgets.git]
/
src
/
msw
/
utils.cpp
diff --git
a/src/msw/utils.cpp
b/src/msw/utils.cpp
index 271a75da768473ac4a349b6c45a00149a5552e86..986e6602bfc713e5e4e46590a338429b4e75c68d 100644
(file)
--- a/
src/msw/utils.cpp
+++ b/
src/msw/utils.cpp
@@
-48,7
+48,7
@@
#include "wx/timer.h"
#include "wx/timer.h"
-#if !defined(__GNUWIN32__) && !defined(__
WXWINE__) && !defined(__
SALFORDC__) && !defined(__WXMICROWIN__)
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__)
#include <direct.h>
#ifndef __MWERKS__
#include <direct.h>
#ifndef __MWERKS__
@@
-78,8
+78,10
@@
#include <lm.h>
#endif // USE_NET_API
#include <lm.h>
#endif // USE_NET_API
-#if defined(__WIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)
- #include <io.h>
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+ #ifndef __UNIX__
+ #include <io.h>
+ #endif
#ifndef __GNUWIN32__
#include <shellapi.h>
#ifndef __GNUWIN32__
#include <shellapi.h>
@@
-887,7
+889,6
@@
bool wxShutdown(wxShutdownFlags wFlags)
bOK = ::OpenProcessToken(GetCurrentProcess(),
TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY,
&hToken) != 0;
bOK = ::OpenProcessToken(GetCurrentProcess(),
TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY,
&hToken) != 0;
-#ifndef __WXWINE__
if ( bOK )
{
TOKEN_PRIVILEGES tkp;
if ( bOK )
{
TOKEN_PRIVILEGES tkp;
@@
-906,7
+907,6
@@
bool wxShutdown(wxShutdownFlags wFlags)
// Cannot test the return value of AdjustTokenPrivileges.
bOK = ::GetLastError() == ERROR_SUCCESS;
}
// Cannot test the return value of AdjustTokenPrivileges.
bOK = ::GetLastError() == ERROR_SUCCESS;
}
-#endif
}
if ( bOK )
}
if ( bOK )