X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=0c8234d9618e177f01abe99879e453fa15183fe7;hb=021f51e19b3751f8f15d8bd89f7aa6a109624b29;hp=b7a409fedb4bad911fde2e801ffcddb488906c12;hpb=945dad51bf80b1a66f4b851508c4dbab1cbbc8e6;p=lyx.git

diff --git a/src/LyX.cpp b/src/LyX.cpp
index b7a409fedb..0c8234d961 100644
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -71,9 +71,6 @@
 #include <stdlib.h>
 #include <string>
 #include <vector>
-#if defined(_WIN32) || defined(__CYGWIN__)
-#include <windows.h>
-#endif
 
 using namespace std;
 using namespace lyx::support;
@@ -653,18 +650,6 @@ static void error_handler(int err_sig)
 	exit(0);
 }
 
-
-#if defined(_WIN32) || defined(__CYGWIN__)
-BOOL terminate_handler(DWORD event)
-{
-	if (event == CTRL_CLOSE_EVENT
-	    || event == CTRL_LOGOFF_EVENT
-	    || event == CTRL_SHUTDOWN_EVENT)
-		raise(SIGTERM);
-	return FALSE;
-}
-#endif
-
 }
 
 
@@ -686,10 +671,6 @@ bool LyX::init()
 	signal(SIGINT, error_handler);
 	signal(SIGTERM, error_handler);
 	// SIGPIPE can be safely ignored.
-#if defined(_WIN32) || defined(__CYGWIN__)
-	// On Windows we have also to catch logging off or closing the console.
-	SetConsoleCtrlHandler((PHANDLER_ROUTINE)terminate_handler, TRUE);
-#endif
 
 	lyxrc.tempdir_path = package().temp_dir().absFilename();
 	lyxrc.document_path = package().document_dir().absFilename();
@@ -769,7 +750,7 @@ bool LyX::init()
 	if (!LyXSetStyle())
 		return false;
 	//...and the modules
-	moduleList.read();
+	theModuleList.read();
 
 	// read keymap and ui files in batch mode as well
 	// because InsetInfo needs to know these to produce
@@ -784,8 +765,6 @@ bool LyX::init()
 	// load user bind file user.bind
 	pimpl_->toplevel_keymap_.read("user", 0, KeyMap::MissingOK);
 
-	pimpl_->lyxfunc_.initKeySequences(&pimpl_->toplevel_keymap_);
-
 	if (lyxerr.debugging(Debug::LYXRC))
 		lyxrc.print();