removed a warning from screen and added CFLAGS in lyx.spec.in.

[lyx.git] / src / insets / figinset.C

diff --git a/src/insets/figinset.C b/src/insets/figinset.C
index c85889ae60f8ade5a25e121920a90e17ff7224ed..4fb1b106e0bdc3fea23fe85f1daae753b405f17a 100644 (file)
--- a/src/insets/figinset.C
+++ b/src/insets/figinset.C
@@ -973,11 +973,18 @@ static void UnregisterFigure(InsetFig *fi)
 
        if (tmpfig->data) freefigdata(tmpfig->data);
        if (tmpfig->inset->form) {
-               if (tmpfig->inset->form->Figure->visible)
+               if (tmpfig->inset->form->Figure->visible) {
+                       fl_set_focus_object(tmpfig->inset->form->Figure,
+                                           tmpfig->inset->form->OkBtn);
                        fl_hide_form(tmpfig->inset->form->Figure);
+               }
+#if FL_REVISION == 89
+#warning Reactivate this free_form calls
+#else
                fl_free_form(tmpfig->inset->form->Figure);
                free(tmpfig->inset->form);
                tmpfig->inset->form = 0;
+#endif
        }
        i = FindFigIndex(tmpfig);
        --figinsref;
@@ -1905,7 +1912,7 @@ void InsetFig::CallbackFig(long arg)
                        } else {
                                if (!fname.empty()) {
                                        changedfname = true;
-                                       fname.erase();
+                                       fname.clear();
                                }
                        }
                        subcaption = fl_get_input(form->Subcaption);
@@ -1919,10 +1926,15 @@ void InsetFig::CallbackFig(long arg)
                        }
                        UpdateInset(this);
                        if (arg == 8) {
+                               fl_set_focus_object(form->Figure, form->OkBtn);
                                fl_hide_form(form->Figure);
+#if FL_REVISION == 89
+#warning Reactivate this free_form calls
+#else
                                fl_free_form(form->Figure);
                                free(form);
                                form = 0;
+#endif
                        }
                        break;
                } //if not readonly
@@ -1931,10 +1943,15 @@ void InsetFig::CallbackFig(long arg)
                        break;
                // fall through
        case 9:                         /* cancel = restore and close */
+               fl_set_focus_object(form->Figure, form->OkBtn);
                fl_hide_form(form->Figure);
+#if FL_REVISION == 89
+#warning Reactivate this free_form calls
+#else
                fl_free_form(form->Figure);
                free(form);
                form = 0;
+#endif
                break;
        }