add generic helper class for calling functions in gui thread

[lyx.git] / src / support / os_win32.cpp

diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp
index a8ffaa54773f93a5e40220c31b6f5efd3842142b..dd5f0e594d71cd9fa18fa1adc04dd0710c2d209e 100644 (file)
--- a/src/support/os_win32.cpp
+++ b/src/support/os_win32.cpp
@@ -53,6 +53,11 @@
 #define ASSOCF_INIT_IGNOREUNKNOWN 0
 #endif
 
+#if defined(__MINGW32__)
+#include <stdio.h>
+#endif
+
+
 extern "C" {
 extern void __wgetmainargs(int * argc, wchar_t *** argv, wchar_t *** envp,
                           int expand_wildcards, int * new_mode);
@@ -209,6 +214,14 @@ string utf8_argv(int i)
 }
 
 
+void remove_internal_args(int i, int num)
+{
+       argc_ -= num;
+       for (int j = i; j < argc_; ++j)
+               argv_[j] = argv_[j + num];
+}
+
+
 string current_root()
 {
        // _getdrive returns the current drive (1=A, 2=B, and so on).
@@ -404,26 +417,6 @@ string const & nulldev()
 }
 
 
-bool is_terminal(io_channel channel)
-{
-       switch (channel) {
-       case STDIN:
-               if (GetStdHandle(STD_INPUT_HANDLE) == NULL)
-                       return false;
-               break;
-       case STDOUT:
-               if (GetStdHandle(STD_OUTPUT_HANDLE) == NULL)
-                       return false;
-               break;
-       case STDERR:
-               if (GetStdHandle(STD_ERROR_HANDLE) == NULL)
-                       return false;
-               break;
-       }
-       return true;
-}
-
-
 shell_type shell()
 {
        return CMD_EXE;
@@ -610,7 +603,7 @@ string real_path(string const & path)
        CloseHandle(hmap);
        CloseHandle(hpath);
        string const retpath = subst(string(realpath), '\\', '/');
-       return FileName::fromFilesystemEncoding(retpath).absFilename();
+       return FileName::fromFilesystemEncoding(retpath).absFileName();
 }
 
 } // namespace os