another patch from Angus

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

diff --git a/ChangeLog b/ChangeLog
index 4a62427e5b223728abb87eccc4bdf1023c81b2c3..03cb129ead83d0ffccd4559d17f92d1b5dd97ef4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-29  Angus Leeming <a.leeming@ic.ac.uk>
+
+       * src/frontends/xforms/FormRef.C (updateBrowser):
+       * src/frontends/xforms/forms/form_ref.fd: try clicking on
+       different insets with the sort key active. Now apply this patch!
+
 2000-11-29  John Levon  <moz@compsoc.man.ac.uk>
 
        * src/frontends/xforms/FormPrint.C: set to valid()

diff --git a/src/frontends/xforms/FormRef.C b/src/frontends/xforms/FormRef.C
index 5772e668a21d63af7f85e0cbaee4691cae3737b4..0f8d9ab7ef4f512b1f8139f03c0aff853296786d 100644 (file)
--- a/src/frontends/xforms/FormRef.C
+++ b/src/frontends/xforms/FormRef.C
@@ -106,14 +106,10 @@ void FormRef::update()
                fl_deactivate_object(dialog_->name);
                fl_set_object_lcol(dialog_->name, FL_INACTIVE);
        }
-         
+
        refs = lv_->buffer()->getLabelList();
        updateBrowser(refs);
 
-       if (inset_ == 0) {
-       } else {
-       }
-
        bc_.readOnly(lv_->buffer()->isReadonly());
 }
 
@@ -121,7 +117,7 @@ void FormRef::update()
 void FormRef::updateBrowser(vector<string> const & akeys) const
 {
        vector<string> keys(akeys);
-       if (fl_get_button( dialog_->sort))
+       if (fl_get_button(dialog_->sort))
                sort(keys.begin(), keys.end());
 
        fl_clear_browser(dialog_->browser);
@@ -150,10 +146,10 @@ void FormRef::updateBrowser(vector<string> const & akeys) const
 
                string ref = fl_get_input(dialog_->ref);
                vector<string>::const_iterator cit =
-                       find(refs.begin(), refs.end(), ref);
+                       find(keys.begin(), keys.end(), ref);
 
-               if (cit != refs.end()) {
-                       int const i = static_cast<int>(cit - refs.begin());
+               if (cit != keys.end()) {
+                       int const i = static_cast<int>(cit - keys.begin());
                        fl_set_browser_topline(dialog_->browser, max(i-5, 1));
                        fl_select_browser_line(dialog_->browser, i+1);
                }
@@ -247,15 +243,17 @@ bool FormRef::input(FL_OBJECT *, long data)
 
        // update or sort
        case 3:
-       {
+               refs = lv_->buffer()->getLabelList();
+
+               // fall through to...
+       case 4:
                fl_freeze_form(form());
                updateBrowser(refs);
                fl_unfreeze_form(form());
-       }
-       break;
+               break;
 
        // changed reference type
-       case 4:
+       case 5:
        {
                Type type = static_cast<Type>( 
                        fl_get_choice(dialog_->type) - 1);

diff --git a/src/frontends/xforms/form_ref.C b/src/frontends/xforms/form_ref.C
index 998a672d542785426490085765836058d46a2c33..dabb23e45cc0849288658c994e1de7148233c37e 100644 (file)
--- a/src/frontends/xforms/form_ref.C
+++ b/src/frontends/xforms/form_ref.C
@@ -37,7 +37,7 @@ FD_form_ref * FormRef::build_ref()
     fl_set_button_shortcut(obj, scex(_("Sort|#S")), 1);
     fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
     fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 3);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 4);
   fdui->name = obj = fl_add_input(FL_NORMAL_INPUT, 370, 10, 150, 40, idex(_("Name:|#N")));
     fl_set_button_shortcut(obj, scex(_("Name:|#N")), 1);
     fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
@@ -48,7 +48,7 @@ FD_form_ref * FormRef::build_ref()
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lalign(obj, FL_ALIGN_TOP);
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 4);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 5);
   fdui->button_go = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 200, 140, 40, idex(_("Goto reference|#G")));
     fl_set_button_shortcut(obj, scex(_("Goto reference|#G")), 1);
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);

diff --git a/src/frontends/xforms/forms/form_ref.fd b/src/frontends/xforms/forms/form_ref.fd
index 05dd9eaa4c25aa62ebf2ab1cf0703f65494e5081..2b2f0e10a18b23d747c0c4e00ba54aaf6cbb53c8 100644 (file)
--- a/src/frontends/xforms/forms/form_ref.fd
+++ b/src/frontends/xforms/forms/form_ref.fd
@@ -82,7 +82,7 @@ resize: FL_RESIZE_NONE
 gravity: FL_SouthWest FL_SouthWest
 name: sort
 callback: C_FormBaseInputCB
-argument: 3
+argument: 4
 
 --------------------
 class: FL_INPUT
@@ -136,7 +136,7 @@ resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
 name: type
 callback: C_FormBaseInputCB
-argument: 4
+argument: 5
 
 --------------------
 class: FL_BUTTON