Patch #826420, and also adapted to new SWIG

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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 8e5fab3265946128366d2883f4c772c9b9732d0c..89c2b89a0bfb42741774d00137c03d0bb7e6c181 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -922,7 +922,7 @@ bool wxShutdown(wxShutdownFlags wFlags)
                 return FALSE;
         }
 
-        bOK = ::ExitWindowsEx(EWX_SHUTDOWN | EWX_FORCE | EWX_REBOOT, 0) != 0;
+        bOK = ::ExitWindowsEx(flags, 0) != 0;
     }
 
     return bOK;
@@ -1244,7 +1244,7 @@ extern long wxCharsetToCodepage(const wxChar *name)
   NULL. classname is the desired wndclass classname. If function succesfully
   registers the class, pclassname will be set to classname.
  */
-extern "C" HWND
+extern "C" WXDLLIMPEXP_BASE HWND
 wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc)
 {
     wxCHECK_MSG( classname && pclassname && wndproc, NULL,