Dekel's patch -- I didn't fix the xforms-0.88 keysyms stuff so it still doesn't finis...

[lyx.git] / src / lyx_gui.C

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 11cc6517386436a7b0ae45cbf9966cb95d8365e9..55daaf72f6259fe8df2970060b9117f0e0d0161a 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -19,6 +19,10 @@
 #    include <kapp.h>
 #endif
 
+#ifdef GTKGUI
+#    include <gnome--/main.h>
+#endif
+
 #include <fcntl.h>
 #include "lyx_gui.h"
 #include FORMS_H_LOCATION
@@ -59,9 +63,6 @@ FD_form_preamble * fd_form_preamble;
 FD_form_table * fd_form_table;
 FD_form_sendto * fd_form_sendto;
 FD_form_figure * fd_form_figure;
-FD_form_screen * fd_form_screen;
-FD_form_toc * fd_form_toc;
-FD_form_ref * fd_form_ref;
 FD_LaTeXLog * fd_latex_log; // from log_form.h
 Combox * combo_language;
 Combox * combo_language2;
@@ -523,23 +524,6 @@ void LyXGUI::create_forms()
                            CancelCloseBoxCB, 0);
        fl_set_button(fd_form_figure->radio_postscript, 1);
 
-       // the screen form
-       fd_form_screen = create_form_form_screen();
-       fl_set_form_atclose(fd_form_screen->form_screen,
-                           CancelCloseBoxCB, 0);
-
-       // the toc form
-       fd_form_toc = create_form_form_toc();
-       fl_addto_choice(fd_form_toc->toctype,
-                       _(" TOC | LOF | LOT | LOA "));
-       fl_set_form_atclose(fd_form_toc->form_toc, CancelCloseBoxCB, 0);
-
-       // the ref form
-       fd_form_ref = create_form_form_ref();
-       fl_set_form_atclose(fd_form_ref->form_ref, CancelCloseBoxCB, 0);
-       fl_set_form_minsize(fd_form_ref->form_ref, fd_form_ref->form_ref->w,
-                           fd_form_ref->form_ref->h);
-
        // the latex log form
        fd_latex_log = create_form_LaTeXLog();
        fl_set_form_atclose(fd_latex_log->LaTeXLog,
@@ -590,6 +574,10 @@ void LyXGUI::runTime()
 #ifdef KDEGUI
                kapp->processEvents();
 #endif
+#ifdef GTKGUI
+               while(Gnome::Main::instance()->events_pending()) Gnome::Main::instance()->iteration(FALSE);
+#endif
+               
                if (fl_check_forms() == FL_EVENT) {
                        lyxerr << "LyX: This shouldn't happen..." << endl;
                        fl_XNextEvent(&ev);