Fix fuer #209

[lyx.git] / src / main.C

diff --git a/src/main.C b/src/main.C
index 22e56f1708721ad49aed69b2222e170398a31a57..473cf5c5370810e4923efa7265cd9659679aff0a 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -4,27 +4,24 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
-#include <iostream>
 
 #include "lyx_main.h"
 #include "gettext.h"
 #include "LString.h"
 #include "support/filetools.h"
+#include "support/os.h"
 #include "frontends/GUIRunTime.h"
 
-using std::cerr;
-using std::endl;
-
-GUIRunTime guiruntime;
 
 int main(int argc, char * argv[])
 {
-       int val = guiruntime.initApplication(argc, argv);
+       os::init(&argc, &argv);
+       int const val = GUIRunTime::initApplication(argc, argv);
        if (val)
                return val;
 
@@ -35,12 +32,8 @@ int main(int argc, char * argv[])
                lyx_localedir = LOCALEDIR;
        
        // initialize for internationalized version *EK*
-       locale_init();
-       gettext_init();
-
-#ifdef __EMX__
-       _wildcard(&argc, &argv);
-#endif
+       locale_init(); 
+       gettext_init(lyx_localedir); 
 
        LyX lyx(&argc, argv);
        return 0; // SUCCESS