* remove various xforms relicts, in particular:

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 70e751bac3ba7877a28bd06015c18324830c4bd8..fcd809bec78b41e5c312b975bc68ae9e5f22b8e7 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -129,7 +129,7 @@ bool writeAs(Buffer * buffer, string const & filename)
        if (filename.empty()) {
 
                FileDialog fileDlg(_("Choose a filename to save document as"),
-                       LFUN_WRITEAS,
+                       LFUN_BUFFER_WRITE_AS,
                        make_pair(string(_("Documents|#o#O")),
                                  string(lyxrc.document_path)),
                        make_pair(string(_("Templates|#T#t")),
@@ -216,7 +216,7 @@ void quitLyX(bool noask)
                Alert::warning(_("Unable to remove temporary directory"), msg);
        }
 
-       lyx_gui::exit();
+       lyx_gui::exit(0);
 }
 
 
@@ -338,15 +338,6 @@ void newFile(BufferView * bv, string const & filename)
        // Split argument by :
        string name;
        string tmpname = split(filename, name, ':');
-#ifdef __EMX__ // Fix me! lyx_cb.C may not be low level enough to allow this.
-       if (name.length() == 1
-           && isalpha(static_cast<unsigned char>(name[0]))
-           && (prefixIs(tmpname, "/") || prefixIs(tmpname, "\\"))) {
-               name += ':';
-               name += token(tmpname, ':', 0);
-               tmpname = split(tmpname, ':');
-       }
-#endif
        lyxerr[Debug::INFO] << "Arg is " << filename
                            << "\nName is " << name
                            << "\nTemplate is " << tmpname << endl;
@@ -446,9 +437,7 @@ void reconfigure(BufferView * bv)
 
        // Run configure in user lyx directory
        Path p(package().user_support());
-       string const configure_script =
-               addName(package().system_support(), "configure.py");
-       string const configure_command = "python " + quoteName(configure_script);
+       string const configure_command = package().configure_command();
        Systemcall one;
        one.startscript(Systemcall::Wait, configure_command);
        p.pop();