Fixed a few xforms issues, with this method we could fix others too!

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@230 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 7f1555ebda9d787c8ce36d17a1ad6c2f972eea81..5491a597d1b7d602005264bf5a49e427f74ff42e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-10-22  Juergen Vigna  <jug@sad.it>
+
+       * src/insets/figinset.C (CallbackFig): Just changed the defines a bit.
+
+       * src/lyx_cb.C (MenuInsertRef) + 
+       * src/lyx_gui.C (create_forms): Inserted fl_set_form_minsize so that
+       the form cannot be resized under it limits (fixes a segfault)
+       
+       * src/lyx.C (create_form_form_ref) +
+       * forms/lyx.fd: Changed Gravity on name input field so that it is
+       resized correctly.
+
 1999-10-22  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * configure.in: use LYX_CXX_STL_MODERN_STREAMS; check for headers

diff --git a/forms/lyx.fd b/forms/lyx.fd
index 54c789246845566cd6e079aa665faffb87a75b55..8d4cca7e85a8ec7e1979bf7225703f992d763bad 100644 (file)
--- a/forms/lyx.fd
+++ b/forms/lyx.fd
@@ -93,7 +93,7 @@ argument:
 --------------------
 class: FL_BEGIN_GROUP
 type: 0
-box: 0 0 0 0
+box: 0 10 10 0
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_CENTER
@@ -625,7 +625,7 @@ lcol: FL_BLACK
 label: Name|#N
 shortcut: 
 resize: FL_RESIZE_X
-gravity: FL_NorthWest FL_SouthEast
+gravity: FL_SouthWest FL_SouthEast
 name: ref_name
 callback: 
 argument: 

diff --git a/src/insets/figinset.C b/src/insets/figinset.C
index 25c9f80ab3f0f23a84791d1a3c26e57e44660812..4fb1b106e0bdc3fea23fe85f1daae753b405f17a 100644 (file)
--- a/src/insets/figinset.C
+++ b/src/insets/figinset.C
@@ -980,8 +980,7 @@ static void UnregisterFigure(InsetFig *fi)
                }
 #if FL_REVISION == 89
 #warning Reactivate this free_form calls
-#endif
-#if FL_REVISION != 89
+#else
                fl_free_form(tmpfig->inset->form->Figure);
                free(tmpfig->inset->form);
                tmpfig->inset->form = 0;
@@ -1931,8 +1930,7 @@ void InsetFig::CallbackFig(long arg)
                                fl_hide_form(form->Figure);
 #if FL_REVISION == 89
 #warning Reactivate this free_form calls
-#endif
-#if FL_REVISION != 89
+#else
                                fl_free_form(form->Figure);
                                free(form);
                                form = 0;
@@ -1949,8 +1947,7 @@ void InsetFig::CallbackFig(long arg)
                fl_hide_form(form->Figure);
 #if FL_REVISION == 89
 #warning Reactivate this free_form calls
-#endif
-#if FL_REVISION != 89
+#else
                fl_free_form(form->Figure);
                free(form);
                form = 0;

diff --git a/src/lyx.C b/src/lyx.C
index 50e99810c282decb338b5ea4a83e441227646cff..f874f6648c8e96084568633bcac5bb9a20c2d3d0 100644 (file)
--- a/src/lyx.C
+++ b/src/lyx.C
@@ -156,7 +156,7 @@ FD_form_ref *create_form_form_ref(void)
     fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
     fl_set_object_callback(obj,RefSelectCB,2);
   fdui->ref_name = obj = fl_add_input(FL_NORMAL_INPUT,80,160,200,30,idex(_("Name|#N")));fl_set_button_shortcut(obj,scex(_("Name|#N")),1);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
+    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
     fl_set_object_resize(obj, FL_RESIZE_X);
   fl_end_form();
 

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 90d652c2b7087f9ced943ff3006c5254b988c6e5..c84a087606718d6c4207c5648940c612c1622c6f 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -1183,6 +1183,9 @@ void MenuInsertRef()
                fl_show_form(fd_form_ref->form_ref,
                             FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER,
                             _("Insert Reference"));
+               fl_set_form_minsize(fd_form_ref->form_ref,
+                                   fd_form_ref->form_ref->w,
+                                   fd_form_ref->form_ref->h);
        }
 }
 

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 09ea9ad82d63c211901c5a484a7c0fa77ceeb4c7..50dd4321776af9d6b1df4a42845cbc5d5a45b673 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -575,6 +575,8 @@ void LyXGUI::create_forms()
        // 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 options form
        fd_latex_options = create_form_LaTeXOptions();