Rearrange GTK icon lookup code, get rid of comboBoxTextSet

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 2112cda2468db70679293758910c5a7f559fe0d9..ff6eeb49ac50f8c4bdfdf252ff3b0d18edee65dd 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -44,7 +44,7 @@
 #include "support/path.h"
 #include "support/systemcall.h"
 
-#ifdef _WIN32
+#if !defined (HAVE_FORK)
 # define fork() -1
 #endif
 
@@ -188,12 +188,12 @@ bool WriteAs(Buffer * buffer, string const & filename)
 }
 
 
-void QuitLyX()
+void QuitLyX(bool noask)
 {
        lyxerr[Debug::INFO] << "Running QuitLyX." << endl;
 
        if (lyx_gui::use_gui) {
-               if (!bufferlist.quitWriteAll())
+               if (!noask && !bufferlist.quitWriteAll())
                        return;
 
                LyX::cref().lastfiles().writeFile(lyxrc.lastfiles);