X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmain.C;h=473cf5c5370810e4923efa7265cd9659679aff0a;hb=34d28f9daae536db06d6cf1a9dcf62dc0f5aa432;hp=3f86341b20bf1c0393cc6d2790e4e1722bf2cc58;hpb=9ce32d63e5ff1dbf4c04e3d8263b2649ef3ac595;p=lyx.git

diff --git a/src/main.C b/src/main.C
index 3f86341b20..473cf5c537 100644
--- a/src/main.C
+++ b/src/main.C
@@ -4,27 +4,27 @@
  *           LyX, The Document Processor
  * 	 
  *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
-#include FORMS_H_LOCATION
+
 #include "lyx_main.h"
 #include "gettext.h"
 #include "LString.h"
 #include "support/filetools.h"
+#include "support/os.h"
+#include "frontends/GUIRunTime.h"
 
-// I keep these here so that it will be processed as early in
-// the compilation process as possible.
-#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-#error LyX will not compile with this version of XForms.\
-       Please get version 0.89.\
-       If you want to try to compile anyway, delete this test in src/main.C.
-#endif
 
+int main(int argc, char * argv[])
+{
+	os::init(&argc, &argv);
+	int const val = GUIRunTime::initApplication(argc, argv);
+	if (val)
+		return val;
 
-int main(int argc, char *argv[]) {
 	// lyx_localedir is used by gettext_init() is we have
 	//   i18n support built-in
 	string lyx_localedir = GetEnvPath("LYX_LOCALEDIR");
@@ -32,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