2002-07-02 Lars Gullik Bj�nnes <larsbj@birdstep.com>

[lyx.git] / src / frontends / xforms / FormIndex.C

diff --git a/src/frontends/xforms/FormIndex.C b/src/frontends/xforms/FormIndex.C
index c2057a5a990c4937471c61071fb8d1d7c4716997..ec704bb07a9762cce63253f2c77263dbbf9d7a61 100644 (file)
--- a/src/frontends/xforms/FormIndex.C
+++ b/src/frontends/xforms/FormIndex.C
@@ -1,13 +1,8 @@
-/* This file is part of
- * ====================================================== 
+/**
+ * \file xforms/FormIndex.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
  *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
- * \file FormIndex.C
  * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
@@ -20,26 +15,28 @@
 #include "xformsBC.h"
 #include "ControlIndex.h"
 #include "FormIndex.h"
-#include "LyXView.h"
-#include "form_index.h"
+#include "frontends/LyXView.h"
+#include "forms/form_index.h"
+#include FORMS_H_LOCATION
 
-typedef FormCB<ControlIndex, FormDB<FD_form_index> > base_class;
+typedef FormCB<ControlIndex, FormDB<FD_index> > base_class;
 
-FormIndex::FormIndex(ControlIndex & c)
-       : base_class(c, _("Index"))
+FormIndex::FormIndex(ControlIndex & c, Dialogs & d)
+       : base_class(c, d, _("Index"))
 {}
 
 
 void FormIndex::build()
 {
-       dialog_.reset(build_index());
+       dialog_.reset(build_index(this));
 
        fl_set_input_return(dialog_->input_key, FL_RETURN_CHANGED);
+       setPrehandler(dialog_->input_key);
 
-        // Manage the ok, apply, restore and cancel/close buttons
+       // Manage the ok, apply, restore and cancel/close buttons
        bc().setOK(dialog_->button_ok);
        bc().setApply(dialog_->button_apply);
-       bc().setCancel(dialog_->button_cancel);
+       bc().setCancel(dialog_->button_close);
        bc().setRestore(dialog_->button_restore);
 
        bc().addReadOnly(dialog_->input_key);