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

diff --git a/src/main.C b/src/main.C
index e3f9e6159e..473cf5c537 100644
--- a/src/main.C
+++ b/src/main.C
@@ -4,60 +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 <iostream>
-
-#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
-
-using std::cerr;
-using std::endl;
-
-static int const xforms_include_version = FL_INCLUDE_VERSION;
 
 int main(int argc, char * argv[])
 {
-	// Check the XForms version in the forms.h header against
-	// the one in the libforms. If they don't match quit the
-	// execution of LyX. Better with a clean fast exit than
-	// a strange segfault later.
-	// I realize that this check have to be moved when we
-	// support several toolkits, but IMO all the toolkits
-	// should try to have the same kind of check. This could
-	// be done by having a CheckHeaderAndLib function in
-	// all the toolkit implementations, this function is
-	// responsible for notifing the user.
-	// if (!CheckHeaderAndLib()) {
-	//         // header vs. lib version failed
-	//         return 1;
-	// }
-	int xforms_lib_version = fl_library_version(0, 0);
-	if (xforms_include_version != xforms_lib_version) {
-		cerr << "You are either running LyX with wrong "
-			"version of a dynamic XForms library\n"
-			"or you have build LyX with conflicting header "
-			"and library (different\n"
-			"versions of XForms. Sorry but there is no point "
-			"in continuing executing LyX!" << endl;
-		return 1;
-	}
-	
+	os::init(&argc, &argv);
+	int const val = GUIRunTime::initApplication(argc, argv);
+	if (val)
+		return val;
+
 	// lyx_localedir is used by gettext_init() is we have
 	//   i18n support built-in
 	string lyx_localedir = GetEnvPath("LYX_LOCALEDIR");
@@ -65,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