inset-split should not be dispatched to inset at point

[lyx.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 1e4634ca0f8e37bcee5b0369cee97065b3734cc2..65a9f4d8d7da10e7537ea51fbb53d49ef3afb355 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean Marc Lasgouttes
  *
  * Full author contact details are available in file CREDITS.
@@ -11,31 +11,44 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "LyX.h"
-#include "gettext.h"
 
+#include "support/debug.h"
 #include "support/os.h"
 
+#include <iostream>
 #ifdef HAVE_IOS
 #include <ios>
 #endif
 
+#ifdef WIN32
+#include <Windows.h>
+#endif
+
+
+using namespace std;
+
+
 int main(int argc, char * argv[])
 {
 #ifdef HAVE_IOS
-       std::ios_base::sync_with_stdio(false);
+       ios_base::sync_with_stdio(false);
+#endif
+
+#ifdef WIN32
+       if (AttachConsole(ATTACH_PARENT_PROCESS)) {
+               freopen("CONOUT$", "w", stdout);
+               freopen("CONOUT$", "w", stderr);
+       }
+       SetConsoleOutputCP(CP_UTF8);
 #endif
 
        // To avoid ordering of global object problems with some
        // stdlibs we do the initialization here, but still as
        // early as possible.
-       lyx::lyxerr.rdbuf(std::cerr.rdbuf());
-
-       lyx::support::os::init(argc, argv);
+       lyx::lyxerr.setStream(cerr);
 
-       // initialize for internationalized version *EK*
-       lyx::locale_init();
+       lyx::support::os::init(argc, &argv);
 
        lyx::LyX the_lyx_instance;