Few insettabular/text fixes (added cut&paste for tabulars) + Markos GNOME patch

[features.git] / src / lyx_gui_misc.C

diff --git a/src/lyx_gui_misc.C b/src/lyx_gui_misc.C
index 1379eea4b3719416af18e0b5e9f587a91247856a..32eeb878f96b147813af7ab121683870270272a6 100644 (file)
--- a/src/lyx_gui_misc.C
+++ b/src/lyx_gui_misc.C
@@ -110,19 +110,26 @@ void CloseAllBufferRelatedDialogs()
        if (fd_form_paper->form_paper->visible) {
                fl_hide_form(fd_form_paper->form_paper);
        }
+       if (fd_form_bullet) {
+               if (fd_form_bullet->form_bullet->visible) {
+                       fl_hide_form(fd_form_bullet->form_bullet);
+               }
+       }
 #endif
        if (fd_form_preamble->form_preamble->visible) {
                fl_hide_form(fd_form_preamble->form_preamble);
        }
-       if (fd_form_table->form_table->visible) {
-               fl_hide_form(fd_form_table->form_table);
-       }
        if (fd_form_figure->form_figure->visible) {
                fl_hide_form(fd_form_figure->form_figure);
        }
+#ifndef NEW_TABULAR
+       if (fd_form_table->form_table->visible) {
+               fl_hide_form(fd_form_table->form_table);
+       }
        if (fd_form_table_options->form_table_options->visible) {
                fl_hide_form(fd_form_table_options->form_table_options);
        }
+#endif
        if (fd_form_sendto->form_sendto->visible) {
                fl_hide_form(fd_form_sendto->form_sendto);
        }
@@ -134,11 +141,6 @@ void CloseAllBufferRelatedDialogs()
                        fl_trigger_object(fd_form_spell_check->done);
                }
        }
-       if (fd_form_bullet) {
-               if (fd_form_bullet->form_bullet->visible) {
-                       fl_hide_form(fd_form_bullet->form_bullet);
-               }
-       }
        if (fd_panel) {
                if (fd_panel->panel->visible) {
                        fl_hide_form(fd_panel->panel);