X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormIndex.C;h=4a0b62ed0a6fc684f6dfe0d9f1a44d0e9da5db8e;hb=c265d16ed06149b478c2d2c9b9b8e69cdb1bcf3d;hp=5b6f0dea1aa820eda2b5607226f723ba993f7941;hpb=0c2a3e5960f032dcd8be726e3e63628207a06dd3;p=lyx.git

diff --git a/src/frontends/xforms/FormIndex.C b/src/frontends/xforms/FormIndex.C
index 5b6f0dea1a..4a0b62ed0a 100644
--- a/src/frontends/xforms/FormIndex.C
+++ b/src/frontends/xforms/FormIndex.C
@@ -1,15 +1,9 @@
-// -*- C++ -*-
-/* 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
+ * \author Angus Leeming <leeming@lyx.org>
  */
 
 #include <config.h>
@@ -21,26 +15,27 @@
 #include "xformsBC.h"
 #include "ControlIndex.h"
 #include "FormIndex.h"
-#include "LyXView.h"
-#include "form_index.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()
+	: base_class(_("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);