X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmain.C;h=7c10c5dde6685cb3385838e60952a7044f0b30de;hb=498f06d43a0f2000c3f704db1ea39fda3c819fe6;hp=10785c5ffa85e032b4bf97b61f7d98d213be6651;hpb=6bba977f42b0cde753ac2ffd26f3f9c6b32ba0b6;p=lyx.git diff --git a/src/main.C b/src/main.C index 10785c5ffa..7c10c5dde6 100644 --- a/src/main.C +++ b/src/main.C @@ -1,84 +1,33 @@ -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. +/** + * \file main.C + * Copyright 2002 the LyX Team + * Read the file COPYING * - * ====================================================== */ + * \author unknown + */ #include -#include - -#ifdef KDEGUI -# include -#endif -#include FORMS_H_LOCATION #include "lyx_main.h" #include "gettext.h" #include "LString.h" #include "support/filetools.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; +#include "support/os.h" 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; - } - -#ifdef KDEGUI - KApplication a( argc, argv ); -#endif + os::init(&argc, &argv); // lyx_localedir is used by gettext_init() is we have // i18n support built-in string lyx_localedir = GetEnvPath("LYX_LOCALEDIR"); if (lyx_localedir.empty()) lyx_localedir = LOCALEDIR; - + // initialize for internationalized version *EK* locale_init(); - gettext_init(); - -#ifdef __EMX__ - _wildcard(&argc, &argv); -#endif + gettext_init(lyx_localedir); - LyX lyx(&argc, argv); - return 0; // SUCCESS + LyX lyx(argc, argv); + return 0; }