]> git.lyx.org Git - features.git/commitdiff
xforms clean-up, described in detail in my mail of 31 May. See
authorAngus Leeming <leeming@lyx.org>
Thu, 13 Jun 2002 13:43:51 +0000 (13:43 +0000)
committerAngus Leeming <leeming@lyx.org>
Thu, 13 Jun 2002 13:43:51 +0000 (13:43 +0000)
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg38939.html

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

202 files changed:
ChangeLog
configure.in
src/frontends/xforms/Alert_pimpl.C
src/frontends/xforms/ChangeLog
src/frontends/xforms/Dialogs.C
src/frontends/xforms/DropDown.C
src/frontends/xforms/DropDown.h
src/frontends/xforms/FeedbackController.C
src/frontends/xforms/FeedbackController.h
src/frontends/xforms/FormAboutlyx.C
src/frontends/xforms/FormAboutlyx.h
src/frontends/xforms/FormBase.C
src/frontends/xforms/FormBase.h
src/frontends/xforms/FormBaseDeprecated.C
src/frontends/xforms/FormBaseDeprecated.h
src/frontends/xforms/FormBibitem.C
src/frontends/xforms/FormBibitem.h
src/frontends/xforms/FormBibtex.C
src/frontends/xforms/FormBibtex.h
src/frontends/xforms/FormBrowser.C
src/frontends/xforms/FormBrowser.h
src/frontends/xforms/FormCharacter.C
src/frontends/xforms/FormCharacter.h
src/frontends/xforms/FormCitation.C
src/frontends/xforms/FormCitation.h
src/frontends/xforms/FormDocument.C
src/frontends/xforms/FormDocument.h
src/frontends/xforms/FormERT.C
src/frontends/xforms/FormERT.h
src/frontends/xforms/FormError.C
src/frontends/xforms/FormError.h
src/frontends/xforms/FormExternal.C
src/frontends/xforms/FormExternal.h
src/frontends/xforms/FormFiledialog.C
src/frontends/xforms/FormFiledialog.h
src/frontends/xforms/FormFloat.C
src/frontends/xforms/FormFloat.h
src/frontends/xforms/FormForks.C
src/frontends/xforms/FormForks.h
src/frontends/xforms/FormGraphics.C
src/frontends/xforms/FormGraphics.h
src/frontends/xforms/FormInclude.C
src/frontends/xforms/FormInclude.h
src/frontends/xforms/FormIndex.C
src/frontends/xforms/FormIndex.h
src/frontends/xforms/FormLog.C
src/frontends/xforms/FormMathsBitmap.C
src/frontends/xforms/FormMathsDeco.C
src/frontends/xforms/FormMathsDeco.h
src/frontends/xforms/FormMathsDelim.C
src/frontends/xforms/FormMathsDelim.h
src/frontends/xforms/FormMathsMatrix.C
src/frontends/xforms/FormMathsMatrix.h
src/frontends/xforms/FormMathsPanel.C
src/frontends/xforms/FormMathsPanel.h
src/frontends/xforms/FormMathsSpace.C
src/frontends/xforms/FormMathsSpace.h
src/frontends/xforms/FormMathsStyle.C
src/frontends/xforms/FormMathsStyle.h
src/frontends/xforms/FormMinipage.C
src/frontends/xforms/FormMinipage.h
src/frontends/xforms/FormParagraph.C
src/frontends/xforms/FormParagraph.h
src/frontends/xforms/FormPreamble.C
src/frontends/xforms/FormPreamble.h
src/frontends/xforms/FormPreferences.C
src/frontends/xforms/FormPreferences.h
src/frontends/xforms/FormPrint.C
src/frontends/xforms/FormPrint.h
src/frontends/xforms/FormRef.C
src/frontends/xforms/FormRef.h
src/frontends/xforms/FormSearch.C
src/frontends/xforms/FormSearch.h
src/frontends/xforms/FormSendto.C
src/frontends/xforms/FormSendto.h
src/frontends/xforms/FormShowFile.C
src/frontends/xforms/FormSpellchecker.C
src/frontends/xforms/FormSpellchecker.h
src/frontends/xforms/FormTabular.C
src/frontends/xforms/FormTabular.h
src/frontends/xforms/FormTabularCreate.C
src/frontends/xforms/FormTabularCreate.h
src/frontends/xforms/FormTexinfo.C
src/frontends/xforms/FormTexinfo.h
src/frontends/xforms/FormThesaurus.C
src/frontends/xforms/FormThesaurus.h
src/frontends/xforms/FormToc.C
src/frontends/xforms/FormToc.h
src/frontends/xforms/FormUrl.C
src/frontends/xforms/FormUrl.h
src/frontends/xforms/FormVCLog.C
src/frontends/xforms/Makefile.am
src/frontends/xforms/Menubar_pimpl.C
src/frontends/xforms/Menubar_pimpl.h
src/frontends/xforms/RadioButtonGroup.C
src/frontends/xforms/RadioButtonGroup.h
src/frontends/xforms/Toolbar_pimpl.C
src/frontends/xforms/Toolbar_pimpl.h
src/frontends/xforms/Tooltips.C
src/frontends/xforms/Tooltips.h
src/frontends/xforms/XFormsView.C
src/frontends/xforms/XFormsView.h
src/frontends/xforms/XWorkArea.h
src/frontends/xforms/form_aboutlyx.C [deleted file]
src/frontends/xforms/form_aboutlyx.h [deleted file]
src/frontends/xforms/form_bibitem.C [deleted file]
src/frontends/xforms/form_bibitem.h [deleted file]
src/frontends/xforms/form_bibtex.C [deleted file]
src/frontends/xforms/form_bibtex.h [deleted file]
src/frontends/xforms/form_browser.C [deleted file]
src/frontends/xforms/form_browser.h [deleted file]
src/frontends/xforms/form_character.C [deleted file]
src/frontends/xforms/form_character.h [deleted file]
src/frontends/xforms/form_citation.C [deleted file]
src/frontends/xforms/form_citation.h [deleted file]
src/frontends/xforms/form_document.C [deleted file]
src/frontends/xforms/form_document.h [deleted file]
src/frontends/xforms/form_error.C [deleted file]
src/frontends/xforms/form_error.h [deleted file]
src/frontends/xforms/form_ert.C [deleted file]
src/frontends/xforms/form_ert.h [deleted file]
src/frontends/xforms/form_external.C [deleted file]
src/frontends/xforms/form_external.h [deleted file]
src/frontends/xforms/form_filedialog.C [deleted file]
src/frontends/xforms/form_filedialog.h [deleted file]
src/frontends/xforms/form_float.C [deleted file]
src/frontends/xforms/form_float.h [deleted file]
src/frontends/xforms/form_forks.C [deleted file]
src/frontends/xforms/form_forks.h [deleted file]
src/frontends/xforms/form_graphics.C [deleted file]
src/frontends/xforms/form_graphics.h [deleted file]
src/frontends/xforms/form_include.C [deleted file]
src/frontends/xforms/form_include.h [deleted file]
src/frontends/xforms/form_index.C [deleted file]
src/frontends/xforms/form_index.h [deleted file]
src/frontends/xforms/form_maths_deco.C [deleted file]
src/frontends/xforms/form_maths_deco.h [deleted file]
src/frontends/xforms/form_maths_delim.C [deleted file]
src/frontends/xforms/form_maths_delim.h [deleted file]
src/frontends/xforms/form_maths_matrix.C [deleted file]
src/frontends/xforms/form_maths_matrix.h [deleted file]
src/frontends/xforms/form_maths_panel.C [deleted file]
src/frontends/xforms/form_maths_panel.h [deleted file]
src/frontends/xforms/form_maths_space.C [deleted file]
src/frontends/xforms/form_maths_space.h [deleted file]
src/frontends/xforms/form_maths_style.C [deleted file]
src/frontends/xforms/form_maths_style.h [deleted file]
src/frontends/xforms/form_minipage.C [deleted file]
src/frontends/xforms/form_minipage.h [deleted file]
src/frontends/xforms/form_paragraph.C [deleted file]
src/frontends/xforms/form_paragraph.h [deleted file]
src/frontends/xforms/form_preamble.C [deleted file]
src/frontends/xforms/form_preamble.h [deleted file]
src/frontends/xforms/form_preferences.C [deleted file]
src/frontends/xforms/form_preferences.h [deleted file]
src/frontends/xforms/form_print.C [deleted file]
src/frontends/xforms/form_print.h [deleted file]
src/frontends/xforms/form_ref.C [deleted file]
src/frontends/xforms/form_ref.h [deleted file]
src/frontends/xforms/form_search.C [deleted file]
src/frontends/xforms/form_search.h [deleted file]
src/frontends/xforms/form_sendto.C [deleted file]
src/frontends/xforms/form_sendto.h [deleted file]
src/frontends/xforms/form_spellchecker.C [deleted file]
src/frontends/xforms/form_spellchecker.h [deleted file]
src/frontends/xforms/form_tabular.C [deleted file]
src/frontends/xforms/form_tabular.h [deleted file]
src/frontends/xforms/form_tabular_create.C [deleted file]
src/frontends/xforms/form_tabular_create.h [deleted file]
src/frontends/xforms/form_texinfo.C [deleted file]
src/frontends/xforms/form_texinfo.h [deleted file]
src/frontends/xforms/form_thesaurus.C [deleted file]
src/frontends/xforms/form_thesaurus.h [deleted file]
src/frontends/xforms/form_toc.C [deleted file]
src/frontends/xforms/form_toc.h [deleted file]
src/frontends/xforms/form_url.C [deleted file]
src/frontends/xforms/form_url.h [deleted file]
src/frontends/xforms/forms/Makefile.am
src/frontends/xforms/forms/README
src/frontends/xforms/forms/fdfix.sh
src/frontends/xforms/forms/fdfixc.sed
src/frontends/xforms/forms/fdfixh.sed
src/frontends/xforms/forms/form_aboutlyx.fd
src/frontends/xforms/forms/form_document.C.patch [deleted file]
src/frontends/xforms/forms/form_document.fd
src/frontends/xforms/forms/form_ert.C.patch [deleted file]
src/frontends/xforms/forms/form_filedialog.C.patch [deleted file]
src/frontends/xforms/forms/form_graphics.fd
src/frontends/xforms/forms/form_preferences.fd
src/frontends/xforms/forms/form_tabular.fd
src/frontends/xforms/forms/makefile.old [deleted file]
src/frontends/xforms/forms_fwd.h [new file with mode: 0644]
src/frontends/xforms/forms_gettext.C [new file with mode: 0644]
src/frontends/xforms/forms_gettext.h [new file with mode: 0644]
src/frontends/xforms/xformsBC.C
src/frontends/xforms/xformsBC.h
src/frontends/xforms/xformsGImage.C
src/frontends/xforms/xformsGImage.h
src/frontends/xforms/xforms_helpers.C
src/frontends/xforms/xforms_helpers.h
src/frontends/xforms/xforms_resize.C
src/frontends/xforms/xforms_resize.h

index b7eac7d21e627a1645c79fd2add45cf46cb36b15..0f94cb460d714e4ac1b8ee53982dba0f4032a499 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-12  Angus Leeming  <leeming@lyx.org>
+
+       * configure.in: add xforms/forms/*.lo to the xforms version of
+       FRONTEND_GUILIB.
+
 2002-06-12  Angus Leeming  <leeming@lyx.org>
 
        * configure.in: remove LYX_STL_STRING_FWD.
 2002-06-12  Angus Leeming  <leeming@lyx.org>
 
        * configure.in: remove LYX_STL_STRING_FWD.
index b346dc75014e17c663dbde3e495370f40839485f..7e5caf4f8e58c9a5da40aaf5fdf776ebde51644c 100644 (file)
@@ -169,7 +169,7 @@ case "$lyx_use_frontend" in
   xforms)
   # for now don't set it for xforms as this is always entered
        FRONTEND="xforms"
   xforms)
   # for now don't set it for xforms as this is always entered
        FRONTEND="xforms"
-       FRONTEND_GUILIB="xforms/*.lo"
+       FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
        FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
        FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
        FRONTEND_INFO=`cat <<EOF
        FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
        FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
        FRONTEND_INFO=`cat <<EOF
index b39b983c48a53d7e5dbbc90f140032ba873fcfcf..28be9e18160805d70d2e708382141cdaf431f7ed 100644 (file)
@@ -14,7 +14,7 @@
 
 #include "Alert.h"
 #include "Alert_pimpl.h"
 
 #include "Alert.h"
 #include "Alert_pimpl.h"
-#include "xforms_helpers.h"
+#include "forms_gettext.h"
 #include "gettext.h"
 
 #include <algorithm>
 #include "gettext.h"
 
 #include <algorithm>
index b8226a15102dee91ee7d4a2dc6ed0fc4565bd9f8..38b169557935d097a3d850cd084f5448025eea32 100644 (file)
@@ -1,3 +1,37 @@
+2002-06-12  Angus Leeming  <leeming@lyx.org>
+
+       * form_*.[Ch]: removed from the repository.
+       * forms/Makefile.am:
+       * forms/fdfix.sh: changes to generate form_*.[Ch] automatically.
+
+       * forms/form_*.fd: use a consistent naming convention for the fdesign
+       generated FD_xyz structs. For example, form_aboutlyx.h now contains:
+       struct FD_aboutlyx;
+       struct FD_aboutlyx_version;
+       struct FD_aboutlyx_credits;
+       struct FD_aboutlyx_license;
+
+       * forms/fdfix[ch].sed: no longer write the build routines for the
+       fdesign generated FD_xyz structs as member methods of the controlling
+       FormXyz class. It's unnecessary and needs patch files in addition to
+       the sed magic to work properly. Thus, the structs above are now
+       generated by routines
+       FD_aboutlyx * build_aboutlyx();
+       FD_aboutlyx_version * build_aboutlyx_version();
+       FD_aboutlyx_credits * build_aboutlyx_credits();
+       FD_aboutlyx_license * build_aboutlyx_license();
+
+       * forms/README: document all the above.
+
+       * forms_fwd.h: new file to forward declare FL_OBJECT, FL_FORM.
+
+       * forms_gettext.[Ch]: new files containing only the scex, idex functions
+       stored previously in xforms_helpers.[Ch].
+
+       * xforms_helpers.[Ch]: removed scex, idex functions.
+
+       * Most other files: minor changes associated with the above.
+       
 2002-06-12  John Levon  <moz@compsoc.man.ac.uk>
 
        * XWorkArea.h:
 2002-06-12  John Levon  <moz@compsoc.man.ac.uk>
 
        * XWorkArea.h:
index 0d912c5aacc7b46f6c9fd5d48349daf81f35c629..fbb4ce3839a6a7fa0550d08a8bfcbfa8d825379f 100644 (file)
 #include "xformsBC.h"
 
 #include "combox.h"       // needed for clean destruction of boost::scoped_ptr
 #include "xformsBC.h"
 
 #include "combox.h"       // needed for clean destruction of boost::scoped_ptr
-#include "form_aboutlyx.h"
-#include "form_bibitem.h"
-#include "form_bibtex.h"
-#include "form_browser.h"
-#include "form_character.h"
-#include "form_citation.h"
-#include "form_error.h"
-#include "form_ert.h"
-#include "form_external.h"
-#include "form_float.h"
-#include "form_forks.h"
-#include "form_graphics.h"
-#include "form_include.h"
-#include "form_index.h"
-#include "form_minipage.h"
-#include "form_paragraph.h"
-#include "form_preamble.h"
-#include "form_print.h"
-#include "form_ref.h"
-#include "form_search.h"
-#include "form_sendto.h"
-#include "form_spellchecker.h"
-#include "form_tabular_create.h"
-#include "form_texinfo.h"
-#include "form_thesaurus.h"
-#include "form_toc.h"
-#include "form_url.h"
+#include "forms/form_aboutlyx.h"
+#include "forms/form_bibitem.h"
+#include "forms/form_bibtex.h"
+#include "forms/form_browser.h"
+#include "forms/form_character.h"
+#include "forms/form_citation.h"
+#include "forms/form_error.h"
+#include "forms/form_ert.h"
+#include "forms/form_external.h"
+#include "forms/form_float.h"
+#include "forms/form_forks.h"
+#include "forms/form_graphics.h"
+#include "forms/form_include.h"
+#include "forms/form_index.h"
+#include "forms/form_minipage.h"
+#include "forms/form_paragraph.h"
+#include "forms/form_preamble.h"
+#include "forms/form_print.h"
+#include "forms/form_ref.h"
+#include "forms/form_search.h"
+#include "forms/form_sendto.h"
+#include "forms/form_spellchecker.h"
+#include "forms/form_tabular_create.h"
+#include "forms/form_texinfo.h"
+#include "forms/form_thesaurus.h"
+#include "forms/form_toc.h"
+#include "forms/form_url.h"
 
 #include "FormAboutlyx.h"
 #include "FormBibitem.h"
 
 #include "FormAboutlyx.h"
 #include "FormBibitem.h"
index 55af9d46bc54006f651deb6b94a36a6b202427b0..1ab9468b7fd4652e18c5a7d876f3487090866172 100644 (file)
@@ -15,6 +15,8 @@
 #include "DropDown.h"
 #include "xforms_helpers.h"
 
 #include "DropDown.h"
 #include "xforms_helpers.h"
 
+#include FORMS_H_LOCATION
+
 #include <iostream>
 #include <cctype>
 
 #include <iostream>
 #include <cctype>
 
index 7521d1b92661b492946eaadfa0dca009a4b61bcc..fd332c55a819697aae15a9f6ff28fa485b7c4186 100644 (file)
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 
-#include "frontends/LyXView.h"
-#include "LString.h"
-
-#include FORMS_H_LOCATION
+#include "forms_fwd.h"
+#include <X11/Xlib.h>
 
 #include <boost/signals/signal1.hpp>
 
 
 #include <boost/signals/signal1.hpp>
 
+#include "LString.h"
 #include <vector>
 
 #include <vector>
 
+class LyXView;
+
 class DropDown {
 public:
        /// constructor
 class DropDown {
 public:
        /// constructor
index 2e8ada7e0602375dd3d60deaf025300c09f7b8dc..8408861306912ec000c87ccbe542be49b6fb1f25 100644 (file)
@@ -22,6 +22,7 @@
 #include "gettext.h"        // _()
 #include "xforms_helpers.h" // formatted
 #include "support/LAssert.h"
 #include "gettext.h"        // _()
 #include "xforms_helpers.h" // formatted
 #include "support/LAssert.h"
+#include FORMS_H_LOCATION
 
 FeedbackController::FeedbackController()
        : warning_posted_(false), message_widget_(0)
 
 FeedbackController::FeedbackController()
        : warning_posted_(false), message_widget_(0)
index ccb410db27e86608c8f227ad217018a76228939e..371b653d7cf559fc0a93cd8c4f6d4a2e19ccb0f7 100644 (file)
@@ -16,7 +16,7 @@
 #ifndef FEEDBACKCONTROLLER_H
 #define FEEDBACKCONTROLLER_H
 
 #ifndef FEEDBACKCONTROLLER_H
 #define FEEDBACKCONTROLLER_H
 
-#include FORMS_H_LOCATION
+#include "forms_fwd.h"
 #include "LString.h"
 
 #ifdef __GNUG__
 #include "LString.h"
 
 #ifdef __GNUG__
index 016232aa1b27470b96b0709827591ebbaa3c4187..9b63cdac382cb914be68a9d573e843a031ea4fb1 100644 (file)
 #include "xformsBC.h"
 #include "ControlAboutlyx.h"
 #include "FormAboutlyx.h"
 #include "xformsBC.h"
 #include "ControlAboutlyx.h"
 #include "FormAboutlyx.h"
-#include "form_aboutlyx.h"
+#include "forms/form_aboutlyx.h"
 #include "xforms_helpers.h"
 #include "xforms_helpers.h"
+#include FORMS_H_LOCATION
 #include "Lsstream.h"
 
 using std::getline;
 
 #include "Lsstream.h"
 
 using std::getline;
 
-typedef FormCB<ControlAboutlyx, FormDB<FD_form_aboutlyx> > base_class;
+typedef FormCB<ControlAboutlyx, FormDB<FD_aboutlyx> > base_class;
 
 FormAboutlyx::FormAboutlyx(ControlAboutlyx & c)
        : base_class(c, _("About LyX"), false)
 
 FormAboutlyx::FormAboutlyx(ControlAboutlyx & c)
        : base_class(c, _("About LyX"), false)
@@ -31,17 +32,17 @@ FormAboutlyx::FormAboutlyx(ControlAboutlyx & c)
 
 void FormAboutlyx::build()
 {
 
 void FormAboutlyx::build()
 {
-       dialog_.reset(build_aboutlyx());
+       dialog_.reset(build_aboutlyx(this));
 
        // create version tab
 
        // create version tab
-       version_.reset(build_tab_version());
+       version_.reset(build_aboutlyx_version(this));
        fl_set_object_label(version_->text_version,
                            controller().getVersion().c_str());
        fl_set_object_label(version_->text_copyright,
                            controller().getCopyright().c_str());
 
        // create license and warranty tab
        fl_set_object_label(version_->text_version,
                            controller().getVersion().c_str());
        fl_set_object_label(version_->text_copyright,
                            controller().getCopyright().c_str());
 
        // create license and warranty tab
-       license_.reset(build_tab_license());
+       license_.reset(build_aboutlyx_license(this));
 
        string str = formatted(controller().getLicense(),
                               license_->text_license->w-10);
 
        string str = formatted(controller().getLicense(),
                               license_->text_license->w-10);
@@ -52,7 +53,7 @@ void FormAboutlyx::build()
        fl_set_object_label(license_->text_warranty, str.c_str());
 
        // create credits
        fl_set_object_label(license_->text_warranty, str.c_str());
 
        // create credits
-       credits_.reset(build_tab_credits());
+       credits_.reset(build_aboutlyx_credits(this));
        stringstream ss;
        fl_add_browser_line(credits_->browser_credits,
                            controller().getCredits(ss).str().c_str());
        stringstream ss;
        fl_add_browser_line(credits_->browser_credits,
                            controller().getCredits(ss).str().c_str());
index 540e01d7667a1d1ea6e774e9770aee99d64762c1..6156600a4a1d8b0135ebe25e02ac3309c0c3abc4 100644 (file)
 #include <boost/scoped_ptr.hpp>
 
 class ControlAboutlyx;
 #include <boost/scoped_ptr.hpp>
 
 class ControlAboutlyx;
-struct FD_form_aboutlyx;
-struct FD_form_tab_version;
-struct FD_form_tab_credits;
-struct FD_form_tab_license;
+struct FD_aboutlyx;
+struct FD_aboutlyx_version;
+struct FD_aboutlyx_credits;
+struct FD_aboutlyx_license;
 
 /** This class provides an XForms implementation of the FormAboutlyx Dialog.
  */
 
 /** This class provides an XForms implementation of the FormAboutlyx Dialog.
  */
-class FormAboutlyx : public FormCB<ControlAboutlyx, FormDB<FD_form_aboutlyx> > {
+class FormAboutlyx : public FormCB<ControlAboutlyx, FormDB<FD_aboutlyx> > {
 public:
        ///
        FormAboutlyx(ControlAboutlyx &);
 public:
        ///
        FormAboutlyx(ControlAboutlyx &);
@@ -42,21 +42,12 @@ private:
        /// Build the dialog
        virtual void build();
 
        /// Build the dialog
        virtual void build();
 
-       /// Fdesign generated method
-       FD_form_aboutlyx * build_aboutlyx();
-       ///
-       FD_form_tab_version * build_tab_version();
-       ///
-       FD_form_tab_credits * build_tab_credits();
-       ///
-       FD_form_tab_license * build_tab_license();
-
        /// Real GUI implementation.
        /// Real GUI implementation.
-       boost::scoped_ptr<FD_form_tab_version> version_;
+       boost::scoped_ptr<FD_aboutlyx_version> version_;
        ///
        ///
-       boost::scoped_ptr<FD_form_tab_credits> credits_;
+       boost::scoped_ptr<FD_aboutlyx_credits> credits_;
        ///
        ///
-       boost::scoped_ptr<FD_form_tab_license> license_;
+       boost::scoped_ptr<FD_aboutlyx_license> license_;
 };
 
 #endif // FORMABOUTLYX_H
 };
 
 #endif // FORMABOUTLYX_H
index a8cf7224e5f9981150a16b391ceff6482804f938..ce6263346ca35fecfb9ea86735df725511ae73c9 100644 (file)
@@ -18,6 +18,7 @@
 #include "xforms_resize.h"
 #include "Tooltips.h"
 #include "support/LAssert.h"
 #include "xforms_resize.h"
 #include "Tooltips.h"
 #include "support/LAssert.h"
+#include FORMS_H_LOCATION
 
 extern "C" {
 
 
 extern "C" {
 
index 0c962eb811bc04903a20ae6bfaf302de1b272177..42855f2483507282dbdeb5cb5a99372836817f35 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <boost/scoped_ptr.hpp>
 
 
 #include <boost/scoped_ptr.hpp>
 
-#include FORMS_H_LOCATION // Can't forward-declare FL_FORM
+#include "forms_fwd.h"
 
 class xformsBC;
 class Tooltips;
 
 class xformsBC;
 class Tooltips;
index 89bfc0b0da67f8d4069d45cc5b2ad3b030ff0ae2..0fd20eee57f856e1aed913f15ae7c180f95441d3 100644 (file)
@@ -17,6 +17,8 @@
 #include "xformsBC.h"
 #include "xforms_resize.h"
 #include "Tooltips.h"
 #include "xformsBC.h"
 #include "xforms_resize.h"
 #include "Tooltips.h"
+#include FORMS_H_LOCATION
+
 #include "lyxrc.h"
 
 #include "frontends/LyXView.h"
 #include "lyxrc.h"
 
 #include "frontends/LyXView.h"
index d87b554d7bb10c572ac7b48150eb34628cb0e3ab..ddcae8f4441aa32b7f95eedaa2b26c292845e5f3 100644 (file)
@@ -25,7 +25,7 @@
 #include "xformsBC.h"
 #include "FeedbackController.h"
 
 #include "xformsBC.h"
 #include "FeedbackController.h"
 
-#include FORMS_H_LOCATION
+#include "forms_fwd.h"
 
 #include <boost/signals/trackable.hpp>
 
 
 #include <boost/signals/trackable.hpp>
 
index a4a6de241a764ea3d75ba5cf8fff16404471b265..6057263184d32652140ee226b5fc86598b261acb 100644 (file)
 #include "xformsBC.h"
 #include "ControlBibitem.h"
 #include "FormBibitem.h"
 #include "xformsBC.h"
 #include "ControlBibitem.h"
 #include "FormBibitem.h"
-#include "form_bibitem.h"
+#include "forms/form_bibitem.h"
+#include FORMS_H_LOCATION
 #include "gettext.h"
 #include "support/lstrings.h" // compare
 
 #include "gettext.h"
 #include "support/lstrings.h" // compare
 
-typedef FormCB<ControlBibitem, FormDB<FD_form_bibitem> > base_class;
+typedef FormCB<ControlBibitem, FormDB<FD_bibitem> > base_class;
 
 FormBibitem::FormBibitem(ControlBibitem & c)
        : base_class(c, _("Bibliography Entry"))
 
 FormBibitem::FormBibitem(ControlBibitem & c)
        : base_class(c, _("Bibliography Entry"))
@@ -28,7 +29,7 @@ FormBibitem::FormBibitem(ControlBibitem & c)
 
 void FormBibitem::build()
 {
 
 void FormBibitem::build()
 {
-       dialog_.reset(build_bibitem());
+       dialog_.reset(build_bibitem(this));
 
        fl_set_input_return(dialog_->input_key,   FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_label, FL_RETURN_CHANGED);
 
        fl_set_input_return(dialog_->input_key,   FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_label, FL_RETURN_CHANGED);
index 7f8b1c700e61ef2225c3665b6cca65fe343de217..bc3be3b2dc3ac09a1d0c537beac79a7a6a492a95 100644 (file)
 #include "FormBase.h"
 
 class ControlBibitem;
 #include "FormBase.h"
 
 class ControlBibitem;
-struct FD_form_bibitem;
+struct FD_bibitem;
 
 /**
  * For bibliography entry editing
  */
 
 /**
  * For bibliography entry editing
  */
-class FormBibitem : public FormCB<ControlBibitem, FormDB<FD_form_bibitem> > {
+class FormBibitem : public FormCB<ControlBibitem, FormDB<FD_bibitem> > {
 public:
        ///
        FormBibitem(ControlBibitem &);
 public:
        ///
        FormBibitem(ControlBibitem &);
@@ -37,9 +37,6 @@ private:
        virtual void update();
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
        virtual void update();
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
-
-       /// Fdesign generated method
-       FD_form_bibitem * build_bibitem();
 };
 
 #endif // FORMBIBITEM_H
 };
 
 #endif // FORMBIBITEM_H
index 6ef94c40188b7bff1e967b0a1669aa1eab10902d..2694e4137366a25ffa8205e39da5a38433865050 100644 (file)
 #include "xformsBC.h"
 #include "ControlBibtex.h"
 #include "FormBibtex.h"
 #include "xformsBC.h"
 #include "ControlBibtex.h"
 #include "FormBibtex.h"
-#include "form_bibtex.h"
+#include "forms/form_bibtex.h"
 #include "Tooltips.h"
 #include "xforms_helpers.h"
 #include "Tooltips.h"
 #include "xforms_helpers.h"
+#include FORMS_H_LOCATION
+
 #include "helper_funcs.h"
 #include "gettext.h"
 #include "debug.h"
 #include "helper_funcs.h"
 #include "gettext.h"
 #include "debug.h"
@@ -31,7 +33,7 @@ using std::vector;
 using std::sort;
 
 
 using std::sort;
 
 
-typedef FormCB<ControlBibtex, FormDB<FD_form_bibtex> > base_class;
+typedef FormCB<ControlBibtex, FormDB<FD_bibtex> > base_class;
 
 FormBibtex::FormBibtex(ControlBibtex & c)
        : base_class(c, _("BibTeX Database"))
 
 FormBibtex::FormBibtex(ControlBibtex & c)
        : base_class(c, _("BibTeX Database"))
@@ -40,7 +42,7 @@ FormBibtex::FormBibtex(ControlBibtex & c)
 
 void FormBibtex::build()
 {
 
 void FormBibtex::build()
 {
-       dialog_.reset(build_bibtex());
+       dialog_.reset(build_bibtex(this));
 
        fl_set_input_return(dialog_->input_database, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_style, FL_RETURN_CHANGED);
 
        fl_set_input_return(dialog_->input_database, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_style, FL_RETURN_CHANGED);
index c92edfd275f547d1a38c388dc33546f940622ef6..f177e7203345a87adb060571a357006ab86baa03 100644 (file)
 #include "FormBase.h"
 
 class ControlBibtex;
 #include "FormBase.h"
 
 class ControlBibtex;
-struct FD_form_bibtex;
+struct FD_bibtex;
 
 /**
  * For bibtex database setting
  */
 
 /**
  * For bibtex database setting
  */
-class FormBibtex : public FormCB<ControlBibtex, FormDB<FD_form_bibtex> > {
+class FormBibtex : public FormCB<ControlBibtex, FormDB<FD_bibtex> > {
 public:
        ///
        FormBibtex(ControlBibtex &);
 public:
        ///
        FormBibtex(ControlBibtex &);
@@ -37,9 +37,6 @@ private:
        virtual void update();
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
        virtual void update();
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
-
-       /// Fdesign generated method
-       FD_form_bibtex * build_bibtex();
 };
 
 #endif // FORMBIBTEX_H
 };
 
 #endif // FORMBIBTEX_H
index 151f2747d00ac4cc4ab49c8b5d68754cfc276a9f..3715242892222b2f3c1646376bed434434fc1ab7 100644 (file)
 #endif
 
 #include "FormBrowser.h"
 #endif
 
 #include "FormBrowser.h"
-#include "form_browser.h"
+#include "forms/form_browser.h"
 #include "xformsBC.h"
 
 FormBrowser::FormBrowser(ControlButtons & c, string const & t, bool allowResize)
 #include "xformsBC.h"
 
 FormBrowser::FormBrowser(ControlButtons & c, string const & t, bool allowResize)
-       : FormDB<FD_form_browser>(c, t, allowResize)
+       : FormDB<FD_browser>(c, t, allowResize)
 {}
 
 
 void FormBrowser::build()
 {
 {}
 
 
 void FormBrowser::build()
 {
-       dialog_.reset(build_browser());
+       dialog_.reset(build_browser(this));
 
        // Manage the close button
        bc().setCancel(dialog_->button_close);
 
        // Manage the close button
        bc().setCancel(dialog_->button_close);
index 884b8ed1cbfe1c4aa1268731cafac9972987d3d4..064ed23e56285177dbe692daaadef16e0f094d18 100644 (file)
@@ -21,9 +21,9 @@
  * This class provides an XForms implementation of a read only
  * text browser.
  */
  * This class provides an XForms implementation of a read only
  * text browser.
  */
-struct FD_form_browser;
+struct FD_browser;
 
 
-class FormBrowser : public FormDB<FD_form_browser> {
+class FormBrowser : public FormDB<FD_browser> {
 public:
        ///
        FormBrowser(ControlButtons &, string const &, bool allowResize=true);
 public:
        ///
        FormBrowser(ControlButtons &, string const &, bool allowResize=true);
@@ -31,8 +31,6 @@ public:
 private:
        /// Build the dialog.
        virtual void build();
 private:
        /// Build the dialog.
        virtual void build();
-       /// generated build function
-       FD_form_browser * build_browser();
 };
 
 #endif // FORMBROWSER_H
 };
 
 #endif // FORMBROWSER_H
index 2c6c2ae28abadf12a52ce43e6e9250a60da53178..2968d398cd09538f3945e4f30e336f88ec305a10 100644 (file)
 #include "xformsBC.h"
 #include "ControlCharacter.h"
 #include "FormCharacter.h"
 #include "xformsBC.h"
 #include "ControlCharacter.h"
 #include "FormCharacter.h"
-#include "form_character.h"
+#include "forms/form_character.h"
 #include "gettext.h"
 #include "combox.h"
 #include "helper_funcs.h"
 #include "xforms_helpers.h"
 #include "gettext.h"
 #include "combox.h"
 #include "helper_funcs.h"
 #include "xforms_helpers.h"
+#include FORMS_H_LOCATION
+
 #include "frnt_lang.h"
 
 #include "support/lstrings.h"
 #include "frnt_lang.h"
 
 #include "support/lstrings.h"
@@ -32,14 +34,14 @@ using std::find;
 
 using namespace frnt;
 
 
 using namespace frnt;
 
-typedef FormCB<ControlCharacter, FormDB<FD_form_character> > base_class;
+typedef FormCB<ControlCharacter, FormDB<FD_character> > base_class;
 
 FormCharacter::FormCharacter(ControlCharacter & c)
        : base_class(c, _("Character Layout"), false)
 {}
 
 
 
 FormCharacter::FormCharacter(ControlCharacter & c)
        : base_class(c, _("Character Layout"), false)
 {}
 
 
-void FormCharacter::ComboInputCB(int, void * v, Combox * combox)
+void FormCharacter::ComboInputCB(int, void * v, Combox *)
 {
        FormCharacter * pre = static_cast<FormCharacter*>(v);
        // must use input() directly, to avoid treating the Combox
 {
        FormCharacter * pre = static_cast<FormCharacter*>(v);
        // must use input() directly, to avoid treating the Combox
@@ -49,7 +51,7 @@ void FormCharacter::ComboInputCB(int, void * v, Combox * combox)
 
 void FormCharacter::build()
 {
 
 void FormCharacter::build()
 {
-       dialog_.reset(build_character());
+       dialog_.reset(build_character(this));
 
        vector<FamilyPair>   const family = getFamilyData();
        vector<SeriesPair>   const series = getSeriesData();
 
        vector<FamilyPair>   const family = getFamilyData();
        vector<SeriesPair>   const series = getSeriesData();
index da290e13eb095f2e4ff41f8343a2b5fd4bfd60a2..daa890b2905d7680847a9f34c95435f74f6c54b6 100644 (file)
@@ -24,7 +24,7 @@
 #include <boost/scoped_ptr.hpp>
 
 class Combox;
 #include <boost/scoped_ptr.hpp>
 
 class Combox;
-struct FD_form_character;
+struct FD_character;
 
 /**
  * This class provides an XForms implementation of the Character Dialog.
 
 /**
  * This class provides an XForms implementation of the Character Dialog.
@@ -32,7 +32,7 @@ struct FD_form_character;
  * in their documents.
  */
 class FormCharacter
  * in their documents.
  */
 class FormCharacter
-       : public FormCB<ControlCharacter, FormDB<FD_form_character> > {
+       : public FormCB<ControlCharacter, FormDB<FD_character> > {
 public:
        ///
        FormCharacter(ControlCharacter &);
 public:
        ///
        FormCharacter(ControlCharacter &);
@@ -54,9 +54,6 @@ private:
            combox is changed */
        static void ComboInputCB(int, void *, Combox *);
 
            combox is changed */
        static void ComboInputCB(int, void *, Combox *);
 
-       /// Fdesign generated method
-       FD_form_character * build_character();
-
        ///
        boost::scoped_ptr<Combox> combo_language2_;
        ///
        ///
        boost::scoped_ptr<Combox> combo_language2_;
        ///
index 5fd48d794de24510e9a2345f3e9a9e7759490911..f6ccd890aa28bda699137891516ea57dca6276e5 100644 (file)
 #include "xformsBC.h"
 #include "ControlCitation.h"
 #include "FormCitation.h"
 #include "xformsBC.h"
 #include "ControlCitation.h"
 #include "FormCitation.h"
-#include "form_citation.h"
+#include "forms/form_citation.h"
 #include "Tooltips.h"
 #include "helper_funcs.h"
 #include "xforms_helpers.h"
 #include "Tooltips.h"
 #include "helper_funcs.h"
 #include "xforms_helpers.h"
+#include FORMS_H_LOCATION
+
 #include "gettext.h"
 #include "support/LAssert.h"
 #include "support/lstrings.h"
 #include "gettext.h"
 #include "support/LAssert.h"
 #include "support/lstrings.h"
@@ -42,7 +44,7 @@ int string_width(string const & str)
 }
 
 
 }
 
 
-void fillChoice(FD_form_citation * dialog, vector<string> vec)
+void fillChoice(FD_citation * dialog, vector<string> vec)
 {
        // Check whether the current contents of the browser will be
        // changed by loading the contents of the vec...
 {
        // Check whether the current contents of the browser will be
        // changed by loading the contents of the vec...
@@ -84,7 +86,7 @@ void fillChoice(FD_form_citation * dialog, vector<string> vec)
 }
 
 
 }
 
 
-void updateStyle(FD_form_citation * dialog, string command)
+void updateStyle(FD_citation * dialog, string command)
 {
        // Find the style of the citekeys
        vector<biblio::CiteStyle> const & styles =
 {
        // Find the style of the citekeys
        vector<biblio::CiteStyle> const & styles =
@@ -110,7 +112,7 @@ void updateStyle(FD_form_citation * dialog, string command)
 } // namespace anon
 
 
 } // namespace anon
 
 
-typedef FormCB<ControlCitation, FormDB<FD_form_citation> > base_class;
+typedef FormCB<ControlCitation, FormDB<FD_citation> > base_class;
 
 
 FormCitation::FormCitation(ControlCitation & c)
 
 
 FormCitation::FormCitation(ControlCitation & c)
@@ -154,7 +156,7 @@ void FormCitation::hide()
 
 void FormCitation::build()
 {
 
 void FormCitation::build()
 {
-       dialog_.reset(build_citation());
+       dialog_.reset(build_citation(this));
 
        fl_set_input_return(dialog_->input_after,  FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_before, FL_RETURN_CHANGED);
 
        fl_set_input_return(dialog_->input_after,  FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_before, FL_RETURN_CHANGED);
index 1797c13e05a3956eb55c92e72a478e83c1602427..0cb8948c9404f33b507269c32c0677aec5a76bab 100644 (file)
@@ -20,9 +20,9 @@
 /** This class provides an XForms implementation of the Citation Dialog.
  */
 class ControlCitation;
 /** This class provides an XForms implementation of the Citation Dialog.
  */
 class ControlCitation;
-struct FD_form_citation;
+struct FD_citation;
 
 
-class FormCitation : public FormCB<ControlCitation, FormDB<FD_form_citation> > {
+class FormCitation : public FormCB<ControlCitation, FormDB<FD_citation> > {
 public:
        ///
        FormCitation(ControlCitation &);
 public:
        ///
        FormCitation(ControlCitation &);
@@ -47,9 +47,6 @@ private:
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
-       /// Fdesign generated method
-       FD_form_citation * build_citation();
-
        /// search for a citation
        void findBiblio(biblio::Direction const dir);
 
        /// search for a citation
        void findBiblio(biblio::Direction const dir);
 
index 4eb683cf31db80be2b6c25d4bd2d4a26b1214981..83f6a252485cd41214a0b701d19f0306b19e3a4a 100644 (file)
@@ -16,7 +16,7 @@
 #endif
 
 #include "FormDocument.h"
 #endif
 
 #include "FormDocument.h"
-#include "form_document.h"
+#include "forms/form_document.h"
 #include "Alert.h"
 #include "Dialogs.h"
 #include "lyxtextclasslist.h"
 #include "Alert.h"
 #include "Dialogs.h"
 #include "lyxtextclasslist.h"
@@ -46,6 +46,8 @@
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
+#include FORMS_H_LOCATION
+
 #include <boost/bind.hpp>
 
 #include <functional>
 #include <boost/bind.hpp>
 
 #include <functional>
@@ -92,7 +94,7 @@ void FormDocument::build()
        int n;
 
        // the tabbed folder
        int n;
 
        // the tabbed folder
-       dialog_.reset(build_tabbed_document());
+       dialog_.reset(build_document(this));
 
        // Allow the base class to control messages
        setMessageWidget(dialog_->text_warning);
 
        // Allow the base class to control messages
        setMessageWidget(dialog_->text_warning);
@@ -106,7 +108,7 @@ void FormDocument::build()
        bc().addReadOnly (dialog_->button_reset_defaults);
 
        // the document paper form
        bc().addReadOnly (dialog_->button_reset_defaults);
 
        // the document paper form
-       paper_.reset(build_doc_paper());
+       paper_.reset(build_document_paper(this));
        fl_addto_choice(paper_->choice_papersize,
                        _(" Default | Custom | US letter | US legal "
                          "| US executive | A3 | A4 | A5 | B3 | B4 | B5 "));
        fl_addto_choice(paper_->choice_papersize,
                        _(" Default | Custom | US letter | US legal "
                          "| US executive | A3 | A4 | A5 | B3 | B4 | B5 "));
@@ -180,7 +182,7 @@ void FormDocument::build()
        bc().addReadOnly (paper_->input_foot_skip);
 
        // the document class form
        bc().addReadOnly (paper_->input_foot_skip);
 
        // the document class form
-       class_.reset(build_doc_class());
+       class_.reset(build_document_class(this));
 
        FL_OBJECT * obj;
        // The language is a combo-box and has to be inserted manually
 
        FL_OBJECT * obj;
        // The language is a combo-box and has to be inserted manually
@@ -238,7 +240,7 @@ void FormDocument::build()
        bc().addReadOnly (class_->input_doc_spacing);
 
        // the document language form
        bc().addReadOnly (class_->input_doc_spacing);
 
        // the document language form
-       language_.reset(build_doc_language());
+       language_.reset(build_document_language(this));
        fl_addto_choice(language_->choice_inputenc,
                        "default|auto|latin1|latin2|latin3|latin4|latin5|latin9"
                        "|koi8-r|koi8-u|cp866|cp1251|iso88595");
        fl_addto_choice(language_->choice_inputenc,
                        "default|auto|latin1|latin2|latin3|latin4|latin5|latin9"
                        "|koi8-r|koi8-u|cp866|cp1251|iso88595");
@@ -275,7 +277,7 @@ void FormDocument::build()
        bc().addReadOnly (language_->radio_double);
 
        // the document options form
        bc().addReadOnly (language_->radio_double);
 
        // the document options form
-       options_.reset(build_doc_options());
+       options_.reset(build_document_options(this));
        fl_set_input_return(options_->input_float_placement, FL_RETURN_CHANGED);
        setPrehandler(options_->input_float_placement);
 
        fl_set_input_return(options_->input_float_placement, FL_RETURN_CHANGED);
        setPrehandler(options_->input_float_placement);
 
@@ -301,7 +303,7 @@ void FormDocument::build()
        bc_.addReadOnly (options_->choice_postscript_driver);
 
        // the document bullets form
        bc_.addReadOnly (options_->choice_postscript_driver);
 
        // the document bullets form
-       bullets_.reset(build_doc_bullet());
+       bullets_.reset(build_document_bullet(this));
        fl_addto_choice(bullets_->choice_bullet_size,
                        _(" default | tiny | script | footnote | small |"
                          " normal | large | Large | LARGE | huge | Huge"));
        fl_addto_choice(bullets_->choice_bullet_size,
                        _(" default | tiny | script | footnote | small |"
                          " normal | large | Large | LARGE | huge | Huge"));
@@ -422,39 +424,28 @@ bool saveParamsAsDefault(BufferParams const &params)
 } //namespace
 
 
 } //namespace
 
 
-bool FormDocument::input(FL_OBJECT * ob, long data)
+bool FormDocument::input(FL_OBJECT * ob, long)
 {
 {
-       State cb = static_cast<State>(data);
-
-       switch (cb) {
-       case CHECKCHOICECLASS:
+       if (ob == class_->choice_doc_class) {
                CheckChoiceClass(ob, 0);
                CheckChoiceClass(ob, 0);
-               break;
-       case CHOICEBULLETSIZE:
+       } else if (ob == bullets_->choice_bullet_size) {
                ChoiceBulletSize(ob, 0);
                ChoiceBulletSize(ob, 0);
-               break;
-       case INPUTBULLETLATEX:
+       } else if (ob == bullets_->input_bullet_latex) {
                InputBulletLaTeX(ob, 0);
                InputBulletLaTeX(ob, 0);
-               break;
-       case BULLETDEPTH1:
-       case BULLETDEPTH2:
-       case BULLETDEPTH3:
-       case BULLETDEPTH4:
-               BulletDepth(ob, cb);
-               break;
-       case BULLETPANEL1:
-       case BULLETPANEL2:
-       case BULLETPANEL3:
-       case BULLETPANEL4:
-       case BULLETPANEL5:
-       case BULLETPANEL6:
-               BulletPanel(ob, cb);
-               break;
-       case BULLETBMTABLE:
+       } else if (ob == bullets_->radio_bullet_depth_1 ||
+                  ob == bullets_->radio_bullet_depth_2 ||
+                  ob == bullets_->radio_bullet_depth_3 ||
+                  ob == bullets_->radio_bullet_depth_4) {
+               BulletDepth(ob);
+       } else if (ob == bullets_->radio_bullet_panel_standard ||
+                  ob == bullets_->radio_bullet_panel_maths ||
+                  ob == bullets_->radio_bullet_panel_ding1 ||
+                  ob == bullets_->radio_bullet_panel_ding2 ||
+                  ob == bullets_->radio_bullet_panel_ding3 ||
+                  ob == bullets_->radio_bullet_panel_ding4) {
+               BulletPanel(ob);
+       } else if (ob == bullets_->bmtable_bullet_panel) {
                BulletBMTable(ob, 0);
                BulletBMTable(ob, 0);
-               break;
-       default:
-               break;
        }
 
        bool const length_input = fl_get_choice(class_->choice_doc_skip) == 4;
        }
 
        bool const length_input = fl_get_choice(class_->choice_doc_skip) == 4;
@@ -647,18 +638,7 @@ bool FormDocument::input(FL_OBJECT * ob, long data)
                setEnabled(paper_->choice_foot_skip_units,     use_geom);
        }
 
                setEnabled(paper_->choice_foot_skip_units,     use_geom);
        }
 
-       switch (data) {
-       case INPUT:
-       case CHECKCHOICECLASS:
-       case CHOICEBULLETSIZE:
-       case INPUTBULLETLATEX:
-       case BULLETBMTABLE:
-               return CheckDocumentInput(ob, 0);
-       default:
-               break;
-       }
-
-       return true;
+       return CheckDocumentInput(ob, 0);
 }
 
 
 }
 
 
@@ -1346,7 +1326,7 @@ void FormDocument::InputBulletLaTeX(FL_OBJECT *, long)
 }
 
 
 }
 
 
-void FormDocument::BulletDepth(FL_OBJECT * ob, State cb)
+void FormDocument::BulletDepth(FL_OBJECT * ob)
 {
        /* Should I do the following:                                 */
        /*  1. change to the panel that the current bullet belongs in */
 {
        /* Should I do the following:                                 */
        /*  1. change to the panel that the current bullet belongs in */
@@ -1359,13 +1339,13 @@ void FormDocument::BulletDepth(FL_OBJECT * ob, State cb)
        BufferParams & param = lv_->buffer()->params;
 
        int data = 0;
        BufferParams & param = lv_->buffer()->params;
 
        int data = 0;
-       if (cb == BULLETDEPTH1)
+       if (ob == bullets_->radio_bullet_depth_1)
                data = 0;
                data = 0;
-       else if (cb == BULLETDEPTH2)
+       else if (ob == bullets_->radio_bullet_depth_2)
                data = 1;
                data = 1;
-       else if (cb == BULLETDEPTH3)
+       else if (ob == bullets_->radio_bullet_depth_3)
                data = 2;
                data = 2;
-       else if (cb == BULLETDEPTH4)
+       else if (ob == bullets_->radio_bullet_depth_4)
                data = 3;
 
        switch (fl_get_button_numb(ob)) {
                data = 3;
 
        switch (fl_get_button_numb(ob)) {
@@ -1382,23 +1362,23 @@ void FormDocument::BulletDepth(FL_OBJECT * ob, State cb)
 }
 
 
 }
 
 
-void FormDocument::BulletPanel(FL_OBJECT * /*ob*/, State cb)
+void FormDocument::BulletPanel(FL_OBJECT * ob)
 {
        /* Here we have to change the background pixmap to that selected */
        /* by the user. (eg. standard.xpm, psnfss1.xpm etc...)           */
 
        int data = 0;
 {
        /* Here we have to change the background pixmap to that selected */
        /* by the user. (eg. standard.xpm, psnfss1.xpm etc...)           */
 
        int data = 0;
-       if (cb == BULLETPANEL1)
+       if (ob == bullets_->radio_bullet_panel_standard)
                data = 0;
                data = 0;
-       else if (cb == BULLETPANEL2)
+       else if (ob == bullets_->radio_bullet_panel_maths)
                data = 1;
                data = 1;
-       else if (cb == BULLETPANEL3)
+       else if (ob == bullets_->radio_bullet_panel_ding2)
                data = 2;
                data = 2;
-       else if (cb == BULLETPANEL4)
+       else if (ob == bullets_->radio_bullet_panel_ding3)
                data = 3;
                data = 3;
-       else if (cb == BULLETPANEL5)
+       else if (ob == bullets_->radio_bullet_panel_ding4)
                data = 4;
                data = 4;
-       else if (cb == BULLETPANEL6)
+       else if (ob == bullets_->radio_bullet_panel_ding1)
                data = 5;
 
        if (data != current_bullet_panel) {
                data = 5;
 
        if (data != current_bullet_panel) {
@@ -1408,32 +1388,23 @@ void FormDocument::BulletPanel(FL_OBJECT * /*ob*/, State cb)
                /* free the current pixmap */
                fl_free_bmtable_pixmap(bullets_->bmtable_bullet_panel);
                string new_panel;
                /* free the current pixmap */
                fl_free_bmtable_pixmap(bullets_->bmtable_bullet_panel);
                string new_panel;
-               switch (cb) {
-                       /* display the new one */
-               case BULLETPANEL1 :
+               if (ob == bullets_->radio_bullet_panel_standard) {
                        new_panel = "standard";
                        new_panel = "standard";
-                       break;
-               case BULLETPANEL2 :
+               } else if (ob == bullets_->radio_bullet_panel_maths ) {
                        new_panel = "amssymb";
                        new_panel = "amssymb";
-                       break;
-               case BULLETPANEL3 :
+               } else if (ob == bullets_->radio_bullet_panel_ding2) {
                        new_panel = "psnfss1";
                        new_panel = "psnfss1";
-                       break;
-               case BULLETPANEL4 :
+               } else if (ob == bullets_->radio_bullet_panel_ding3) {
                        new_panel = "psnfss2";
                        new_panel = "psnfss2";
-                       break;
-               case BULLETPANEL5 :
+               } else if (ob == bullets_->radio_bullet_panel_ding4) {
                        new_panel = "psnfss3";
                        new_panel = "psnfss3";
-                       break;
-               case BULLETPANEL6 :
+               } else if (ob == bullets_->radio_bullet_panel_ding1) {
                        new_panel = "psnfss4";
                        new_panel = "psnfss4";
-                       break;
-               default :
+               } else {
                        /* something very wrong happened */
                        // play it safe for now but should be an exception
                        current_bullet_panel = 0;  // standard panel
                        new_panel = "standard";
                        /* something very wrong happened */
                        // play it safe for now but should be an exception
                        current_bullet_panel = 0;  // standard panel
                        new_panel = "standard";
-                       break;
                }
                new_panel += ".xpm";
                fl_set_bmtable_pixmap_file(bullets_->bmtable_bullet_panel, 6, 6,
                }
                new_panel += ".xpm";
                fl_set_bmtable_pixmap_file(bullets_->bmtable_bullet_panel, 6, 6,
index de97f08934ddf8ba147924eac7dffb4b111f7959..429fa6632535c1f7c4ba029cc54eca663973e8f9 100644 (file)
 class Combox;
 class BufferParams;
 
 class Combox;
 class BufferParams;
 
-struct FD_form_tabbed_document;
-struct FD_form_doc_paper;
-struct FD_form_doc_class;
-struct FD_form_doc_language;
-struct FD_form_doc_options;
-struct FD_form_doc_bullet;
+struct FD_document;
+struct FD_document_paper;
+struct FD_document_class;
+struct FD_document_language;
+struct FD_document_options;
+struct FD_document_bullet;
 
 /** This class provides an XForms implementation of the FormDocument dialog.
     The table-layout-form here changes values for latex-tabulars
 
 /** This class provides an XForms implementation of the FormDocument dialog.
     The table-layout-form here changes values for latex-tabulars
@@ -39,39 +39,6 @@ public:
        ///
        static void ComboInputCB(int, void *, Combox *);
 private:
        ///
        static void ComboInputCB(int, void *, Combox *);
 private:
-       ///
-       enum State {
-               ///
-               INPUT,
-               ///
-               CHECKCHOICECLASS,
-               ///
-               CHOICEBULLETSIZE,
-               ///
-               INPUTBULLETLATEX,
-               ///
-               BULLETDEPTH1,
-               ///
-               BULLETDEPTH2,
-               ///
-               BULLETDEPTH3,
-               ///
-               BULLETDEPTH4,
-               ///
-               BULLETPANEL1,
-               ///
-               BULLETPANEL2,
-               ///
-               BULLETPANEL3,
-               ///
-               BULLETPANEL4,
-               ///
-               BULLETPANEL5,
-               ///
-               BULLETPANEL6,
-               ///
-               BULLETBMTABLE
-       };
        /// Pointer to the actual instantiation of the ButtonController.
        virtual xformsBC & bc();
        /** Redraw the form (on receipt of a Signal indicating, for example,
        /// Pointer to the actual instantiation of the ButtonController.
        virtual xformsBC & bc();
        /** Redraw the form (on receipt of a Signal indicating, for example,
@@ -98,9 +65,9 @@ private:
        ///
        void InputBulletLaTeX(FL_OBJECT * ob, long);
        ///
        ///
        void InputBulletLaTeX(FL_OBJECT * ob, long);
        ///
-       void BulletDepth(FL_OBJECT * ob, State);
+       void BulletDepth(FL_OBJECT * ob);
        ///
        ///
-       void BulletPanel(FL_OBJECT * ob, State);
+       void BulletPanel(FL_OBJECT * ob);
        ///
        void BulletBMTable(FL_OBJECT * ob, long);
        ///
        ///
        void BulletBMTable(FL_OBJECT * ob, long);
        ///
@@ -145,31 +112,18 @@ private:
        ///
        void bullets_apply();
 
        ///
        void bullets_apply();
 
-       /// Fdesign generated methods
-       FD_form_tabbed_document * build_tabbed_document();
-       ///
-       FD_form_doc_paper * build_doc_paper();
-       ///
-       FD_form_doc_class * build_doc_class();
-       ///
-       FD_form_doc_language * build_doc_language();
-       ///
-       FD_form_doc_options * build_doc_options();
-       ///
-       FD_form_doc_bullet * build_doc_bullet();
-
        /// Real GUI implementation.
        /// Real GUI implementation.
-       boost::scoped_ptr<FD_form_tabbed_document> dialog_;
+       boost::scoped_ptr<FD_document> dialog_;
        ///
        ///
-       boost::scoped_ptr<FD_form_doc_paper>       paper_;
+       boost::scoped_ptr<FD_document_paper>    paper_;
        ///
        ///
-       boost::scoped_ptr<FD_form_doc_class>       class_;
+       boost::scoped_ptr<FD_document_class>    class_;
        ///
        ///
-       boost::scoped_ptr<FD_form_doc_language>    language_;
+       boost::scoped_ptr<FD_document_language> language_;
        ///
        ///
-       boost::scoped_ptr<FD_form_doc_options>     options_;
+       boost::scoped_ptr<FD_document_options>  options_;
        ///
        ///
-       boost::scoped_ptr<FD_form_doc_bullet>      bullets_;
+       boost::scoped_ptr<FD_document_bullet>   bullets_;
        ///
        int ActCell;
        ///
        ///
        int ActCell;
        ///
index b9ee2f9a1639caf4f84f90e1acf7589e9fdbeea9..4fedc68daba98128bb6e7de3fb39fabc575c43a5 100644 (file)
 #include "xformsBC.h"
 #include "ControlERT.h"
 #include "FormERT.h"
 #include "xformsBC.h"
 #include "ControlERT.h"
 #include "FormERT.h"
-#include "form_ert.h"
+#include "forms/form_ert.h"
 #include "support/lstrings.h"
 #include "helper_funcs.h"
 #include "debug.h"
 #include "support/lstrings.h"
 #include "helper_funcs.h"
 #include "debug.h"
+#include FORMS_H_LOCATION
 
 
-typedef FormCB<ControlERT, FormDB<FD_form_ert> > base_class;
+typedef FormCB<ControlERT, FormDB<FD_ert> > base_class;
 
 FormERT::FormERT(ControlERT & c)
        : base_class(c, _("ERT Options"))
 
 FormERT::FormERT(ControlERT & c)
        : base_class(c, _("ERT Options"))
@@ -29,7 +30,7 @@ FormERT::FormERT(ControlERT & c)
 
 void FormERT::build()
 {
 
 void FormERT::build()
 {
-       dialog_.reset(build_ert());
+       dialog_.reset(build_ert(this));
 
        // Manage the ok, apply and cancel/close buttons
        bc().setOK(dialog_->button_ok);
 
        // Manage the ok, apply and cancel/close buttons
        bc().setOK(dialog_->button_ok);
index c90cc4fbfcc1344f0d16cab3a22e19001d755fde..74ac8a90986519163fec9085462862255f7486b1 100644 (file)
 #include "FormBase.h"
 
 class ControlERT;
 #include "FormBase.h"
 
 class ControlERT;
-struct FD_form_ert;
+struct FD_ert;
 
 /** This class provides an XForms implementation of the ERT
     Dialog.
  */
 class FormERT
 
 /** This class provides an XForms implementation of the ERT
     Dialog.
  */
 class FormERT
-       : public FormCB<ControlERT, FormDB<FD_form_ert> > {
+       : public FormCB<ControlERT, FormDB<FD_ert> > {
 public:
        ///
        FormERT(ControlERT &);
 public:
        ///
        FormERT(ControlERT &);
@@ -34,9 +34,6 @@ private:
        virtual void build();
        /// Update dialog before/whilst showing it.
        virtual void update();
        virtual void build();
        /// Update dialog before/whilst showing it.
        virtual void update();
-
-       /// Fdesign generated method
-       FD_form_ert * build_ert();
 };
 
 #endif // FORMERT_H
 };
 
 #endif // FORMERT_H
index 52b233236287673ef6f05bb717592e0f8f911729..75b3c24484316142abc6a12e6a3b4007048adb49 100644 (file)
 #include "xformsBC.h"
 #include "ControlError.h"
 #include "FormError.h"
 #include "xformsBC.h"
 #include "ControlError.h"
 #include "FormError.h"
-#include "form_error.h"
+#include "forms/form_error.h"
 #include "xforms_helpers.h" // formatted
 #include "xforms_helpers.h" // formatted
+#include FORMS_H_LOCATION
 
 
-typedef FormCB<ControlError, FormDB<FD_form_error> > base_class;
+typedef FormCB<ControlError, FormDB<FD_error> > base_class;
 
 FormError::FormError(ControlError & c)
        : base_class(c, _("LaTeX Error"))
 
 FormError::FormError(ControlError & c)
        : base_class(c, _("LaTeX Error"))
@@ -27,7 +28,7 @@ FormError::FormError(ControlError & c)
 
 void FormError::build()
 {
 
 void FormError::build()
 {
-       dialog_.reset(build_error());
+       dialog_.reset(build_error(this));
 
        // Manage the cancel/close button
        bc().setCancel(dialog_->button_close);
 
        // Manage the cancel/close button
        bc().setCancel(dialog_->button_close);
index 78ae1f95ef452c710ee44b2da75b46b2aede96db..8bff9199409e546c83a3dc44457c0e75c8068af4 100644 (file)
 #include "FormBase.h"
 
 class ControlError;
 #include "FormBase.h"
 
 class ControlError;
-struct FD_form_error;
+struct FD_error;
 
 /** This class provides an XForms implementation of the Error Dialog.
  */
 
 /** This class provides an XForms implementation of the Error Dialog.
  */
-class FormError : public FormCB<ControlError, FormDB<FD_form_error> > {
+class FormError : public FormCB<ControlError, FormDB<FD_error> > {
 public:
        /// Constructor
        FormError(ControlError &);
 public:
        /// Constructor
        FormError(ControlError &);
@@ -33,9 +33,6 @@ private:
        virtual void build();
        /// Update dialog before showing it
        virtual void update();
        virtual void build();
        /// Update dialog before showing it
        virtual void update();
-
-       /// Fdesign generated method
-       FD_form_error * build_error();
 };
 
 #endif // FORMERROR_H
 };
 
 #endif // FORMERROR_H
index ae325b8ddf01441cde0dd0c690b74c772ffe6a86..589dc225e20239190a25c413581d1dea60a96052 100644 (file)
 #include "xformsBC.h"
 #include "ControlExternal.h"
 #include "FormExternal.h"
 #include "xformsBC.h"
 #include "ControlExternal.h"
 #include "FormExternal.h"
-#include "form_external.h"
+#include "forms/form_external.h"
 #include "gettext.h"
 #include "xforms_helpers.h"
 #include "helper_funcs.h"
 
 #include "support/lstrings.h"
 #include "gettext.h"
 #include "xforms_helpers.h"
 #include "helper_funcs.h"
 
 #include "support/lstrings.h"
+#include FORMS_H_LOCATION
 
 
-typedef FormCB<ControlExternal, FormDB<FD_form_external> > base_class;
+typedef FormCB<ControlExternal, FormDB<FD_external> > base_class;
 
 FormExternal::FormExternal(ControlExternal & c)
        : base_class(c, _("Edit external file"))
 
 FormExternal::FormExternal(ControlExternal & c)
        : base_class(c, _("Edit external file"))
@@ -45,7 +46,7 @@ void FormExternal::apply()
 
 void FormExternal::build()
 {
 
 void FormExternal::build()
 {
-       dialog_.reset(build_external());
+       dialog_.reset(build_external(this));
 
        string const choice =
                " " + getStringFromVector(controller().getTemplates(), " | ") + " ";
 
        string const choice =
                " " + getStringFromVector(controller().getTemplates(), " | ") + " ";
index a6c4b91202a1213d05671306984e1392c9172cfc..e0f00b46798cb8c24b4b29968b4872c9439c5753 100644 (file)
 #include "insets/insetexternal.h"
 
 class ControlExternal;
 #include "insets/insetexternal.h"
 
 class ControlExternal;
-struct FD_form_external;
+struct FD_external;
 
 /// The class for editing External insets via a dialog
 
 /// The class for editing External insets via a dialog
-class FormExternal : public FormCB<ControlExternal, FormDB<FD_form_external> > {
+class FormExternal : public FormCB<ControlExternal, FormDB<FD_external> > {
 public:
        ///
        FormExternal(ControlExternal &);
 public:
        ///
        FormExternal(ControlExternal &);
@@ -43,9 +43,6 @@ private:
 
        ///
        void updateComboChange();
 
        ///
        void updateComboChange();
-
-       /// Fdesign generated method
-       FD_form_external * build_external();
 };
 
 #endif // FORMEXTERNAL_H
 };
 
 #endif // FORMEXTERNAL_H
index 78a4855eb76067d316b6744502f429d2131c860a..9b5d810dea29017a6289dc4b59f3521303eedb13 100644 (file)
@@ -27,7 +27,7 @@ using std::sort;
 #include "support/lstrings.h"
 #include "gettext.h"
 #include "frontends/Dialogs.h"
 #include "support/lstrings.h"
 #include "gettext.h"
 #include "frontends/Dialogs.h"
-#include "xforms_helpers.h"
+#include "forms_gettext.h"
 
 #include <boost/bind.hpp>
 
 
 #include <boost/bind.hpp>
 
@@ -74,6 +74,8 @@ extern "C" int gettimeofday(struct timeval *, struct timezone *);
 
 #include "support/filetools.h"
 #include "FormFiledialog.h"
 
 #include "support/filetools.h"
 #include "FormFiledialog.h"
+#include "forms/form_filedialog.h"
+#include FORMS_H_LOCATION
 
 namespace {
 
 
 namespace {
 
@@ -216,7 +218,7 @@ public:
 // *** FileDialog::Private class implementation
 
 // static members
 // *** FileDialog::Private class implementation
 
 // static members
-FD_form_filedialog * FileDialog::Private::pFileDlgForm = 0;
+FD_filedialog * FileDialog::Private::pFileDlgForm = 0;
 FileDialog::Private * FileDialog::Private::pCurrentDlg = 0;
 
 
 FileDialog::Private * FileDialog::Private::pCurrentDlg = 0;
 
 
@@ -427,7 +429,7 @@ FileDialog::Private::Private()
 
        // Creates form if necessary.
        if (!pFileDlgForm) {
 
        // Creates form if necessary.
        if (!pFileDlgForm) {
-               pFileDlgForm = build_filedialog();
+               pFileDlgForm = build_filedialog(this);
                // Set callbacks. This means that we don't need a patch file
                fl_set_object_callback(pFileDlgForm->DirBox,
                                       C_LyXFileDlg_FileDlgCB, 0);
                // Set callbacks. This means that we don't need a patch file
                fl_set_object_callback(pFileDlgForm->DirBox,
                                       C_LyXFileDlg_FileDlgCB, 0);
index ebe809aa6ae2034facd5fe5ac6143db19ac1a79c..4f4032444d19f09264130d7f7b1245b89047e5ae 100644 (file)
@@ -18,8 +18,7 @@
 
 #include "LString.h"
 
 
 #include "LString.h"
 
-#include FORMS_H_LOCATION
-#include "form_filedialog.h"
+#include "forms_fwd.h"
 
 #include "frontends/FileDialog.h"
 
 
 #include "frontends/FileDialog.h"
 
@@ -47,6 +46,8 @@ public:
 //}
 
 
 //}
 
 
+class FD_filedialog;
+
 class FileDialog::Private : public boost::signals::trackable {
 public:
        ///
 class FileDialog::Private : public boost::signals::trackable {
 public:
        ///
@@ -73,7 +74,7 @@ public:
 
 private:
        /// data
 
 private:
        /// data
-       static FD_form_filedialog * pFileDlgForm;
+       static FD_filedialog * pFileDlgForm;
        ///
        static FileDialog::Private * pCurrentDlg;
        ///
        ///
        static FileDialog::Private * pCurrentDlg;
        ///
@@ -103,9 +104,6 @@ private:
        ///
        bool force_ok;
 
        ///
        bool force_ok;
 
-       /// build the dialog
-       FD_form_filedialog * build_filedialog();
-
        /** Redraw the form (on receipt of a Signal indicating, for example,
            that the xform colors have been re-mapped).
        */
        /** Redraw the form (on receipt of a Signal indicating, for example,
            that the xform colors have been re-mapped).
        */
index 88437e25a1c6c41f0eebb06645dbcd1314c07671..2ea3204a07e46bec074a4ab939d3504c21478344 100644 (file)
 #include "xformsBC.h"
 #include "ControlFloat.h"
 #include "FormFloat.h"
 #include "xformsBC.h"
 #include "ControlFloat.h"
 #include "FormFloat.h"
-#include "form_float.h"
+#include "forms/form_float.h"
 #include "support/lstrings.h"
 #include "xforms_helpers.h"
 #include "support/lstrings.h"
 #include "xforms_helpers.h"
+#include FORMS_H_LOCATION
 
 
-typedef FormCB<ControlFloat, FormDB<FD_form_float> > base_class;
+typedef FormCB<ControlFloat, FormDB<FD_float> > base_class;
 
 FormFloat::FormFloat(ControlFloat & c)
        : base_class(c, _("Float Options"))
 
 FormFloat::FormFloat(ControlFloat & c)
        : base_class(c, _("Float Options"))
@@ -32,7 +33,7 @@ FormFloat::FormFloat(ControlFloat & c)
 
 void FormFloat::build()
 {
 
 void FormFloat::build()
 {
-       dialog_.reset(build_float());
+       dialog_.reset(build_float(this));
 
        // Manage the ok, apply and cancel/close buttons
        bc().setOK(dialog_->button_ok);
 
        // Manage the ok, apply and cancel/close buttons
        bc().setOK(dialog_->button_ok);
index 416400edbbca59097fb9380feb1aa9743e83e651..8e4513d6db73f2a5fdad917de35c3c864cc5dcd6 100644 (file)
 #include "FormBase.h"
 
 class ControlFloat;
 #include "FormBase.h"
 
 class ControlFloat;
-struct FD_form_float;
+struct FD_float;
 
 /** This class provides an XForms implementation of the Float
     Dialog.
  */
 
 /** This class provides an XForms implementation of the Float
     Dialog.
  */
-class FormFloat : public FormCB<ControlFloat, FormDB<FD_form_float> > {
+class FormFloat : public FormCB<ControlFloat, FormDB<FD_float> > {
 public:
        ///
        FormFloat(ControlFloat &);
 public:
        ///
        FormFloat(ControlFloat &);
@@ -36,9 +36,6 @@ private:
        virtual void update();
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
        virtual void update();
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
-
-       /// Fdesign generated method
-       FD_form_float * build_float();
 };
 
 #endif // FORMFLOAT_H
 };
 
 #endif // FORMFLOAT_H
index 38224aec27986924644b08f50380a49e2a67bab8..ca28eff22547bbb5c1a1c87002970d001dc55b92 100644 (file)
 #include "xformsBC.h"
 #include "FormForks.h"
 #include "ControlForks.h"
 #include "xformsBC.h"
 #include "FormForks.h"
 #include "ControlForks.h"
-#include "form_forks.h"
+#include "forms/form_forks.h"
 #include "Tooltips.h"
 #include "helper_funcs.h"
 #include "xforms_helpers.h"
 #include "gettext.h"
 #include "support/lstrings.h"
 #include "Tooltips.h"
 #include "helper_funcs.h"
 #include "xforms_helpers.h"
 #include "gettext.h"
 #include "support/lstrings.h"
+#include FORMS_H_LOCATION
 
 using std::vector;
 using std::find;
 using std::find_if;
 
 
 using std::vector;
 using std::find;
 using std::find_if;
 
-typedef FormCB<ControlForks, FormDB<FD_form_forks> > base_class;
+typedef FormCB<ControlForks, FormDB<FD_forks> > base_class;
 
 FormForks::FormForks(ControlForks & c)
        : base_class(c, _("Child processes"))
 
 FormForks::FormForks(ControlForks & c)
        : base_class(c, _("Child processes"))
@@ -35,7 +36,7 @@ FormForks::FormForks(ControlForks & c)
 
 
 void FormForks::build() {
 
 
 void FormForks::build() {
-       dialog_.reset(build_forks());
+       dialog_.reset(build_forks(this));
 
        // It appears that the browsers aren't initialised properly.
        // This fudge fixes tings.
 
        // It appears that the browsers aren't initialised properly.
        // This fudge fixes tings.
index a167fcd31211126e03f38f549a7710baa8cc113e..8dde5b0ebda575881fd4e63a3b974cc4ae14ffa6 100644 (file)
 
 #include "FormBase.h"
 
 
 #include "FormBase.h"
 
-struct FD_form_forks;
 class ControlForks;
 class ControlForks;
+struct FD_forks;
 
 
-class FormForks : public FormCB<ControlForks, FormDB<FD_form_forks> > {
+class FormForks : public FormCB<ControlForks, FormDB<FD_forks> > {
 public:
        ///
        FormForks(ControlForks &);
 public:
        ///
        FormForks(ControlForks &);
@@ -37,9 +37,6 @@ private:
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
-       /// Fdesign generated method
-       FD_form_forks * build_forks();
-
        ButtonPolicy::SMInput input_browser_children();
        ButtonPolicy::SMInput input_browser_kill();
        ButtonPolicy::SMInput input_button_all();
        ButtonPolicy::SMInput input_browser_children();
        ButtonPolicy::SMInput input_browser_kill();
        ButtonPolicy::SMInput input_button_all();
index 8683e063195ce0f011a530fdc78f125dc64d3af7..50d310d7dcafbc2eb576cd2b06cf3cd4d651760b 100644 (file)
@@ -16,7 +16,7 @@
 #include "xformsBC.h"
 #include "ControlGraphics.h"
 #include "FormGraphics.h"
 #include "xformsBC.h"
 #include "ControlGraphics.h"
 #include "FormGraphics.h"
-#include "form_graphics.h"
+#include "forms/form_graphics.h"
 #include "Alert.h"
 
 #include "xforms_helpers.h"
 #include "Alert.h"
 
 #include "xforms_helpers.h"
@@ -27,6 +27,7 @@
 #include "support/filetools.h"  // for MakeAbsPath etc
 #include "insets/insetgraphicsParams.h"
 #include "lyxrc.h" // for lyxrc.display_graphics
 #include "support/filetools.h"  // for MakeAbsPath etc
 #include "insets/insetgraphicsParams.h"
 #include "lyxrc.h" // for lyxrc.display_graphics
+#include FORMS_H_LOCATION
 
 using std::endl;
 using std::vector;
 
 using std::endl;
 using std::vector;
@@ -50,7 +51,7 @@ LyXLength getLyXLengthFromWidgets(FL_OBJECT * input, FL_OBJECT * choice)
 } // namespace anon
 
 
 } // namespace anon
 
 
-typedef FormCB<ControlGraphics, FormDB<FD_form_graphics> > base_class;
+typedef FormCB<ControlGraphics, FormDB<FD_graphics> > base_class;
 
 FormGraphics::FormGraphics(ControlGraphics & c)
        : base_class(c, _("Graphics"), false)
 
 FormGraphics::FormGraphics(ControlGraphics & c)
        : base_class(c, _("Graphics"), false)
@@ -71,7 +72,7 @@ void FormGraphics::redraw()
 
 void FormGraphics::build()
 {
 
 void FormGraphics::build()
 {
-       dialog_.reset(build_graphics());
+       dialog_.reset(build_graphics(this));
 
        // Allow the base class to control messages
        setMessageWidget(dialog_->text_warning);
 
        // Allow the base class to control messages
        setMessageWidget(dialog_->text_warning);
@@ -83,7 +84,7 @@ void FormGraphics::build()
        bc().setRestore(dialog_->button_restore);
 
        // the file section
        bc().setRestore(dialog_->button_restore);
 
        // the file section
-       file_.reset(build_file());
+       file_.reset(build_graphics_file(this));
 
        fl_set_input_return (file_->input_filename, FL_RETURN_CHANGED);
        fl_set_input_return (file_->input_subcaption, FL_RETURN_CHANGED);
 
        fl_set_input_return (file_->input_filename, FL_RETURN_CHANGED);
        fl_set_input_return (file_->input_subcaption, FL_RETURN_CHANGED);
@@ -113,7 +114,7 @@ void FormGraphics::build()
        bc().addReadOnly(file_->check_nounzip);
 
        // the lyxview section
        bc().addReadOnly(file_->check_nounzip);
 
        // the lyxview section
-       lyxview_.reset(build_lyxview());
+       lyxview_.reset(build_graphics_lyxview(this));
 
        fl_set_input_return (lyxview_->input_lyxwidth, FL_RETURN_CHANGED);
        fl_set_input_return (lyxview_->input_lyxheight, FL_RETURN_CHANGED);
 
        fl_set_input_return (lyxview_->input_lyxwidth, FL_RETURN_CHANGED);
        fl_set_input_return (lyxview_->input_lyxheight, FL_RETURN_CHANGED);
@@ -133,7 +134,7 @@ void FormGraphics::build()
        bc().addReadOnly(lyxview_->radio_nodisplay);
 
        // the size section
        bc().addReadOnly(lyxview_->radio_nodisplay);
 
        // the size section
-       size_.reset(build_size());
+       size_.reset(build_graphics_size(this));
 
        fl_set_input_return (size_->input_scale, FL_RETURN_CHANGED);
        fl_set_input_return (size_->input_width, FL_RETURN_CHANGED);
 
        fl_set_input_return (size_->input_scale, FL_RETURN_CHANGED);
        fl_set_input_return (size_->input_width, FL_RETURN_CHANGED);
@@ -158,7 +159,7 @@ void FormGraphics::build()
        bc().addReadOnly(size_->check_aspectratio);
 
        // the bounding box selection
        bc().addReadOnly(size_->check_aspectratio);
 
        // the bounding box selection
-       bbox_.reset(build_bbox());
+       bbox_.reset(build_graphics_bbox(this));
        fl_set_input_return (bbox_->input_bb_x0, FL_RETURN_CHANGED);
        fl_set_input_return (bbox_->input_bb_y0, FL_RETURN_CHANGED);
        fl_set_input_return (bbox_->input_bb_x1, FL_RETURN_CHANGED);
        fl_set_input_return (bbox_->input_bb_x0, FL_RETURN_CHANGED);
        fl_set_input_return (bbox_->input_bb_y0, FL_RETURN_CHANGED);
        fl_set_input_return (bbox_->input_bb_x1, FL_RETURN_CHANGED);
@@ -180,7 +181,7 @@ void FormGraphics::build()
        bc().addReadOnly(bbox_->check_clip);
 
        // the rotate section
        bc().addReadOnly(bbox_->check_clip);
 
        // the rotate section
-       special_.reset(build_special());
+       special_.reset(build_graphics_special(this));
 
        fl_set_input_return (special_->input_special, FL_RETURN_CHANGED);
        setPrehandler(special_->input_special);
 
        fl_set_input_return (special_->input_special, FL_RETURN_CHANGED);
        setPrehandler(special_->input_special);
index fc9bdec8f5e114826d209ebe63582d63edc8e490..c12a127805ec0b20e0bdb48e88441303065709bc 100644 (file)
 #include <vector>
 
 class ControlGraphics;
 #include <vector>
 
 class ControlGraphics;
-struct FD_form_graphics;
-struct FD_form_file;
-struct FD_form_lyxview;
-struct FD_form_size;
-struct FD_form_bbox;
-struct FD_form_special;
+struct FD_graphics;
+struct FD_graphics_file;
+struct FD_graphics_lyxview;
+struct FD_graphics_size;
+struct FD_graphics_bbox;
+struct FD_graphics_special;
 
 /** This class provides an XForms implementation of the Graphics Dialog.
  */
 
 /** This class provides an XForms implementation of the Graphics Dialog.
  */
-class FormGraphics : public FormCB<ControlGraphics, FormDB<FD_form_graphics> > {
+class FormGraphics : public FormCB<ControlGraphics, FormDB<FD_graphics> > {
 public:
        ///
        FormGraphics(ControlGraphics &);
 public:
        ///
        FormGraphics(ControlGraphics &);
@@ -53,29 +53,16 @@ private:
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
-       /// Fdesign generated method
-       FD_form_graphics * build_graphics();
-       ///
-       FD_form_file * build_file();
-       ///
-       FD_form_lyxview * build_lyxview();
-       ///
-       FD_form_size * build_size();
-       ///
-       FD_form_bbox * build_bbox();
-       ///
-       FD_form_special * build_special();
-
        /// Real GUI implementation.
        /// Real GUI implementation.
-       boost::scoped_ptr<FD_form_file> file_;
+       boost::scoped_ptr<FD_graphics_file> file_;
        ///
        ///
-       boost::scoped_ptr<FD_form_lyxview> lyxview_;
+       boost::scoped_ptr<FD_graphics_lyxview> lyxview_;
        ///
        ///
-       boost::scoped_ptr<FD_form_size> size_;
+       boost::scoped_ptr<FD_graphics_size> size_;
        ///
        ///
-       boost::scoped_ptr<FD_form_bbox> bbox_;
+       boost::scoped_ptr<FD_graphics_bbox> bbox_;
        ///
        ///
-       boost::scoped_ptr<FD_form_special> special_;
+       boost::scoped_ptr<FD_graphics_special> special_;
 
        /// Store the LaTeX names for the rotation origins.
        std::vector<string> origins_;
 
        /// Store the LaTeX names for the rotation origins.
        std::vector<string> origins_;
index bbc3c7993fbf94521f55b37bdb464ce0c2f82e30..f815337067656e99da128e58325f76210b9241a3 100644 (file)
 #include "xformsBC.h"
 #include "ControlInclude.h"
 #include "FormInclude.h"
 #include "xformsBC.h"
 #include "ControlInclude.h"
 #include "FormInclude.h"
-#include "form_include.h"
+#include "forms/form_include.h"
 #include "insets/insetinclude.h"
 #include "xforms_helpers.h" // setEnabled
 #include "support/lstrings.h" // strip
 #include "insets/insetinclude.h"
 #include "xforms_helpers.h" // setEnabled
 #include "support/lstrings.h" // strip
+#include FORMS_H_LOCATION
 
 
-typedef FormCB<ControlInclude, FormDB<FD_form_include> > base_class;
+typedef FormCB<ControlInclude, FormDB<FD_include> > base_class;
 
 FormInclude::FormInclude(ControlInclude & c)
        : base_class(c, _("Include file"))
 
 FormInclude::FormInclude(ControlInclude & c)
        : base_class(c, _("Include file"))
@@ -32,7 +33,7 @@ FormInclude::FormInclude(ControlInclude & c)
 
 void FormInclude::build()
 {
 
 void FormInclude::build()
 {
-       dialog_.reset(build_include());
+       dialog_.reset(build_include(this));
 
        fl_set_input_return(dialog_->input_filename, FL_RETURN_CHANGED);
        setPrehandler(dialog_->input_filename);
 
        fl_set_input_return(dialog_->input_filename, FL_RETURN_CHANGED);
        setPrehandler(dialog_->input_filename);
index 6b9ecde561740fa8828a54b6e86e59f2e1bb1382..3af32fd8b2829d404a1cf7214e2cb875472fd069 100644 (file)
 #include "FormBase.h"
 
 class ControlInclude;
 #include "FormBase.h"
 
 class ControlInclude;
-struct FD_form_include;
+struct FD_include;
 
 /** This class provides an XForms implementation of the Include Dialog.
  */
 
 /** This class provides an XForms implementation of the Include Dialog.
  */
-class FormInclude : public FormCB<ControlInclude, FormDB<FD_form_include> > {
+class FormInclude : public FormCB<ControlInclude, FormDB<FD_include> > {
 public:
        ///
        FormInclude(ControlInclude &);
 public:
        ///
        FormInclude(ControlInclude &);
@@ -36,9 +36,6 @@ private:
        virtual void update();
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
        virtual void update();
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
-
-       /// Fdesign generated method
-       FD_form_include * build_include();
 };
 
 #endif
 };
 
 #endif
index 98aa975cbe2cffa9102f41519cc4f8091e41bc0e..0067d0a06d59b4e3e4f4e24cd9392f8f4af9ffae 100644 (file)
 #include "ControlIndex.h"
 #include "FormIndex.h"
 #include "frontends/LyXView.h"
 #include "ControlIndex.h"
 #include "FormIndex.h"
 #include "frontends/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(ControlIndex & c)
        : base_class(c, _("Index"))
@@ -27,7 +28,7 @@ FormIndex::FormIndex(ControlIndex & c)
 
 void FormIndex::build()
 {
 
 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);
 
        fl_set_input_return(dialog_->input_key, FL_RETURN_CHANGED);
        setPrehandler(dialog_->input_key);
index 2cec8d24645f2cef3f72cd28046665556f7b18ca..c24e77dda506e8dfcb46720bac46937b146a0283 100644 (file)
 #include "FormBase.h"
 
 class ControlIndex;
 #include "FormBase.h"
 
 class ControlIndex;
-struct FD_form_index;
+struct FD_index;
 
 /** This class provides an XForms implementation of the Index Dialog.
  */
 
 /** This class provides an XForms implementation of the Index Dialog.
  */
-class FormIndex : public FormCB<ControlIndex, FormDB<FD_form_index> > {
+class FormIndex : public FormCB<ControlIndex, FormDB<FD_index> > {
 public:
        ///
        FormIndex(ControlIndex &);
 public:
        ///
        FormIndex(ControlIndex &);
@@ -33,9 +33,6 @@ private:
        virtual void build();
        /// Update dialog before/whilst showing it.
        virtual void update();
        virtual void build();
        /// Update dialog before/whilst showing it.
        virtual void update();
-
-       /// Fdesign generated method
-       FD_form_index * build_index();
 };
 
 #endif // FORMINDEX_H
 };
 
 #endif // FORMINDEX_H
index 7c174c5ab555dfd0dcbd086f552319e23a56313f..474c7458959f4bb38f2ef9418947529ffbb81166 100644 (file)
@@ -15,8 +15,9 @@
 #include "xformsBC.h"
 #include "ControlLog.h"
 #include "FormLog.h"
 #include "xformsBC.h"
 #include "ControlLog.h"
 #include "FormLog.h"
-#include "form_browser.h"
+#include "forms/form_browser.h"
 #include "gettext.h"
 #include "gettext.h"
+#include FORMS_H_LOCATION
 
 FormLog::FormLog(ControlLog & c)
        : FormCB<ControlLog, FormBrowser>(c, _("LaTeX Log"))
 
 FormLog::FormLog(ControlLog & c)
        : FormCB<ControlLog, FormBrowser>(c, _("LaTeX Log"))
index 3bdf1160f8729feca09ba1b5d8f0c820f667e6d1..81e562922d12adbc65330bb9836e94107741ae7e 100644 (file)
@@ -19,7 +19,7 @@
 #include "frontends/LyXView.h"
 #include "bmtable.h"
 #include "debug.h"
 #include "frontends/LyXView.h"
 #include "bmtable.h"
 #include "debug.h"
-#include "xforms_helpers.h"
+#include "forms_gettext.h"
 #include "gettext.h"
 #include "support/LAssert.h"
 
 #include "gettext.h"
 #include "support/LAssert.h"
 
index a710038e1da1ec1a9aa9674eab2c8c148e70f524..5dc7b29ff1ab45be99599c0bd4307019069db10b 100644 (file)
 #endif
 
 #include "FormMathsDeco.h"
 #endif
 
 #include "FormMathsDeco.h"
-#include "form_maths_deco.h"
+#include "forms/form_maths_deco.h"
 #include "Dialogs.h"
 #include "bmtable.h"
 #include "Dialogs.h"
 #include "bmtable.h"
+#include FORMS_H_LOCATION
 
 #include "deco.xbm"
 
 
 #include "deco.xbm"
 
@@ -51,7 +52,7 @@ FL_FORM * FormMathsDeco::form() const
 
 void FormMathsDeco::build()
 {
 
 void FormMathsDeco::build()
 {
-       dialog_.reset(build_maths_deco());
+       dialog_.reset(build_maths_deco(this));
 
        fl_set_bmtable_data(dialog_->bmtable_deco1, 3, 4,
                            deco1_width, deco1_height, deco1_bits);
 
        fl_set_bmtable_data(dialog_->bmtable_deco1, 3, 4,
                            deco1_width, deco1_height, deco1_bits);
index 64671282b598c9975eeaada29b04d85e230d78fe..54346418a58676186c2ef981ee6973ec4e2d276b 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <boost/scoped_ptr.hpp>
 
 
 #include <boost/scoped_ptr.hpp>
 
-struct FD_form_maths_deco;
+struct FD_maths_deco;
 
 /**
  * This class provides an XForms implementation of the maths deco.
 
 /**
  * This class provides an XForms implementation of the maths deco.
@@ -41,11 +41,8 @@ private:
        /// Pointer to the actual instantiation of the xforms form
        virtual FL_FORM * form() const;
 
        /// Pointer to the actual instantiation of the xforms form
        virtual FL_FORM * form() const;
 
-       // build the form
-       FD_form_maths_deco * build_maths_deco();
-
        // Real GUI implementation
        // Real GUI implementation
-       boost::scoped_ptr<FD_form_maths_deco> dialog_;
+       boost::scoped_ptr<FD_maths_deco> dialog_;
 
        /// Current choice
        int deco_;
 
        /// Current choice
        int deco_;
index 4d87e976f30717a03a9ad055b227b0b59a4541ad..74f966e1874ec0cf7621149623b43b913c6be0b7 100644 (file)
 #endif
 
 #include "FormMathsDelim.h"
 #endif
 
 #include "FormMathsDelim.h"
-#include "form_maths_delim.h"
+#include "forms/form_maths_delim.h"
 #include "Dialogs.h"
 #include "frontends/LyXView.h"
 #include "bmtable.h"
 #include "debug.h"
 #include "support/lstrings.h"
 #include "lyxfunc.h"
 #include "Dialogs.h"
 #include "frontends/LyXView.h"
 #include "bmtable.h"
 #include "debug.h"
 #include "support/lstrings.h"
 #include "lyxfunc.h"
+#include FORMS_H_LOCATION
 
 #include "delim.xbm"
 #include "delim0.xpm"
 
 #include "delim.xbm"
 #include "delim0.xpm"
@@ -57,7 +58,7 @@ FL_FORM * FormMathsDelim::form() const
 
 void FormMathsDelim::build()
 {
 
 void FormMathsDelim::build()
 {
-       dialog_.reset(build_maths_delim());
+       dialog_.reset(build_maths_delim(this));
 
        fl_set_button(dialog_->radio_left, 1);
        // Initialize button_pix to "()" as found in images/delim0.xpm:
 
        fl_set_button(dialog_->radio_left, 1);
        // Initialize button_pix to "()" as found in images/delim0.xpm:
index d877f5902d526e43b0645762453b009885733d1f..ed4cb56a99eb76533983bb5ea447161a544442d1 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <boost/scoped_ptr.hpp>
 
 
 #include <boost/scoped_ptr.hpp>
 
-struct FD_form_maths_delim;
+struct FD_maths_delim;
 
 /**
  * This class provides an XForms implementation of the maths delim.
 
 /**
  * This class provides an XForms implementation of the maths delim.
@@ -41,11 +41,8 @@ private:
        /// Pointer to the actual instantiation of the xforms form
        virtual FL_FORM * form() const;
 
        /// Pointer to the actual instantiation of the xforms form
        virtual FL_FORM * form() const;
 
-       // build the form
-       FD_form_maths_delim * build_maths_delim();
-
        // Real GUI implementation
        // Real GUI implementation
-       boost::scoped_ptr<FD_form_maths_delim> dialog_;
+       boost::scoped_ptr<FD_maths_delim> dialog_;
 };
 
 #endif //  FORM_MATHSDELIM_H
 };
 
 #endif //  FORM_MATHSDELIM_H
index b443c57b3d241f47442f8a3be9bf201f05d48ddb..c6d0fd46749cf4607c05800a96d7e9b6f5b5162b 100644 (file)
 #include <algorithm>
 
 #include "FormMathsMatrix.h"
 #include <algorithm>
 
 #include "FormMathsMatrix.h"
-#include "form_maths_matrix.h"
+#include "forms/form_maths_matrix.h"
 #include "Dialogs.h"
 #include "frontends/LyXView.h"
 #include "Lsstream.h"
 #include "lyxfunc.h"
 #include "support/LAssert.h"
 #include "support/lyxalgo.h" // lyx::count
 #include "Dialogs.h"
 #include "frontends/LyXView.h"
 #include "Lsstream.h"
 #include "lyxfunc.h"
 #include "support/LAssert.h"
 #include "support/lyxalgo.h" // lyx::count
+#include FORMS_H_LOCATION
 
 #ifndef CXX_GLOBAL_CSTD
 using std::strlen;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::strlen;
@@ -67,7 +68,7 @@ FL_FORM * FormMathsMatrix::form() const
 
 void FormMathsMatrix::build()
 {
 
 void FormMathsMatrix::build()
 {
-       dialog_.reset(build_maths_matrix());
+       dialog_.reset(build_maths_matrix(this));
 
        fl_addto_choice(dialog_->choice_valign, _("Top | Center | Bottom"));
        fl_set_choice(dialog_->choice_valign, 2);
 
        fl_addto_choice(dialog_->choice_valign, _("Top | Center | Bottom"));
        fl_set_choice(dialog_->choice_valign, 2);
index 5581f8229f388ca0177342c40addc33d912d886b..3bc7475f13d6c4d4775adc350d283f246c26e876 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <boost/scoped_ptr.hpp>
 
 
 #include <boost/scoped_ptr.hpp>
 
-struct FD_form_maths_matrix;
+struct FD_maths_matrix;
 
 /**
  * This class provides an XForms implementation of the maths matrix.
 
 /**
  * This class provides an XForms implementation of the maths matrix.
@@ -42,11 +42,8 @@ private:
        /// Pointer to the actual instantiation of the xforms form
        virtual FL_FORM * form() const;
 
        /// Pointer to the actual instantiation of the xforms form
        virtual FL_FORM * form() const;
 
-       // build the form
-       FD_form_maths_matrix * build_maths_matrix();
-
        // Real GUI implementation
        // Real GUI implementation
-       boost::scoped_ptr<FD_form_maths_matrix> dialog_;
+       boost::scoped_ptr<FD_maths_matrix> dialog_;
 };
 
 #endif //  FORM_MATHSMATRIX_H
 };
 
 #endif //  FORM_MATHSMATRIX_H
index 520a87740073dfc3bf2a96308329c9c03e470708..735284146b48291576107c04b3378c2d94e17e29 100644 (file)
 #include "Dialogs.h"
 #include "frontends/LyXView.h"
 #include "FormMathsPanel.h"
 #include "Dialogs.h"
 #include "frontends/LyXView.h"
 #include "FormMathsPanel.h"
-#include "form_maths_panel.h"
+#include "forms/form_maths_panel.h"
 #include "MathsSymbols.h"
 #include "debug.h"
 #include "lyxfunc.h"
 
 #include "MathsSymbols.h"
 #include "debug.h"
 #include "lyxfunc.h"
 
-#include "form_maths_deco.h"
-#include "form_maths_delim.h"
-#include "form_maths_matrix.h"
-#include "form_maths_space.h"
-#include "form_maths_style.h"
+#include "forms/form_maths_deco.h"
+#include "forms/form_maths_delim.h"
+#include "forms/form_maths_matrix.h"
+#include "forms/form_maths_space.h"
+#include "forms/form_maths_style.h"
 
 #include "FormMathsBitmap.h"
 #include "FormMathsDeco.h"
 
 #include "FormMathsBitmap.h"
 #include "FormMathsDeco.h"
@@ -36,6 +36,9 @@
 #include "FormMathsSpace.h"
 #include "FormMathsStyle.h"
 
 #include "FormMathsSpace.h"
 #include "FormMathsStyle.h"
 
+#include FORMS_H_LOCATION
+#include <boost/bind.hpp>
+
 #include "deco.xpm"
 #include "delim.xpm"
 #include "equation.xpm"
 #include "deco.xpm"
 #include "delim.xpm"
 #include "equation.xpm"
@@ -61,8 +64,6 @@
 #include "ams_nrel.xbm"
 #include "ams_ops.xbm"
 
 #include "ams_nrel.xbm"
 #include "ams_ops.xbm"
 
-#include <boost/bind.hpp>
-
 using std::vector;
 
 FormMathsPanel::FormMathsPanel(LyXView * lv, Dialogs * d)
 using std::vector;
 
 FormMathsPanel::FormMathsPanel(LyXView * lv, Dialogs * d)
@@ -171,7 +172,7 @@ void FormMathsPanel::setActive(FormMathsSub * a) const
 
 void FormMathsPanel::build()
 {
 
 void FormMathsPanel::build()
 {
-       dialog_.reset(build_maths_panel());
+       dialog_.reset(build_maths_panel(this));
 
        for (int i = 0; i < nr_function_names; ++i)
                fl_add_browser_line(dialog_->browser_funcs,
 
        for (int i = 0; i < nr_function_names; ++i)
                fl_add_browser_line(dialog_->browser_funcs,
index 75a6202e244493b116a399e0c31d51904d4569dd..1c5a65ef7fd6b82ad3bfe469b91d435cbc72aba1 100644 (file)
@@ -30,7 +30,7 @@ class FormMathsMatrix;
 class FormMathsSpace;
 class FormMathsStyle;
 class FormMathsSub;
 class FormMathsSpace;
 class FormMathsStyle;
 class FormMathsSub;
-struct FD_form_maths_panel;
+struct FD_maths_panel;
 
 /**
  * This class provides an XForms implementation of the maths panel.
 
 /**
  * This class provides an XForms implementation of the maths panel.
@@ -57,15 +57,12 @@ private:
        /// Pointer to the actual instantiation of the xforms form
        virtual FL_FORM * form() const;
 
        /// Pointer to the actual instantiation of the xforms form
        virtual FL_FORM * form() const;
 
-       // build the panels
-       FD_form_maths_panel * build_maths_panel();
+       // Real GUI implementation
+       boost::scoped_ptr<FD_maths_panel> dialog_;
 
        /// send LFUN_MATH_DISPLAY
        void mathDisplay() const;
 
 
        /// send LFUN_MATH_DISPLAY
        void mathDisplay() const;
 
-       // Real GUI implementation
-       boost::scoped_ptr<FD_form_maths_panel> dialog_;
-
        /// Subdialogs
        boost::scoped_ptr<FormMathsDeco>   deco_;
        boost::scoped_ptr<FormMathsDelim>  delim_;
        /// Subdialogs
        boost::scoped_ptr<FormMathsDeco>   deco_;
        boost::scoped_ptr<FormMathsDelim>  delim_;
index d1922ca104b6ca495276556b9caf14106628f124..6d12d425c69f2d2f4818fe4bdafa1f7c46d198c7 100644 (file)
@@ -16,7 +16,8 @@
 #endif
 
 #include "FormMathsSpace.h"
 #endif
 
 #include "FormMathsSpace.h"
-#include "form_maths_space.h"
+#include "forms/form_maths_space.h"
+#include FORMS_H_LOCATION
 
 extern char * latex_mathspace[];
 
 
 extern char * latex_mathspace[];
 
@@ -37,7 +38,7 @@ FL_FORM * FormMathsSpace::form() const
 
 void FormMathsSpace::build()
 {
 
 void FormMathsSpace::build()
 {
-       dialog_.reset(build_maths_space());
+       dialog_.reset(build_maths_space(this));
 
        space_ = -1;
 
 
        space_ = -1;
 
index 56f7930eaccca704f09df21d48a420d3949c4bec..825e9955f62099162777eef589c597a24d03e917 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <boost/scoped_ptr.hpp>
 
 
 #include <boost/scoped_ptr.hpp>
 
-struct FD_form_maths_space;
+struct FD_maths_space;
 
 /**
  * This class provides an XForms implementation of the maths space.
 
 /**
  * This class provides an XForms implementation of the maths space.
@@ -41,11 +41,8 @@ private:
        /// Pointer to the actual instantiation of the xforms form
        virtual FL_FORM * form() const;
 
        /// Pointer to the actual instantiation of the xforms form
        virtual FL_FORM * form() const;
 
-       // build the form
-       FD_form_maths_space * build_maths_space();
-
        // Real GUI implementation
        // Real GUI implementation
-       boost::scoped_ptr<FD_form_maths_space> dialog_;
+       boost::scoped_ptr<FD_maths_space> dialog_;
 
        /// The current choice.
        int space_;
 
        /// The current choice.
        int space_;
index 6fd3cb3b3132167d242f002fe9da2929fb29bb2d..f78607505d3cac0e44ff9c71c22994d7551fddf5 100644 (file)
 #endif
 
 #include "FormMathsStyle.h"
 #endif
 
 #include "FormMathsStyle.h"
-#include "form_maths_style.h"
+#include "forms/form_maths_style.h"
 #include "bmtable.h"
 
 #include "bmtable.h"
 
+#include "debug.h"
+
+#include FORMS_H_LOCATION
+
 #include "style.xbm"
 #include "font.xbm"
 
 #include "style.xbm"
 #include "font.xbm"
 
-#include "debug.h"
-
 char const * latex_mathstyle[] = {
        "displaystyle", "textstyle", "scriptstyle", "scriptscriptstyle"
 };
 char const * latex_mathstyle[] = {
        "displaystyle", "textstyle", "scriptstyle", "scriptscriptstyle"
 };
@@ -53,7 +55,7 @@ FL_FORM * FormMathsStyle::form() const
 
 void FormMathsStyle::build()
 {
 
 void FormMathsStyle::build()
 {
-       dialog_.reset(build_maths_style());
+       dialog_.reset(build_maths_style(this));
 
        fl_set_bmtable_data(dialog_->bmtable_style1, 1, 1,
                            style1_width, style1_height, style1_bits);
 
        fl_set_bmtable_data(dialog_->bmtable_style1, 1, 1,
                            style1_width, style1_height, style1_bits);
index e50af20f9a12cc23314d44262258e534b9f464e1..efa123da99cbb683edcfd69967e5031ca8a63415 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <boost/scoped_ptr.hpp>
 
 
 #include <boost/scoped_ptr.hpp>
 
-struct FD_form_maths_style;
+struct FD_maths_style;
 
 /**
  * This class provides an XForms implementation of the maths style.
 
 /**
  * This class provides an XForms implementation of the maths style.
@@ -41,11 +41,8 @@ private:
        /// Pointer to the actual instantiation of the xforms form
        virtual FL_FORM * form() const;
 
        /// Pointer to the actual instantiation of the xforms form
        virtual FL_FORM * form() const;
 
-       // build the form
-       FD_form_maths_style * build_maths_style();
-
        // Real GUI implementation
        // Real GUI implementation
-       boost::scoped_ptr<FD_form_maths_style> dialog_;
+       boost::scoped_ptr<FD_maths_style> dialog_;
 
        /// The current choice.
        int style_;
 
        /// The current choice.
        int style_;
index b4b08c95d7ba5217437888d8bf68de028a99ec8c..4187f23468adb14e2ace52a7d17029270fb28811 100644 (file)
 #include "xformsBC.h"
 #include "ControlMinipage.h"
 #include "FormMinipage.h"
 #include "xformsBC.h"
 #include "ControlMinipage.h"
 #include "FormMinipage.h"
-#include "form_minipage.h"
+#include "forms/form_minipage.h"
 #include "support/lstrings.h"
 #include "helper_funcs.h"
 #include "debug.h"
 #include "xforms_helpers.h"
 #include "support/lstrings.h"
 #include "helper_funcs.h"
 #include "debug.h"
 #include "xforms_helpers.h"
+#include FORMS_H_LOCATION
 
 
-typedef FormCB<ControlMinipage, FormDB<FD_form_minipage> > base_class;
+typedef FormCB<ControlMinipage, FormDB<FD_minipage> > base_class;
 
 FormMinipage::FormMinipage(ControlMinipage & c)
        : base_class(c, _("Minipage Options"))
 
 FormMinipage::FormMinipage(ControlMinipage & c)
        : base_class(c, _("Minipage Options"))
@@ -30,7 +31,7 @@ FormMinipage::FormMinipage(ControlMinipage & c)
 
 void FormMinipage::build()
 {
 
 void FormMinipage::build()
 {
-       dialog_.reset(build_minipage());
+       dialog_.reset(build_minipage(this));
 
        // Allow the base class to control messages
        setMessageWidget(dialog_->text_warning);
 
        // Allow the base class to control messages
        setMessageWidget(dialog_->text_warning);
index f905c1a2c9e33ef05a9588e8a4692a9a47637154..90ead2b9bc293a05b442d2df9f1fc88a5508c59a 100644 (file)
 #include "FormBase.h"
 
 class ControlMinipage;
 #include "FormBase.h"
 
 class ControlMinipage;
-struct FD_form_minipage;
+struct FD_minipage;
 
 /** This class provides an XForms implementation of the Minipage
     Dialog.
  */
 class FormMinipage
 
 /** This class provides an XForms implementation of the Minipage
     Dialog.
  */
 class FormMinipage
-       : public FormCB<ControlMinipage, FormDB<FD_form_minipage> > {
+       : public FormCB<ControlMinipage, FormDB<FD_minipage> > {
 public:
        ///
        FormMinipage(ControlMinipage &);
 public:
        ///
        FormMinipage(ControlMinipage &);
@@ -36,9 +36,6 @@ private:
        virtual void update();
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
        virtual void update();
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
-
-       /// Fdesign generated method
-       FD_form_minipage * build_minipage();
 };
 
 #endif // FORMMINIPAGE_H
 };
 
 #endif // FORMMINIPAGE_H
index f3eb8426e9e0688a81fe48b52d6a7e7db70df16d..ab4a5dab45dd13d2bd990f9044984ce120777cf4 100644 (file)
@@ -15,7 +15,7 @@
 #include FORMS_H_LOCATION
 
 #include "FormParagraph.h"
 #include FORMS_H_LOCATION
 
 #include "FormParagraph.h"
-#include "form_paragraph.h"
+#include "forms/form_paragraph.h"
 #include "ControlParagraph.h"
 #include "ParagraphParameters.h"
 #include "xforms_helpers.h"
 #include "ControlParagraph.h"
 #include "ParagraphParameters.h"
 #include "xforms_helpers.h"
@@ -28,6 +28,7 @@
 
 #include "support/lstrings.h"
 #include "support/LAssert.h"
 
 #include "support/lstrings.h"
 #include "support/LAssert.h"
+#include FORMS_H_LOCATION
 
 #include <functional>
 
 
 #include <functional>
 
@@ -35,7 +36,7 @@ using std::vector;
 using std::bind2nd;
 using std::remove_if;
 
 using std::bind2nd;
 using std::remove_if;
 
-typedef FormCB<ControlParagraph, FormDB<FD_form_paragraph> > base_class;
+typedef FormCB<ControlParagraph, FormDB<FD_paragraph> > base_class;
   
 FormParagraph::FormParagraph(ControlParagraph & c)
        : base_class(c, _("Paragraph Layout"), false)
   
 FormParagraph::FormParagraph(ControlParagraph & c)
        : base_class(c, _("Paragraph Layout"), false)
@@ -44,7 +45,7 @@ FormParagraph::FormParagraph(ControlParagraph & c)
 void FormParagraph::build()
 {
        // the tabbed folder
 void FormParagraph::build()
 {
        // the tabbed folder
-       dialog_.reset(build_paragraph());
+       dialog_.reset(build_paragraph(this));
 
        // Allow the base class to control messages
        setMessageWidget(dialog_->text_warning);
 
        // Allow the base class to control messages
        setMessageWidget(dialog_->text_warning);
index d0e8e73b7a92b78c1f31e33b4bb2ef9a5613a3aa..a509aa3d9153c8534b19a60319a7913f8870afff 100644 (file)
 
 #include "FormBase.h"
 
 
 #include "FormBase.h"
 
-struct FD_form_paragraph;
+struct FD_paragraph;
 class ControlParagraph;
 
 /** This class provides an XForms implementation of the FormParagraph dialog.
  */
 class FormParagraph
 class ControlParagraph;
 
 /** This class provides an XForms implementation of the FormParagraph dialog.
  */
 class FormParagraph
-       : public FormCB<ControlParagraph, FormDB<FD_form_paragraph> > {
+       : public FormCB<ControlParagraph, FormDB<FD_paragraph> > {
 public:
        ///
        FormParagraph(ControlParagraph &);
 public:
        ///
        FormParagraph(ControlParagraph &);
@@ -36,9 +36,6 @@ private:
        
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
        
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
-
-       /// Fdesign generated method
-       FD_form_paragraph * build_paragraph();
 };
 
 #endif
 };
 
 #endif
index 4a88025835aa08beafe3ebe4a989730a4a83bc6b..5fa4baf3de8d570dfb7c0633ab5edb2b92fe7410 100644 (file)
 #include "xformsBC.h"
 #include "ControlPreamble.h"
 #include "FormPreamble.h"
 #include "xformsBC.h"
 #include "ControlPreamble.h"
 #include "FormPreamble.h"
-#include "form_preamble.h"
+#include "forms/form_preamble.h"
 #include "xforms_helpers.h"
 #include "xforms_helpers.h"
+#include FORMS_H_LOCATION
 
 
-typedef FormCB<ControlPreamble, FormDB<FD_form_preamble> > base_class;
+typedef FormCB<ControlPreamble, FormDB<FD_preamble> > base_class;
 
 FormPreamble::FormPreamble(ControlPreamble & c)
        : base_class(c, _("LaTeX preamble"))
 
 FormPreamble::FormPreamble(ControlPreamble & c)
        : base_class(c, _("LaTeX preamble"))
@@ -27,7 +28,7 @@ FormPreamble::FormPreamble(ControlPreamble & c)
 
 void FormPreamble::build()
 {
 
 void FormPreamble::build()
 {
-       dialog_.reset(build_preamble());
+       dialog_.reset(build_preamble(this));
 
        fl_set_input_return(dialog_->input_preamble, FL_RETURN_CHANGED);
 
 
        fl_set_input_return(dialog_->input_preamble, FL_RETURN_CHANGED);
 
index 449482d60b792d35deefa371221494c5d740076b..9166ea28ff0a0b4a2f74720396e5689ff91c50de 100644 (file)
 #include "FormBase.h"
 
 class ControlPreamble;
 #include "FormBase.h"
 
 class ControlPreamble;
-struct FD_form_preamble;
+struct FD_preamble;
 
 /** This class provides an XForms implementation of the Preamble Dialog.
  */
 
 /** This class provides an XForms implementation of the Preamble Dialog.
  */
-class FormPreamble : public FormCB<ControlPreamble, FormDB<FD_form_preamble> > {
+class FormPreamble : public FormCB<ControlPreamble, FormDB<FD_preamble> > {
 public:
        ///
        FormPreamble(ControlPreamble &);
 public:
        ///
        FormPreamble(ControlPreamble &);
@@ -32,9 +32,6 @@ private:
        virtual void build();
        /// Update the dialog
        virtual void update();
        virtual void build();
        /// Update the dialog
        virtual void update();
-
-       /// Fdesign generated method
-       FD_form_preamble * build_preamble();
 };
 
 
 };
 
 
index 513a3a54f90bff7eeeabf051826aab40687957c3..5b3ca6cad7a48533ad07e275f2714a2be072c4c5 100644 (file)
@@ -13,7 +13,7 @@
 #endif
 
 #include "FormPreferences.h"
 #endif
 
 #include "FormPreferences.h"
-#include "form_preferences.h"
+#include "forms/form_preferences.h"
 #include "Dialogs.h"
 
 #include "buffer.h"
 #include "Dialogs.h"
 
 #include "buffer.h"
@@ -31,6 +31,7 @@
 #include "combox.h"
 #include "Color.h"
 #include "input_validators.h"
 #include "combox.h"
 #include "Color.h"
 #include "input_validators.h"
+#include "forms_gettext.h"
 #include "xforms_helpers.h"
 #include "helper_funcs.h"
 
 #include "xforms_helpers.h"
 #include "helper_funcs.h"
 
@@ -43,6 +44,7 @@
 
 #include <boost/bind.hpp>
 
 
 #include <boost/bind.hpp>
 
+#include FORMS_H_LOCATION
 #include <utility>
 #include <iomanip>
 #include <X11/Xlib.h>
 #include <utility>
 #include <iomanip>
 #include <X11/Xlib.h>
@@ -159,7 +161,7 @@ void FormPreferences::hide()
 
 void FormPreferences::build()
 {
 
 void FormPreferences::build()
 {
-       dialog_.reset(build_preferences());
+       dialog_.reset(build_preferences(this));
 
        // Manage the restore, save, apply and cancel/close buttons
        bc().setOK(dialog_->button_ok);
 
        // Manage the restore, save, apply and cancel/close buttons
        bc().setOK(dialog_->button_ok);
@@ -171,11 +173,11 @@ void FormPreferences::build()
        setMessageWidget(dialog_->text_warning);
 
        // build the tab folders
        setMessageWidget(dialog_->text_warning);
 
        // build the tab folders
-       converters_tab_.reset(build_inner_tab());
-       look_n_feel_tab_.reset(build_inner_tab());
-       inputs_tab_.reset(build_inner_tab());
-       outputs_tab_.reset(build_inner_tab());
-       lang_opts_tab_.reset(build_inner_tab());
+       converters_tab_.reset(build_preferences_inner_tab(this));
+       look_n_feel_tab_.reset(build_preferences_inner_tab(this));
+       inputs_tab_.reset(build_preferences_inner_tab(this));
+       outputs_tab_.reset(build_preferences_inner_tab(this));
+       lang_opts_tab_.reset(build_preferences_inner_tab(this));
 
        // build actual tabfolder contents
        // these will become nested tabfolders
 
        // build actual tabfolder contents
        // these will become nested tabfolders
@@ -378,7 +380,7 @@ FormPreferences::Colors::Colors(FormPreferences & p)
 {}
 
 
 {}
 
 
-FD_form_colors const * FormPreferences::Colors::dialog()
+FD_preferences_colors const * FormPreferences::Colors::dialog()
 {
        return dialog_.get();
 }
 {
        return dialog_.get();
 }
@@ -457,7 +459,7 @@ void FormPreferences::Colors::apply()
 
 void FormPreferences::Colors::build()
 {
 
 void FormPreferences::Colors::build()
 {
-       dialog_.reset(parent_.build_colors());
+       dialog_.reset(build_preferences_colors(this));
 
        fl_set_object_color(dialog_->button_color,
                            GUI_COLOR_CHOICE, GUI_COLOR_CHOICE);
 
        fl_set_object_color(dialog_->button_color,
                            GUI_COLOR_CHOICE, GUI_COLOR_CHOICE);
@@ -924,7 +926,7 @@ FormPreferences::Converters::Converters(FormPreferences & p)
 {}
 
 
 {}
 
 
-FD_form_converters const * FormPreferences::Converters::dialog()
+FD_preferences_converters const * FormPreferences::Converters::dialog()
 {
        return dialog_.get();
 }
 {
        return dialog_.get();
 }
@@ -940,7 +942,7 @@ void FormPreferences::Converters::apply() const
 
 void FormPreferences::Converters::build()
 {
 
 void FormPreferences::Converters::build()
 {
-       dialog_.reset(parent_.build_converters());
+       dialog_.reset(build_preferences_converters(this));
 
        fl_set_input_return(dialog_->input_converter, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_flags, FL_RETURN_CHANGED);
 
        fl_set_input_return(dialog_->input_converter, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_flags, FL_RETURN_CHANGED);
@@ -1183,7 +1185,7 @@ FormPreferences::Formats::Formats(FormPreferences &  p)
 {}
 
 
 {}
 
 
-FD_form_formats const * FormPreferences::Formats::dialog()
+FD_preferences_formats const * FormPreferences::Formats::dialog()
 {
        return dialog_.get();
 }
 {
        return dialog_.get();
 }
@@ -1197,7 +1199,7 @@ void FormPreferences::Formats::apply() const
 
 void FormPreferences::Formats::build()
 {
 
 void FormPreferences::Formats::build()
 {
-       dialog_.reset(parent_.build_formats());
+       dialog_.reset(build_preferences_formats(this));
 
        fl_set_input_return(dialog_->input_format, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_viewer, FL_RETURN_CHANGED);
 
        fl_set_input_return(dialog_->input_format, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_viewer, FL_RETURN_CHANGED);
@@ -1408,7 +1410,7 @@ FormPreferences::InputsMisc::InputsMisc(FormPreferences &  p)
 {}
 
 
 {}
 
 
-FD_form_inputs_misc const * FormPreferences::InputsMisc::dialog()
+FD_preferences_inputs_misc const * FormPreferences::InputsMisc::dialog()
 {
        return dialog_.get();
 }
 {
        return dialog_.get();
 }
@@ -1423,7 +1425,7 @@ void FormPreferences::InputsMisc::apply() const
 
 void FormPreferences::InputsMisc::build()
 {
 
 void FormPreferences::InputsMisc::build()
 {
-       dialog_.reset(parent_.build_inputs_misc());
+       dialog_.reset(build_preferences_inputs_misc(this));
 
        fl_set_input_return(dialog_->input_date_format, FL_RETURN_CHANGED);
 
 
        fl_set_input_return(dialog_->input_date_format, FL_RETURN_CHANGED);
 
@@ -1456,7 +1458,7 @@ FormPreferences::Interface::Interface(FormPreferences &  p)
 {}
 
 
 {}
 
 
-FD_form_interface const * FormPreferences::Interface::dialog()
+FD_preferences_interface const * FormPreferences::Interface::dialog()
 {
        return dialog_.get();
 }
 {
        return dialog_.get();
 }
@@ -1478,7 +1480,7 @@ void FormPreferences::Interface::apply() const
 
 void FormPreferences::Interface::build()
 {
 
 void FormPreferences::Interface::build()
 {
-       dialog_.reset(parent_.build_interface());
+       dialog_.reset(build_preferences_interface(this));
 
        fl_set_input_return(dialog_->input_popup_normal_font, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_popup_bold_font, FL_RETURN_CHANGED);
 
        fl_set_input_return(dialog_->input_popup_normal_font, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_popup_bold_font, FL_RETURN_CHANGED);
@@ -1573,7 +1575,7 @@ FormPreferences::Language::Language(FormPreferences &  p)
 {}
 
 
 {}
 
 
-FD_form_language const * FormPreferences::Language::dialog()
+FD_preferences_language const * FormPreferences::Language::dialog()
 {
        return dialog_.get();
 }
 {
        return dialog_.get();
 }
@@ -1625,7 +1627,7 @@ void FormPreferences::Language::apply()
 
 void FormPreferences::Language::build()
 {
 
 void FormPreferences::Language::build()
 {
-       dialog_.reset(parent_.build_language());
+       dialog_.reset(build_preferences_language(this));
 
        fl_set_input_return(dialog_->input_package, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_command_begin, FL_RETURN_CHANGED);
 
        fl_set_input_return(dialog_->input_package, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_command_begin, FL_RETURN_CHANGED);
@@ -1811,7 +1813,7 @@ FormPreferences::LnFmisc::LnFmisc(FormPreferences &  p)
 {}
 
 
 {}
 
 
-FD_form_lnf_misc const * FormPreferences::LnFmisc::dialog()
+FD_preferences_lnf_misc const * FormPreferences::LnFmisc::dialog()
 {
        return dialog_.get();
 }
 {
        return dialog_.get();
 }
@@ -1854,7 +1856,7 @@ void FormPreferences::LnFmisc::apply() const
 
 void FormPreferences::LnFmisc::build()
 {
 
 void FormPreferences::LnFmisc::build()
 {
-       dialog_.reset(parent_.build_lnf_misc());
+       dialog_.reset(build_preferences_lnf_misc(this));
 
        fl_set_counter_step(dialog_->counter_autosave, 1, 10);
        fl_set_counter_step(dialog_->counter_wm_jump, 1, 10);
 
        fl_set_counter_step(dialog_->counter_autosave, 1, 10);
        fl_set_counter_step(dialog_->counter_wm_jump, 1, 10);
@@ -1944,7 +1946,7 @@ FormPreferences::OutputsMisc::OutputsMisc(FormPreferences &  p)
 {}
 
 
 {}
 
 
-FD_form_outputs_misc const * FormPreferences::OutputsMisc::dialog()
+FD_preferences_outputs_misc const * FormPreferences::OutputsMisc::dialog()
 {
        return dialog_.get();
 }
 {
        return dialog_.get();
 }
@@ -1969,7 +1971,7 @@ void FormPreferences::OutputsMisc::apply() const
 
 void FormPreferences::OutputsMisc::build()
 {
 
 void FormPreferences::OutputsMisc::build()
 {
-       dialog_.reset(parent_.build_outputs_misc());
+       dialog_.reset(build_preferences_outputs_misc(this));
 
        fl_set_counter_step(dialog_->counter_line_len, 1, 10);
 
 
        fl_set_counter_step(dialog_->counter_line_len, 1, 10);
 
@@ -2042,7 +2044,7 @@ FormPreferences::Paths::Paths(FormPreferences &  p)
 {}
 
 
 {}
 
 
-FD_form_paths const * FormPreferences::Paths::dialog()
+FD_preferences_paths const * FormPreferences::Paths::dialog()
 {
        return dialog_.get();
 }
 {
        return dialog_.get();
 }
@@ -2085,7 +2087,7 @@ void FormPreferences::Paths::apply()
 
 void FormPreferences::Paths::build()
 {
 
 void FormPreferences::Paths::build()
 {
-       dialog_.reset(parent_.build_paths());
+       dialog_.reset(build_preferences_paths(this));
 
        fl_set_input_return(dialog_->input_default_path, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_template_path, FL_RETURN_CHANGED);
 
        fl_set_input_return(dialog_->input_default_path, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_template_path, FL_RETURN_CHANGED);
@@ -2293,7 +2295,7 @@ FormPreferences::Printer::Printer(FormPreferences &  p)
 {}
 
 
 {}
 
 
-FD_form_printer const * FormPreferences::Printer::dialog()
+FD_preferences_printer const * FormPreferences::Printer::dialog()
 {
        return dialog_.get();
 }
 {
        return dialog_.get();
 }
@@ -2375,7 +2377,7 @@ FormPreferences::Printer::feedback(FL_OBJECT const * const ob) const
 
 void FormPreferences::Printer::build()
 {
 
 void FormPreferences::Printer::build()
 {
-       dialog_.reset(parent_.build_printer());
+       dialog_.reset(build_preferences_printer(this));
 
        fl_set_input_return(dialog_->input_command, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_page_range, FL_RETURN_CHANGED);
 
        fl_set_input_return(dialog_->input_command, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_page_range, FL_RETURN_CHANGED);
@@ -2463,7 +2465,7 @@ FormPreferences::ScreenFonts::ScreenFonts(FormPreferences &  p)
 {}
 
 
 {}
 
 
-FD_form_screen_fonts const * FormPreferences::ScreenFonts::dialog()
+FD_preferences_screen_fonts const * FormPreferences::ScreenFonts::dialog()
 {
        return dialog_.get();
 }
 {
        return dialog_.get();
 }
@@ -2587,7 +2589,7 @@ void FormPreferences::ScreenFonts::apply() const
 
 void FormPreferences::ScreenFonts::build()
 {
 
 void FormPreferences::ScreenFonts::build()
 {
-       dialog_.reset(parent_.build_screen_fonts());
+       dialog_.reset(build_preferences_screen_fonts(this));
 
        fl_set_counter_step(dialog_->counter_zoom, 1, 10);
        fl_set_counter_step(dialog_->counter_dpi,  1, 10);
 
        fl_set_counter_step(dialog_->counter_zoom, 1, 10);
        fl_set_counter_step(dialog_->counter_dpi,  1, 10);
@@ -2771,7 +2773,7 @@ FormPreferences::SpellOptions::SpellOptions(FormPreferences &  p)
 {}
 
 
 {}
 
 
-FD_form_spelloptions const * FormPreferences::SpellOptions::dialog()
+FD_preferences_spelloptions const * FormPreferences::SpellOptions::dialog()
 {
        return dialog_.get();
 }
 {
        return dialog_.get();
 }
@@ -2842,7 +2844,7 @@ void FormPreferences::SpellOptions::apply()
 
 void FormPreferences::SpellOptions::build()
 {
 
 void FormPreferences::SpellOptions::build()
 {
-       dialog_.reset(parent_.build_spelloptions());
+       dialog_.reset(build_preferences_spelloptions(this));
 
        fl_addto_choice(dialog_->choice_spell_command,
                        _(" ispell | aspell "));
 
        fl_addto_choice(dialog_->choice_spell_command,
                        _(" ispell | aspell "));
index f06179de1356722c9aeaabd451a22bc0642bacd1..81da0ba80dc7f2fa39569a719dcab1ec30904ece 100644 (file)
 
 #include <boost/scoped_ptr.hpp>
 
 
 #include <boost/scoped_ptr.hpp>
 
+#include FORMS_H_LOCATION
 #include <utility> // pair
 
 class Combox;
 class Dialogs;
 class LyXView;
 class RGBColor;
 #include <utility> // pair
 
 class Combox;
 class Dialogs;
 class LyXView;
 class RGBColor;
-struct FD_form_colors;
-struct FD_form_converters;
-struct FD_form_formats;
-struct FD_form_inputs_misc;
-struct FD_form_interface;
-struct FD_form_language;
-struct FD_form_lnf_misc;
-struct FD_form_inner_tab;
-struct FD_form_outputs_misc;
-struct FD_form_paths;
-struct FD_form_preferences;
-struct FD_form_printer;
-struct FD_form_screen_fonts;
-struct FD_form_spelloptions;
+struct FD_preferences;
+struct FD_preferences_colors;
+struct FD_preferences_converters;
+struct FD_preferences_formats;
+struct FD_preferences_inputs_misc;
+struct FD_preferences_interface;
+struct FD_preferences_language;
+struct FD_preferences_lnf_misc;
+struct FD_preferences_inner_tab;
+struct FD_preferences_outputs_misc;
+struct FD_preferences_paths;
+struct FD_preferences_printer;
+struct FD_preferences_screen_fonts;
+struct FD_preferences_spelloptions;
 
 
 /** This class provides an XForms implementation of the FormPreferences Dialog.
 
 
 /** This class provides an XForms implementation of the FormPreferences Dialog.
@@ -82,47 +83,18 @@ private:
                    std::pair<string,string> const & dir1= std::make_pair(string(),string()),
                    std::pair<string,string> const & dir2 = std::make_pair(string(),string()));
 
                    std::pair<string,string> const & dir1= std::make_pair(string(),string()),
                    std::pair<string,string> const & dir2 = std::make_pair(string(),string()));
 
-       /// Fdesign generated methods
-       FD_form_preferences * build_preferences();
-       ///
-       FD_form_inner_tab * build_inner_tab();
-       ///
-       FD_form_colors * build_colors();
-       ///
-       FD_form_converters * build_converters();
-       ///
-       FD_form_formats * build_formats();
-       ///
-       FD_form_inputs_misc * build_inputs_misc();
-       ///
-       FD_form_interface * build_interface();
-       ///
-       FD_form_language * build_language();
-       ///
-       FD_form_lnf_misc * build_lnf_misc();
-       ///
-       FD_form_outputs_misc * build_outputs_misc();
-       ///
-       FD_form_paths * build_paths();
-       ///
-       FD_form_printer * build_printer();
-       ///
-       FD_form_screen_fonts * build_screen_fonts();
-       ///
-       FD_form_spelloptions * build_spelloptions();
-
        /// Real GUI implementation.
        /// Real GUI implementation.
-       boost::scoped_ptr<FD_form_preferences> dialog_;
+       boost::scoped_ptr<FD_preferences> dialog_;
        /// Converters tabfolder
        /// Converters tabfolder
-       boost::scoped_ptr<FD_form_inner_tab> converters_tab_;
+       boost::scoped_ptr<FD_preferences_inner_tab> converters_tab_;
        /// reLyX and other import/input stuff
        /// reLyX and other import/input stuff
-       boost::scoped_ptr<FD_form_inner_tab> inputs_tab_;
+       boost::scoped_ptr<FD_preferences_inner_tab> inputs_tab_;
        /// HCI configuration
        /// HCI configuration
-       boost::scoped_ptr<FD_form_inner_tab> look_n_feel_tab_;
+       boost::scoped_ptr<FD_preferences_inner_tab> look_n_feel_tab_;
        /// Outputs tabfolder
        /// Outputs tabfolder
-       boost::scoped_ptr<FD_form_inner_tab> outputs_tab_;
+       boost::scoped_ptr<FD_preferences_inner_tab> outputs_tab_;
        /// Spellchecker, language stuff, etc
        /// Spellchecker, language stuff, etc
-       boost::scoped_ptr<FD_form_inner_tab> lang_opts_tab_;
+       boost::scoped_ptr<FD_preferences_inner_tab> lang_opts_tab_;
 
        /** Each tab folder is encapsulated in its own class.
         */
 
        /** Each tab folder is encapsulated in its own class.
         */
@@ -138,7 +110,7 @@ private:
                ///
                Colors(FormPreferences & p);
                ///
                ///
                Colors(FormPreferences & p);
                ///
-               FD_form_colors const * dialog();
+               FD_preferences_colors const * dialog();
                ///
                void apply(); // not const as modifies modifiedXformsPrefs.
                ///
                ///
                void apply(); // not const as modifies modifiedXformsPrefs.
                ///
@@ -174,7 +146,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
                ///
                FormPreferences & parent_;
                ///
-               boost::scoped_ptr<FD_form_colors> dialog_;
+               boost::scoped_ptr<FD_preferences_colors> dialog_;
 
                /// A vector of LyX LColor GUI name and associated RGB color.
                std::vector<NamedColor> lyxColorDB;
 
                /// A vector of LyX LColor GUI name and associated RGB color.
                std::vector<NamedColor> lyxColorDB;
@@ -190,7 +162,7 @@ private:
                ///
                Converters(FormPreferences & p);
                ///
                ///
                Converters(FormPreferences & p);
                ///
-               FD_form_converters const * dialog();
+               FD_preferences_converters const * dialog();
                ///
                void apply() const;
                ///
                ///
                void apply() const;
                ///
@@ -223,7 +195,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
                ///
                FormPreferences & parent_;
                ///
-               boost::scoped_ptr<FD_form_converters> dialog_;
+               boost::scoped_ptr<FD_preferences_converters> dialog_;
        };
        ///
        friend class Converters;
        };
        ///
        friend class Converters;
@@ -234,7 +206,7 @@ private:
                ///
                Formats(FormPreferences &  p);
                ///
                ///
                Formats(FormPreferences &  p);
                ///
-               FD_form_formats const * dialog();
+               FD_preferences_formats const * dialog();
                ///
                void apply() const;
                ///
                ///
                void apply() const;
                ///
@@ -261,7 +233,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
                ///
                FormPreferences & parent_;
                ///
-               boost::scoped_ptr<FD_form_formats> dialog_;
+               boost::scoped_ptr<FD_preferences_formats> dialog_;
        };
        ///
        friend class Formats;
        };
        ///
        friend class Formats;
@@ -272,7 +244,7 @@ private:
                ///
                InputsMisc(FormPreferences &  p);
                ///
                ///
                InputsMisc(FormPreferences &  p);
                ///
-               FD_form_inputs_misc const * dialog();
+               FD_preferences_inputs_misc const * dialog();
                ///
                void apply() const;
                ///
                ///
                void apply() const;
                ///
@@ -286,7 +258,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
                ///
                FormPreferences & parent_;
                ///
-               boost::scoped_ptr<FD_form_inputs_misc> dialog_;
+               boost::scoped_ptr<FD_preferences_inputs_misc> dialog_;
        };
        ///
        friend class InputsMisc;
        };
        ///
        friend class InputsMisc;
@@ -297,7 +269,7 @@ private:
                ///
                Interface(FormPreferences &  p);
                ///
                ///
                Interface(FormPreferences &  p);
                ///
-               FD_form_interface const * dialog();
+               FD_preferences_interface const * dialog();
                ///
                void apply() const;
                ///
                ///
                void apply() const;
                ///
@@ -313,7 +285,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
                ///
                FormPreferences & parent_;
                ///
-               boost::scoped_ptr<FD_form_interface> dialog_;
+               boost::scoped_ptr<FD_preferences_interface> dialog_;
        };
        ///
        friend class Interface;
        };
        ///
        friend class Interface;
@@ -324,7 +296,7 @@ private:
                ///
                Language(FormPreferences &  p);
                ///
                ///
                Language(FormPreferences &  p);
                ///
-               FD_form_language const * dialog();
+               FD_preferences_language const * dialog();
                ///
                void apply(); // not const because calls update()
                ///
                ///
                void apply(); // not const because calls update()
                ///
@@ -342,7 +314,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
                ///
                FormPreferences & parent_;
                ///
-               boost::scoped_ptr<FD_form_language> dialog_;
+               boost::scoped_ptr<FD_preferences_language> dialog_;
                ///
                boost::scoped_ptr<Combox> combo_default_lang;
                ///
                ///
                boost::scoped_ptr<Combox> combo_default_lang;
                ///
@@ -357,7 +329,7 @@ private:
                ///
                LnFmisc(FormPreferences &  p);
                ///
                ///
                LnFmisc(FormPreferences &  p);
                ///
-               FD_form_lnf_misc const * dialog();
+               FD_preferences_lnf_misc const * dialog();
                ///
                void apply() const;
                ///
                ///
                void apply() const;
                ///
@@ -371,7 +343,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
                ///
                FormPreferences & parent_;
                ///
-               boost::scoped_ptr<FD_form_lnf_misc> dialog_;
+               boost::scoped_ptr<FD_preferences_lnf_misc> dialog_;
        };
        ///
        friend class LnFmisc;
        };
        ///
        friend class LnFmisc;
@@ -382,7 +354,7 @@ private:
                ///
                OutputsMisc(FormPreferences &  p);
                ///
                ///
                OutputsMisc(FormPreferences &  p);
                ///
-               FD_form_outputs_misc const * dialog();
+               FD_preferences_outputs_misc const * dialog();
                ///
                void apply() const;
                ///
                ///
                void apply() const;
                ///
@@ -396,7 +368,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
                ///
                FormPreferences & parent_;
                ///
-               boost::scoped_ptr<FD_form_outputs_misc> dialog_;
+               boost::scoped_ptr<FD_preferences_outputs_misc> dialog_;
        };
        ///
        friend class OutputsMisc;
        };
        ///
        friend class OutputsMisc;
@@ -407,7 +379,7 @@ private:
                ///
                Paths(FormPreferences &  p);
                ///
                ///
                Paths(FormPreferences &  p);
                ///
-               FD_form_paths const * dialog();
+               FD_preferences_paths const * dialog();
                ///
                void apply();
                ///
                ///
                void apply();
                ///
@@ -423,7 +395,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
                ///
                FormPreferences & parent_;
                ///
-               boost::scoped_ptr<FD_form_paths> dialog_;
+               boost::scoped_ptr<FD_preferences_paths> dialog_;
        };
        ///
        friend class Paths;
        };
        ///
        friend class Paths;
@@ -434,7 +406,7 @@ private:
                ///
                Printer(FormPreferences &  p);
                ///
                ///
                Printer(FormPreferences &  p);
                ///
-               FD_form_printer const * dialog();
+               FD_preferences_printer const * dialog();
                ///
                void apply() const;
                ///
                ///
                void apply() const;
                ///
@@ -448,7 +420,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
                ///
                FormPreferences & parent_;
                ///
-               boost::scoped_ptr<FD_form_printer> dialog_;
+               boost::scoped_ptr<FD_preferences_printer> dialog_;
        };
        ///
        friend class Printer;
        };
        ///
        friend class Printer;
@@ -459,7 +431,7 @@ private:
                ///
                ScreenFonts(FormPreferences &  p);
                ///
                ///
                ScreenFonts(FormPreferences &  p);
                ///
-               FD_form_screen_fonts const * dialog();
+               FD_preferences_screen_fonts const * dialog();
                ///
                void apply() const;
                ///
                ///
                void apply() const;
                ///
@@ -475,7 +447,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
                ///
                FormPreferences & parent_;
                ///
-               boost::scoped_ptr<FD_form_screen_fonts> dialog_;
+               boost::scoped_ptr<FD_preferences_screen_fonts> dialog_;
        };
        ///
        friend class ScreenFonts;
        };
        ///
        friend class ScreenFonts;
@@ -486,7 +458,7 @@ private:
                ///
                SpellOptions(FormPreferences &  p);
                ///
                ///
                SpellOptions(FormPreferences &  p);
                ///
-               FD_form_spelloptions const * dialog();
+               FD_preferences_spelloptions const * dialog();
                ///
                void apply(); // not const because calls update()!
                ///
                ///
                void apply(); // not const because calls update()!
                ///
@@ -502,7 +474,7 @@ private:
                ///
                FormPreferences & parent_;
                ///
                ///
                FormPreferences & parent_;
                ///
-               boost::scoped_ptr<FD_form_spelloptions> dialog_;
+               boost::scoped_ptr<FD_preferences_spelloptions> dialog_;
        };
        ///
        friend class SpellOptions;
        };
        ///
        friend class SpellOptions;
index 41924a46d2afb6065ff19826ebbedcf3d6759a6a..47f1b45532478bec43f061ff749a922598412922 100644 (file)
@@ -16,7 +16,7 @@
 #include "xformsBC.h"
 #include "ControlPrint.h"
 #include "FormPrint.h"
 #include "xformsBC.h"
 #include "ControlPrint.h"
 #include "FormPrint.h"
-#include "form_print.h"
+#include "forms/form_print.h"
 
 #include "frontends/LyXView.h"
 
 
 #include "frontends/LyXView.h"
 
 #include "xforms_helpers.h"
 
 #include "support/lstrings.h"
 #include "xforms_helpers.h"
 
 #include "support/lstrings.h"
+#include FORMS_H_LOCATION
 
 using std::make_pair;
 
 
 using std::make_pair;
 
-typedef FormCB<ControlPrint, FormDB<FD_form_print> > base_class;
+typedef FormCB<ControlPrint, FormDB<FD_print> > base_class;
 
 FormPrint::FormPrint(ControlPrint & c)
        : base_class(c, _("Print")),
 
 FormPrint::FormPrint(ControlPrint & c)
        : base_class(c, _("Print")),
@@ -39,7 +40,7 @@ FormPrint::FormPrint(ControlPrint & c)
 
 void FormPrint::build()
 {
 
 void FormPrint::build()
 {
-       dialog_.reset(build_print());
+       dialog_.reset(build_print(this));
 
        // Manage the ok, apply and cancel/close buttons
        bc().setOK(dialog_->button_ok);
 
        // Manage the ok, apply and cancel/close buttons
        bc().setOK(dialog_->button_ok);
index 837520d46d261dcc3dd0843c424923d354f89964..2260f76a0b5ae0f7d362b565cf10aa1701cf944f 100644 (file)
 #include "RadioButtonGroup.h"
 
 class ControlPrint;
 #include "RadioButtonGroup.h"
 
 class ControlPrint;
-struct FD_form_print;
+struct FD_print;
 
 /** This class provides an XForms implementation of the FormPrint Dialog.
     The print dialog allows users to print their documents.
  */
 
 /** This class provides an XForms implementation of the FormPrint Dialog.
     The print dialog allows users to print their documents.
  */
-class FormPrint : public FormCB<ControlPrint, FormDB<FD_form_print> > {
+class FormPrint : public FormCB<ControlPrint, FormDB<FD_print> > {
 public:
        ///
        FormPrint(ControlPrint &);
 public:
        ///
        FormPrint(ControlPrint &);
@@ -41,9 +41,6 @@ private:
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
-       /// Fdesign generated method
-       FD_form_print * build_print();
-
        /// print target
        RadioButtonGroup target_;
        /// page order
        /// print target
        RadioButtonGroup target_;
        /// page order
index a1c62d58ea1a738aab530e3e0dfea7b537994bef..f66890ae91adce2cef58b05d71b2aeeb00bfb0d2 100644 (file)
 #include "xformsBC.h"
 #include "ControlRef.h"
 #include "FormRef.h"
 #include "xformsBC.h"
 #include "ControlRef.h"
 #include "FormRef.h"
-#include "form_ref.h"
+#include "forms/form_ref.h"
 #include "xforms_helpers.h"
 #include "insets/insetref.h"
 #include "helper_funcs.h" // getStringFromVector
 #include "support/lstrings.h" // frontStrip, strip
 #include "xforms_helpers.h"
 #include "insets/insetref.h"
 #include "helper_funcs.h" // getStringFromVector
 #include "support/lstrings.h" // frontStrip, strip
+#include FORMS_H_LOCATION
 
 using std::find;
 using std::max;
 using std::sort;
 using std::vector;
 
 
 using std::find;
 using std::max;
 using std::sort;
 using std::vector;
 
-typedef FormCB<ControlRef, FormDB<FD_form_ref> > base_class;
+typedef FormCB<ControlRef, FormDB<FD_ref> > base_class;
 
 FormRef::FormRef(ControlRef & c)
        : base_class(c, _("Reference")),
 
 FormRef::FormRef(ControlRef & c)
        : base_class(c, _("Reference")),
@@ -37,7 +38,7 @@ FormRef::FormRef(ControlRef & c)
 
 void FormRef::build()
 {
 
 void FormRef::build()
 {
-       dialog_.reset(build_ref());
+       dialog_.reset(build_ref(this));
 
        for (int i = 0; !InsetRef::types[i].latex_name.empty(); ++i)
                fl_addto_choice(dialog_->choice_type,
 
        for (int i = 0; !InsetRef::types[i].latex_name.empty(); ++i)
                fl_addto_choice(dialog_->choice_type,
index 9f85c6a734cebd2bf6d16474dd8b502ce0d7b464..4d816f03273d1482798fc47b0c623dae25966e28 100644 (file)
 #include "FormBase.h"
 
 class ControlRef;
 #include "FormBase.h"
 
 class ControlRef;
-struct FD_form_ref;
+struct FD_ref;
 
 /** This class provides an XForms implementation of the FormRef Dialog.
  */
 
 /** This class provides an XForms implementation of the FormRef Dialog.
  */
-class FormRef : public FormCB<ControlRef, FormDB<FD_form_ref> > {
+class FormRef : public FormCB<ControlRef, FormDB<FD_ref> > {
 public:
        ///
        FormRef(ControlRef &);
 public:
        ///
        FormRef(ControlRef &);
@@ -39,9 +39,6 @@ private:
        ///
        void updateBrowser(std::vector<string> const &) const;
 
        ///
        void updateBrowser(std::vector<string> const &) const;
 
-       /// Fdesign generated method
-       FD_form_ref * build_ref();
-
        ///
        bool at_ref_;
        ///
        ///
        bool at_ref_;
        ///
index 26a763fad7498cbcbb6db19ca7cbc9a71c4d05b0..08c9391ff57734baf8e0973672b03e6037df3d18 100644 (file)
 #include "xformsBC.h"
 #include "ControlSearch.h"
 #include "FormSearch.h"
 #include "xformsBC.h"
 #include "ControlSearch.h"
 #include "FormSearch.h"
-#include "form_search.h"
+#include "forms/form_search.h"
+#include FORMS_H_LOCATION
 
 
-typedef FormCB<ControlSearch, FormDB<FD_form_search> > base_class;
+typedef FormCB<ControlSearch, FormDB<FD_search> > base_class;
 
 FormSearch::FormSearch(ControlSearch & c)
        : base_class(c, _("LyX: Find and Replace"))
 
 FormSearch::FormSearch(ControlSearch & c)
        : base_class(c, _("LyX: Find and Replace"))
@@ -26,7 +27,7 @@ FormSearch::FormSearch(ControlSearch & c)
 
 void FormSearch::build()
 {
 
 void FormSearch::build()
 {
-       dialog_.reset(build_search());
+       dialog_.reset(build_search(this));
 
        // Manage the ok, apply and cancel/close buttons
        bc().setCancel(dialog_->button_close);
 
        // Manage the ok, apply and cancel/close buttons
        bc().setCancel(dialog_->button_close);
index 7b33bb4c3bc8565b9c1db4563f36fa806a8e8f3d..b20a8dfc173c2fe064fb409f49a743da9c1ac62c 100644 (file)
 #include "FormBase.h"
 
 class ControlSearch;
 #include "FormBase.h"
 
 class ControlSearch;
-struct FD_form_search;
+struct FD_search;
 
 /** This class provides an XForms implementation of the FormSearch Dialog.
  */
 
 /** This class provides an XForms implementation of the FormSearch Dialog.
  */
-class FormSearch : public FormCB<ControlSearch, FormDB<FD_form_search> > {
+class FormSearch : public FormCB<ControlSearch, FormDB<FD_search> > {
 public:
        ///
        FormSearch(ControlSearch &);
 public:
        ///
        FormSearch(ControlSearch &);
@@ -36,9 +36,6 @@ private:
 
        /// Filter the inputs
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
        /// Filter the inputs
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
-
-       /// Fdesign generated method
-       FD_form_search  * build_search();
 };
 
 #endif // FORMSEARCH_H
 };
 
 #endif // FORMSEARCH_H
index 78101b2852176083b7f097b9f79f2d607a2faab2..ce9f5f5ea601f301014509f4e6e3a649555c9403 100644 (file)
 #endif
 
 #include "FormSendto.h"
 #endif
 
 #include "FormSendto.h"
-#include "form_sendto.h"
+#include "forms/form_sendto.h"
 #include "ControlSendto.h"
 #include "xformsBC.h"
 #include "Tooltips.h"
 #include "xforms_helpers.h"
 #include "converter.h"
 #include "gettext.h"
 #include "ControlSendto.h"
 #include "xformsBC.h"
 #include "Tooltips.h"
 #include "xforms_helpers.h"
 #include "converter.h"
 #include "gettext.h"
+#include FORMS_H_LOCATION
 
 using std::vector;
 
 
 using std::vector;
 
-typedef FormCB<ControlSendto, FormDB<FD_form_sendto> > base_class;
+typedef FormCB<ControlSendto, FormDB<FD_sendto> > base_class;
 
 FormSendto::FormSendto(ControlSendto & c)
        : base_class(c, _("Send document to command"))
 
 FormSendto::FormSendto(ControlSendto & c)
        : base_class(c, _("Send document to command"))
@@ -32,7 +33,7 @@ FormSendto::FormSendto(ControlSendto & c)
 
 void FormSendto::build()
 {
 
 void FormSendto::build()
 {
-       dialog_.reset(build_sendto());
+       dialog_.reset(build_sendto(this));
 
        fl_set_input_return(dialog_->input_command, FL_RETURN_CHANGED);
        setPrehandler(dialog_->input_command);
 
        fl_set_input_return(dialog_->input_command, FL_RETURN_CHANGED);
        setPrehandler(dialog_->input_command);
index 7d3aff18fcc5a396703a92c0fb2ec45792aa729a..f091873c7f5621c85a4ead484f5d315d4b046b5b 100644 (file)
 
 class ControlSendto;
 class Format;
 
 class ControlSendto;
 class Format;
-struct FD_form_sendto;
+struct FD_sendto;
 
 /** This class provides an XForms implementation of the Custom Export Dialog.
  */
 
 /** This class provides an XForms implementation of the Custom Export Dialog.
  */
-class FormSendto : public FormCB<ControlSendto, FormDB<FD_form_sendto> > {
+class FormSendto : public FormCB<ControlSendto, FormDB<FD_sendto> > {
 public:
        ///
        FormSendto(ControlSendto &);
 public:
        ///
        FormSendto(ControlSendto &);
@@ -38,9 +38,6 @@ private:
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
-       /// Fdesign generated method
-       FD_form_sendto * build_sendto();
-
        std::vector<Format const *> all_formats_;
 };
 
        std::vector<Format const *> all_formats_;
 };
 
index 9e1f22f196745b72fe80c7418cfb6bf243eb8e36..9067ebb401ae05b888a860835d88bee44877da8f 100644 (file)
@@ -15,8 +15,9 @@
 #include "xformsBC.h"
 #include "ControlShowFile.h"
 #include "FormShowFile.h"
 #include "xformsBC.h"
 #include "ControlShowFile.h"
 #include "FormShowFile.h"
-#include "form_browser.h"
+#include "forms/form_browser.h"
 #include "gettext.h"
 #include "gettext.h"
+#include FORMS_H_LOCATION
 
 FormShowFile::FormShowFile(ControlShowFile & c)
        : FormCB<ControlShowFile, FormBrowser>(c, string())
 
 FormShowFile::FormShowFile(ControlShowFile & c)
        : FormCB<ControlShowFile, FormBrowser>(c, string())
index 2315ddd83fcaddb180586b4462eb67184717c686..70dea25e5e06094ee89d9a27224d7cb882189f51 100644 (file)
 #include "xforms_helpers.h"
 #include "ControlSpellchecker.h"
 #include "FormSpellchecker.h"
 #include "xforms_helpers.h"
 #include "ControlSpellchecker.h"
 #include "FormSpellchecker.h"
-#include "form_spellchecker.h"
+#include "forms/form_spellchecker.h"
+#include FORMS_H_LOCATION
 
 
-typedef FormCB<ControlSpellchecker, FormDB<FD_form_spellchecker> > base_class;
+typedef FormCB<ControlSpellchecker, FormDB<FD_spellchecker> > base_class;
 
 FormSpellchecker::FormSpellchecker(ControlSpellchecker & c)
        : base_class(c, _("LyX: Spellchecker"), false)
 
 FormSpellchecker::FormSpellchecker(ControlSpellchecker & c)
        : base_class(c, _("LyX: Spellchecker"), false)
@@ -27,7 +28,7 @@ FormSpellchecker::FormSpellchecker(ControlSpellchecker & c)
 
 void FormSpellchecker::build()
 {
 
 void FormSpellchecker::build()
 {
-       dialog_.reset(build_spellchecker());
+       dialog_.reset(build_spellchecker(this));
 
        fl_set_slider_bounds(dialog_->slider, 0.0, 100.0);
        fl_set_slider_step(dialog_->slider, 1.0);
 
        fl_set_slider_bounds(dialog_->slider, 0.0, 100.0);
        fl_set_slider_step(dialog_->slider, 1.0);
index fe1e93ad3ef0af78e03714bf888300b7da21f42f..b56cbf67a1aaf50c127dce121d19e07f246135b8 100644 (file)
 #include "FormBase.h"
 
 class ControlSpellchecker;
 #include "FormBase.h"
 
 class ControlSpellchecker;
-struct FD_form_spellchecker;
+struct FD_spellchecker;
 
 /** This class provides an XForms implementation of the FormSpellchecker Dialog.
  */
 
 /** This class provides an XForms implementation of the FormSpellchecker Dialog.
  */
-class FormSpellchecker : public FormCB<ControlSpellchecker, FormDB<FD_form_spellchecker> > {
+class FormSpellchecker : public FormCB<ControlSpellchecker, FormDB<FD_spellchecker> > {
 public:
        ///
        FormSpellchecker(ControlSpellchecker &);
 public:
        ///
        FormSpellchecker(ControlSpellchecker &);
@@ -45,9 +45,6 @@ private:
 
        /// Filter the inputs
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
        /// Filter the inputs
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
-
-       /// Fdesign generated method
-       FD_form_spellchecker  * build_spellchecker();
 };
 
 #endif // FORMSPELLCHECKER_H
 };
 
 #endif // FORMSPELLCHECKER_H
index faea762a87d55ea32d87763b623e9dd7c0884fb2..ad802a295b99d5bd62f0a3339092b1a652936cef 100644 (file)
@@ -15,7 +15,7 @@
 #include "debug.h"
 
 #include "FormTabular.h"
 #include "debug.h"
 
 #include "FormTabular.h"
-#include "form_tabular.h"
+#include "forms/form_tabular.h"
 #include "frontends/LyXView.h"
 #include "Dialogs.h"
 #include "buffer.h"
 #include "frontends/LyXView.h"
 #include "Dialogs.h"
 #include "buffer.h"
@@ -31,6 +31,7 @@
 #include <boost/bind.hpp>
 
 #include <functional>
 #include <boost/bind.hpp>
 
 #include <functional>
+#include FORMS_H_LOCATION
 
 
 using std::vector;
 
 
 using std::vector;
@@ -110,7 +111,7 @@ void FormTabular::updateInset(InsetTabular * inset)
 
 void FormTabular::build()
 {
 
 void FormTabular::build()
 {
-       dialog_.reset(build_tabular());
+       dialog_.reset(build_tabular(this));
 
        // Allow the base class to control messages
        setMessageWidget(dialog_->text_warning);
 
        // Allow the base class to control messages
        setMessageWidget(dialog_->text_warning);
@@ -118,10 +119,10 @@ void FormTabular::build()
        setPrehandler(dialog_->input_tabular_column);
        setPrehandler(dialog_->input_tabular_row);
 
        setPrehandler(dialog_->input_tabular_column);
        setPrehandler(dialog_->input_tabular_row);
 
-       tabular_options_.reset(build_tabular_options());
-       column_options_.reset(build_column_options());
-       cell_options_.reset(build_cell_options());
-       longtable_options_.reset(build_longtable_options());
+       tabular_options_.reset(build_tabular_options(this));
+       column_options_.reset(build_tabular_column(this));
+       cell_options_.reset(build_tabular_cell(this));
+       longtable_options_.reset(build_tabular_longtable(this));
 
        fl_set_input_return(column_options_->input_column_width,
                            FL_RETURN_END);
 
        fl_set_input_return(column_options_->input_column_width,
                            FL_RETURN_END);
index 1fb0ddeabb5453d7bf60bdba4f5048f403540800..fd26fe8e2b7e034cc9e29a3a60c7ec3a0f56029b 100644 (file)
 #include "FormInset.h"
 
 class InsetTabular;
 #include "FormInset.h"
 
 class InsetTabular;
-struct FD_form_tabular;
-struct FD_form_tabular_options;
-struct FD_form_column_options;
-struct FD_form_cell_options;
-struct FD_form_longtable_options;
+struct FD_tabular;
+struct FD_tabular_options;
+struct FD_tabular_column;
+struct FD_tabular_cell;
+struct FD_tabular_longtable;
 
 /** This class provides an XForms implementation of the FormTabular Dialog.
     The tabular dialog allows users to set/save their tabular.
 
 /** This class provides an XForms implementation of the FormTabular Dialog.
     The tabular dialog allows users to set/save their tabular.
@@ -58,27 +58,16 @@ private:
        ///
        virtual int checkLongtableOptions(FL_OBJECT *, string &);
 
        ///
        virtual int checkLongtableOptions(FL_OBJECT *, string &);
 
-       /// Fdesign generated methods
-       FD_form_tabular * build_tabular();
-       ///
-       FD_form_tabular_options * build_tabular_options();
-       ///
-       FD_form_column_options * build_column_options();
-       ///
-       FD_form_cell_options * build_cell_options();
-       ///
-       FD_form_longtable_options * build_longtable_options();
-
        /// Real GUI implementation.
        /// Real GUI implementation.
-       boost::scoped_ptr<FD_form_tabular> dialog_;
+       boost::scoped_ptr<FD_tabular> dialog_;
        ///
        ///
-       boost::scoped_ptr<FD_form_tabular_options> tabular_options_;
+       boost::scoped_ptr<FD_tabular_options> tabular_options_;
        ///
        ///
-       boost::scoped_ptr<FD_form_column_options> column_options_;
+       boost::scoped_ptr<FD_tabular_column> column_options_;
        ///
        ///
-       boost::scoped_ptr<FD_form_cell_options> cell_options_;
+       boost::scoped_ptr<FD_tabular_cell> cell_options_;
        ///
        ///
-       boost::scoped_ptr<FD_form_longtable_options> longtable_options_;
+       boost::scoped_ptr<FD_tabular_longtable> longtable_options_;
 
        /// pointer to the inset passed through showInset
        InsetTabular * inset_;
 
        /// pointer to the inset passed through showInset
        InsetTabular * inset_;
index ce7b40e047012be984f10b206c64a6d27ccc6ea5..c977117c3b9d98b83da48dabf960fe42fd8eadba 100644 (file)
 #include "xformsBC.h"
 #include "ControlTabularCreate.h"
 #include "FormTabularCreate.h"
 #include "xformsBC.h"
 #include "ControlTabularCreate.h"
 #include "FormTabularCreate.h"
-#include "form_tabular_create.h"
+#include "forms/form_tabular_create.h"
 #include "support/lstrings.h"
 #include "support/lstrings.h"
+#include FORMS_H_LOCATION
 
 
 using std::make_pair;
 
 
 
 
 using std::make_pair;
 
 
-typedef FormCB<ControlTabularCreate, FormDB<FD_form_tabular_create> > base_class;
+typedef FormCB<ControlTabularCreate, FormDB<FD_tabular_create> > base_class;
 
 FormTabularCreate::FormTabularCreate(ControlTabularCreate & c)
        : base_class(c, _("Insert Tabular"))
 
 FormTabularCreate::FormTabularCreate(ControlTabularCreate & c)
        : base_class(c, _("Insert Tabular"))
@@ -32,7 +33,7 @@ FormTabularCreate::FormTabularCreate(ControlTabularCreate & c)
 
 void FormTabularCreate::build()
 {
 
 void FormTabularCreate::build()
 {
-       dialog_.reset(build_tabular_create());
+       dialog_.reset(build_tabular_create(this));
 
        fl_set_slider_bounds(dialog_->slider_rows, 1, 50);
        fl_set_slider_bounds(dialog_->slider_columns, 1, 50);
 
        fl_set_slider_bounds(dialog_->slider_rows, 1, 50);
        fl_set_slider_bounds(dialog_->slider_columns, 1, 50);
index 9a2c92a997ce2f11603716d2df1ec86c662a19b4..91df9dae974e135ba8bb1bde6b94d7514e360caf 100644 (file)
 #include "FormBase.h"
 
 class ControlTabularCreate;
 #include "FormBase.h"
 
 class ControlTabularCreate;
-struct FD_form_tabular_create;
+struct FD_tabular_create;
 
 /** This class provides an XForms implementation of the TabularCreate
     Dialog.
  */
 class FormTabularCreate :
 
 /** This class provides an XForms implementation of the TabularCreate
     Dialog.
  */
 class FormTabularCreate :
-       public FormCB<ControlTabularCreate, FormDB<FD_form_tabular_create> > {
+       public FormCB<ControlTabularCreate, FormDB<FD_tabular_create> > {
 public:
        ///
        FormTabularCreate(ControlTabularCreate &);
 public:
        ///
        FormTabularCreate(ControlTabularCreate &);
@@ -36,9 +36,6 @@ private:
        virtual void build();
        /// not needed
        virtual void update() {};
        virtual void build();
        /// not needed
        virtual void update() {};
-
-       ///
-       FD_form_tabular_create * build_tabular_create();
 };
 
 #endif // FORMTABULARCREATE
 };
 
 #endif // FORMTABULARCREATE
index 87a3b9e01bc871bfc2db7c11dad9c18b23f68e56..70ecfaf9ba3b77c896cc9b336055c07536787817 100644 (file)
 
 #include "xformsBC.h"
 #include "FormTexinfo.h"
 
 #include "xformsBC.h"
 #include "FormTexinfo.h"
-#include "form_texinfo.h"
+#include "forms/form_texinfo.h"
 #include "Tooltips.h"
 #include "gettext.h"
 #include "debug.h"
 #include "xforms_helpers.h"
 #include "support/LAssert.h"
 #include "Tooltips.h"
 #include "gettext.h"
 #include "debug.h"
 #include "xforms_helpers.h"
 #include "support/LAssert.h"
+#include FORMS_H_LOCATION
 
 
 
 
-typedef FormCB<ControlTexinfo, FormDB<FD_form_texinfo> > base_class;
+typedef FormCB<ControlTexinfo, FormDB<FD_texinfo> > base_class;
 FormTexinfo::FormTexinfo(ControlTexinfo & c)
        : base_class(c, _("LaTeX Information")),
          activeStyle(ControlTexinfo::cls)
 FormTexinfo::FormTexinfo(ControlTexinfo & c)
        : base_class(c, _("LaTeX Information")),
          activeStyle(ControlTexinfo::cls)
@@ -32,7 +33,7 @@ FormTexinfo::FormTexinfo(ControlTexinfo & c)
 
 
 void FormTexinfo::build() {
 
 
 void FormTexinfo::build() {
-       dialog_.reset(build_texinfo());
+       dialog_.reset(build_texinfo(this));
        // courier medium
        fl_set_browser_fontstyle(dialog_->browser,FL_FIXED_STYLE);
        // with Path is default
        // courier medium
        fl_set_browser_fontstyle(dialog_->browser,FL_FIXED_STYLE);
        // with Path is default
index a42fe75c527558d0ba7d83d6d3815116d6c4d8a4..35891e1cbeaca5eae9ff0116abd90fc090f5aff0 100644 (file)
@@ -17,9 +17,9 @@
 #include "FormBase.h"
 #include "ControlTexinfo.h"
 
 #include "FormBase.h"
 #include "ControlTexinfo.h"
 
-struct FD_form_texinfo;
+struct FD_texinfo;
 
 
-class FormTexinfo : public FormCB<ControlTexinfo, FormDB<FD_form_texinfo> > {
+class FormTexinfo : public FormCB<ControlTexinfo, FormDB<FD_texinfo> > {
 public:
        ///
        FormTexinfo(ControlTexinfo &);
 public:
        ///
        FormTexinfo(ControlTexinfo &);
@@ -35,8 +35,6 @@ private:
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
        ///
        void updateStyles(ControlTexinfo::texFileSuffix);
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
        ///
        void updateStyles(ControlTexinfo::texFileSuffix);
-       /// Fdesign generated method
-       FD_form_texinfo * build_texinfo();
        ///
        ControlTexinfo::texFileSuffix activeStyle;
 };
        ///
        ControlTexinfo::texFileSuffix activeStyle;
 };
index a45f10c6ff955155cc0a7a2fa03800b5fc6c88a9..c4e66c72337726bd59e194cb8541d3a83aee2ff2 100644 (file)
 #pragma implementation
 #endif
 
 #pragma implementation
 #endif
 
-#include <cctype>
-#include "support/lstrings.h"
-#include "xformsBC.h"
-#include "xforms_helpers.h"
 #include "ControlThesaurus.h"
 #include "FormThesaurus.h"
 #include "ControlThesaurus.h"
 #include "FormThesaurus.h"
-#include "form_thesaurus.h"
+#include "forms/form_thesaurus.h"
+#include "xformsBC.h"
+#include "xforms_helpers.h"
 #include "debug.h"
 #include "debug.h"
+#include "support/lstrings.h"
+#include FORMS_H_LOCATION
+#include <cctype>
 
 #ifndef CXX_GLOBAL_CSTD
 using std::isupper;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::isupper;
@@ -29,7 +30,7 @@ using std::islower;
 using std::vector;
 
 
 using std::vector;
 
 
-typedef FormCB<ControlThesaurus, FormDB<FD_form_thesaurus> > base_class;
+typedef FormCB<ControlThesaurus, FormDB<FD_thesaurus> > base_class;
 
 
 FormThesaurus::FormThesaurus(ControlThesaurus & c)
 
 
 FormThesaurus::FormThesaurus(ControlThesaurus & c)
@@ -41,7 +42,7 @@ FormThesaurus::FormThesaurus(ControlThesaurus & c)
 
 void FormThesaurus::build()
 {
 
 void FormThesaurus::build()
 {
-       dialog_.reset(build_thesaurus());
+       dialog_.reset(build_thesaurus(this));
 
        fl_set_input_return(dialog_->input_entry,   FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_replace, FL_RETURN_CHANGED);
 
        fl_set_input_return(dialog_->input_entry,   FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_replace, FL_RETURN_CHANGED);
index 3ef7f5057b42a9244a6051222210f06255a3948f..d23b81a10bfa90b51b18035f84c6cd9a4efe4151 100644 (file)
 #include "FormBase.h"
 
 class ControlThesaurus;
 #include "FormBase.h"
 
 class ControlThesaurus;
-struct FD_form_thesaurus;
-struct FD_form_noun;
-struct FD_form_verb;
-struct FD_form_adjective;
-struct FD_form_adverb;
-struct FD_form_other;
+struct FD_thesaurus;
 
 /** This class provides an XForms implementation of the Thesaurus dialog.
  */
 
 /** This class provides an XForms implementation of the Thesaurus dialog.
  */
-class FormThesaurus : public FormCB<ControlThesaurus, FormDB<FD_form_thesaurus> > {
+class FormThesaurus : public FormCB<ControlThesaurus, FormDB<FD_thesaurus> > {
 public:
        ///
        FormThesaurus(ControlThesaurus &);
 public:
        ///
        FormThesaurus(ControlThesaurus &);
@@ -39,9 +34,6 @@ private:
        /// update dialog
        virtual void update();
 
        /// update dialog
        virtual void update();
 
-       /// dialog build
-       FD_form_thesaurus * build_thesaurus();
-
        /// set the replace word properly
        void setReplace(string const & templ, string const & nstr);
 
        /// set the replace word properly
        void setReplace(string const & templ, string const & nstr);
 
index 0570578d4d9cece6843d997526d3d0bddc218f72..35c46dc07bbd87dd5b5ed19489b71d151601999b 100644 (file)
 #include "FormToc.h"
 #include "xformsBC.h"
 #include "ControlToc.h"
 #include "FormToc.h"
 #include "xformsBC.h"
 #include "ControlToc.h"
-#include "form_toc.h"
+#include "forms/form_toc.h"
 #include "helper_funcs.h" // getStringFromVector
 #include "support/lstrings.h" // frontStrip, strip
 #include "debug.h"
 #include "gettext.h"
 #include "helper_funcs.h" // getStringFromVector
 #include "support/lstrings.h" // frontStrip, strip
 #include "debug.h"
 #include "gettext.h"
+#include FORMS_H_LOCATION
 
 #include <vector>
 
 using std::endl;
 
 
 
 #include <vector>
 
 using std::endl;
 
 
-typedef FormCB<ControlToc, FormDB<FD_form_toc> > base_class;
+typedef FormCB<ControlToc, FormDB<FD_toc> > base_class;
 
 FormToc::FormToc(ControlToc & c)
        : base_class(c, _("Table of Contents"))
 
 FormToc::FormToc(ControlToc & c)
        : base_class(c, _("Table of Contents"))
@@ -35,7 +36,7 @@ FormToc::FormToc(ControlToc & c)
 
 void FormToc::build()
 {
 
 void FormToc::build()
 {
-       dialog_.reset(build_toc());
+       dialog_.reset(build_toc(this));
 
        string const choice =
                " " + getStringFromVector(controller().getTypes(), " | ") + " ";
 
        string const choice =
                " " + getStringFromVector(controller().getTypes(), " | ") + " ";
index 079d5d986ea7271a0abf1bb16a9c6bf02b28e873..2d8b552b644726e0df066a737729961832d46548 100644 (file)
 #include "buffer.h"
 
 class ControlToc;
 #include "buffer.h"
 
 class ControlToc;
-struct FD_form_toc;
+struct FD_toc;
 
 /** This class provides an XForms implementation of the FormToc Dialog.
  */
 
 /** This class provides an XForms implementation of the FormToc Dialog.
  */
-class FormToc : public FormCB<ControlToc, FormDB<FD_form_toc> > {
+class FormToc : public FormCB<ControlToc, FormDB<FD_toc> > {
 public:
        ///
        FormToc(ControlToc &);
 public:
        ///
        FormToc(ControlToc &);
@@ -41,9 +41,6 @@ private:
        ///
        void updateContents();
 
        ///
        void updateContents();
 
-       /// Fdesign generated method
-       FD_form_toc * build_toc();
-
        ///
        Buffer::SingleList toclist_;
 };
        ///
        Buffer::SingleList toclist_;
 };
index 276965721708acc310ef2b43e0c74594d0292b05..46a786076e2685cfb465979192f3fd5c76fdb19f 100644 (file)
 #include "xformsBC.h"
 #include "ControlUrl.h"
 #include "FormUrl.h"
 #include "xformsBC.h"
 #include "ControlUrl.h"
 #include "FormUrl.h"
-#include "form_url.h"
+#include "forms/form_url.h"
+#include FORMS_H_LOCATION
 
 
-typedef FormCB<ControlUrl, FormDB<FD_form_url> > base_class;
+typedef FormCB<ControlUrl, FormDB<FD_url> > base_class;
 
 FormUrl::FormUrl(ControlUrl & c)
        : base_class(c, _("Url"))
 
 FormUrl::FormUrl(ControlUrl & c)
        : base_class(c, _("Url"))
@@ -27,7 +28,7 @@ FormUrl::FormUrl(ControlUrl & c)
 
 void FormUrl::build()
 {
 
 void FormUrl::build()
 {
-       dialog_.reset(build_url());
+       dialog_.reset(build_url(this));
 
        fl_set_input_return(dialog_->input_name, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_url,  FL_RETURN_CHANGED);
 
        fl_set_input_return(dialog_->input_name, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_url,  FL_RETURN_CHANGED);
index 23c984d75ffff884c9e6d1fff6259233507b5c82..1ed730e87333c361cc3fe2869db36e93aec67c92 100644 (file)
 #include "FormBase.h"
 
 class ControlUrl;
 #include "FormBase.h"
 
 class ControlUrl;
-struct FD_form_url;
+struct FD_url;
 
 /** This class provides an XForms implementation of the Url Dialog.
  */
 
 /** This class provides an XForms implementation of the Url Dialog.
  */
-class FormUrl : public FormCB<ControlUrl, FormDB<FD_form_url> > {
+class FormUrl : public FormCB<ControlUrl, FormDB<FD_url> > {
 public:
        ///
        FormUrl(ControlUrl &);
 public:
        ///
        FormUrl(ControlUrl &);
@@ -33,8 +33,6 @@ private:
        virtual void build();
        /// Update dialog before showing it
        virtual void update();
        virtual void build();
        /// Update dialog before showing it
        virtual void update();
-       /// Filter the inputs on callback from xforms
-       FD_form_url * build_url();
 };
 
 #endif // FORMURL_H
 };
 
 #endif // FORMURL_H
index 6973fb057e4833aa5abceab780bbd8bdef9f2e82..c4d7ef2b04ce5cefc662ce1c4293c0ed6e39a3ff 100644 (file)
@@ -16,8 +16,9 @@
 #include "xformsBC.h"
 #include "ControlVCLog.h"
 #include "FormVCLog.h"
 #include "xformsBC.h"
 #include "ControlVCLog.h"
 #include "FormVCLog.h"
-#include "form_browser.h"
+#include "forms/form_browser.h"
 #include "gettext.h"
 #include "gettext.h"
+#include FORMS_H_LOCATION
 
 FormVCLog::FormVCLog(ControlVCLog & c)
        : FormCB<ControlVCLog, FormBrowser>(c, _("Version Control Log"))
 
 FormVCLog::FormVCLog(ControlVCLog & c)
        : FormCB<ControlVCLog, FormBrowser>(c, _("Version Control Log"))
index a95a0337958d5e7efa8154201ffefc1a80537b57..ed2b953913b8bc76bd3f7d532c59ad737fd28428 100644 (file)
@@ -18,15 +18,33 @@ endif
 
 # Alphabetical order please.  It makes it easier to figure out what's missing.
 libxforms_la_SOURCES = \
 
 # Alphabetical order please.  It makes it easier to figure out what's missing.
 libxforms_la_SOURCES = \
-       Alert_pimpl.C \
+       forms_fwd.h \
+       forms_gettext.C \
+       forms_gettext.h \
        bmtable.c \
        bmtable.h \
        bmtable.c \
        bmtable.h \
+       combox.C \
+       combox.h \
+       input_validators.C \
+       input_validators.h \
+       lyx_gui.C \
+       lyxlookup.C \
+       lyxlookup.h \
+       xfont_loader.C \
+       xfont_loader.h \
+       xfont_metrics.C \
+       xfont_metrics.h \
+       xforms_helpers.C \
+       xforms_helpers.h \
+       xforms_resize.C \
+       xforms_resize.h \
+       $(XFORMSGIMAGE) xformsBC.C \
+       xformsBC.h \
+       Alert_pimpl.C \
        Color.C \
        Color.h \
        ColorHandler.C \
        ColorHandler.h \
        Color.C \
        Color.h \
        ColorHandler.C \
        ColorHandler.h \
-       combox.C \
-       combox.h \
        Dialogs.C \
        DropDown.h \
        DropDown.C \
        Dialogs.C \
        DropDown.h \
        DropDown.C \
@@ -37,72 +55,40 @@ libxforms_la_SOURCES = \
        FontInfo.h \
        FormFiledialog.h \
        FormFiledialog.C \
        FontInfo.h \
        FormFiledialog.h \
        FormFiledialog.C \
-       form_filedialog.C \
-       form_filedialog.h \
        FormAboutlyx.C \
        FormAboutlyx.h \
        FormAboutlyx.C \
        FormAboutlyx.h \
-       form_aboutlyx.C \
-       form_aboutlyx.h \
        FormBase.C \
        FormBase.h \
        FormBaseDeprecated.C \
        FormBaseDeprecated.h \
        FormBibitem.C \
        FormBibitem.h \
        FormBase.C \
        FormBase.h \
        FormBaseDeprecated.C \
        FormBaseDeprecated.h \
        FormBibitem.C \
        FormBibitem.h \
-       form_bibitem.C \
-       form_bibitem.h \
        FormBibtex.C \
        FormBibtex.h \
        FormBibtex.C \
        FormBibtex.h \
-       form_bibtex.C \
-       form_bibtex.h \
        FormBrowser.C \
        FormBrowser.h \
        FormBrowser.C \
        FormBrowser.h \
-       form_browser.C \
-       form_browser.h \
        FormCharacter.C \
        FormCharacter.h \
        FormCharacter.C \
        FormCharacter.h \
-       form_character.C \
-       form_character.h \
        FormCitation.C \
        FormCitation.h \
        FormCitation.C \
        FormCitation.h \
-       form_citation.C \
-       form_citation.h \
        FormDocument.C \
        FormDocument.h \
        FormDocument.C \
        FormDocument.h \
-       form_document.C \
-       form_document.h \
        FormError.C \
        FormError.h \
        FormError.C \
        FormError.h \
-       form_error.C \
-       form_error.h \
        FormERT.C \
        FormERT.h \
        FormERT.C \
        FormERT.h \
-       form_ert.C \
-       form_ert.h \
        FormExternal.C \
        FormExternal.h \
        FormExternal.C \
        FormExternal.h \
-       form_external.C \
-       form_external.h \
        FormFloat.C \
        FormFloat.h \
        FormFloat.C \
        FormFloat.h \
-       form_float.C \
-       form_float.h \
        FormForks.C \
        FormForks.h \
        FormForks.C \
        FormForks.h \
-       form_forks.C \
-       form_forks.h \
        FormGraphics.C \
        FormGraphics.h \
        FormGraphics.C \
        FormGraphics.h \
-       form_graphics.C \
-       form_graphics.h \
        FormInclude.C \
        FormInclude.h \
        FormInclude.C \
        FormInclude.h \
-       form_include.C \
-       form_include.h \
        FormIndex.C \
        FormIndex.h \
        FormIndex.C \
        FormIndex.h \
-       form_index.C \
-       form_index.h \
        FormInset.C \
        FormInset.h \
        FormLog.C \
        FormInset.C \
        FormInset.h \
        FormLog.C \
@@ -111,97 +97,50 @@ libxforms_la_SOURCES = \
        FormMathsBitmap.h \
        FormMathsDeco.C \
        FormMathsDeco.h \
        FormMathsBitmap.h \
        FormMathsDeco.C \
        FormMathsDeco.h \
-       form_maths_deco.C \
-       form_maths_deco.h \
        FormMathsDelim.C \
        FormMathsDelim.h \
        FormMathsDelim.C \
        FormMathsDelim.h \
-       form_maths_delim.C \
-       form_maths_delim.h \
        FormMathsMatrix.C \
        FormMathsMatrix.h \
        FormMathsMatrix.C \
        FormMathsMatrix.h \
-       form_maths_matrix.C \
-       form_maths_matrix.h \
        FormMathsPanel.C \
        FormMathsPanel.h \
        FormMathsPanel.C \
        FormMathsPanel.h \
-       form_maths_panel.C \
-       form_maths_panel.h \
        FormMathsSpace.C \
        FormMathsSpace.h \
        FormMathsSpace.C \
        FormMathsSpace.h \
-       form_maths_space.C \
-       form_maths_space.h \
        FormMathsStyle.C \
        FormMathsStyle.h \
        FormMathsStyle.C \
        FormMathsStyle.h \
-       form_maths_style.C \
-       form_maths_style.h \
        FormMinipage.C \
        FormMinipage.h \
        FormMinipage.C \
        FormMinipage.h \
-       form_minipage.C \
-       form_minipage.h \
        FormParagraph.C \
        FormParagraph.h \
        FormParagraph.C \
        FormParagraph.h \
-       form_paragraph.C \
-       form_paragraph.h \
        FormPreamble.C \
        FormPreamble.h \
        FormPreamble.C \
        FormPreamble.h \
-       form_preamble.C \
-       form_preamble.h \
        FormPreferences.C \
        FormPreferences.h \
        FormPreferences.C \
        FormPreferences.h \
-       form_preferences.C \
-       form_preferences.h \
        FormPrint.C \
        FormPrint.h \
        FormPrint.C \
        FormPrint.h \
-       form_print.C \
-       form_print.h \
        FormRef.C \
        FormRef.h \
        FormRef.C \
        FormRef.h \
-       form_ref.C \
-       form_ref.h \
        FormSearch.C \
        FormSearch.h \
        FormSearch.C \
        FormSearch.h \
-       form_search.C \
-       form_search.h \
        FormSendto.C \
        FormSendto.h \
        FormSendto.C \
        FormSendto.h \
-       form_sendto.C \
-       form_sendto.h \
        FormShowFile.C \
        FormShowFile.h \
        FormSpellchecker.C \
        FormSpellchecker.h \
        FormShowFile.C \
        FormShowFile.h \
        FormSpellchecker.C \
        FormSpellchecker.h \
-       form_spellchecker.C \
-       form_spellchecker.h \
        FormTabular.C \
        FormTabular.h \
        FormTabular.C \
        FormTabular.h \
-       form_tabular.C \
-       form_tabular.h \
        FormTabularCreate.C \
        FormTabularCreate.h \
        FormTabularCreate.C \
        FormTabularCreate.h \
-       form_tabular_create.C \
-       form_tabular_create.h \
        FormTexinfo.C \
        FormTexinfo.h \
        FormTexinfo.C \
        FormTexinfo.h \
-       form_texinfo.C \
-       form_texinfo.h \
        FormThesaurus.C \
        FormThesaurus.h \
        FormThesaurus.C \
        FormThesaurus.h \
-       form_thesaurus.C \
-       form_thesaurus.h \
        FormToc.C \
        FormToc.h \
        FormToc.C \
        FormToc.h \
-       form_toc.C \
-       form_toc.h \
        FormUrl.C \
        FormUrl.h \
        FormUrl.C \
        FormUrl.h \
-       form_url.C \
-       form_url.h \
        FormVCLog.C \
        FormVCLog.h \
        FormVCLog.C \
        FormVCLog.h \
-       input_validators.C \
-       input_validators.h \
-       lyx_gui.C \
-       lyxlookup.C \
-       lyxlookup.h \
        MathsSymbols.C \
        MathsSymbols.h \
        Menubar_pimpl.C \
        MathsSymbols.C \
        MathsSymbols.h \
        Menubar_pimpl.C \
@@ -219,17 +158,7 @@ libxforms_la_SOURCES = \
        XPainter.C \
        XPainter.h \
        XWorkArea.h \
        XPainter.C \
        XPainter.h \
        XWorkArea.h \
-       XWorkArea.C \
-       xfont_loader.C \
-       xfont_loader.h \
-       xfont_metrics.C \
-       xfont_metrics.h \
-       xforms_helpers.C \
-       xforms_helpers.h \
-       xforms_resize.C \
-       xforms_resize.h \
-       $(XFORMSGIMAGE) xformsBC.C \
-       xformsBC.h
+       XWorkArea.C
 
 libxforms.la: $(libxforms_la_OBJECTS) $(libxforms_la_DEPENDENCIES)
 
 
 libxforms.la: $(libxforms_la_OBJECTS) $(libxforms_la_DEPENDENCIES)
 
index adf74431e551aa32ef60209d51ad4d13a2ae7bb6..ddbf301ecf24e5ceae42d020768d37db1901625e 100644 (file)
@@ -25,6 +25,7 @@
 #include "support/LAssert.h"
 #include "gettext.h"
 #include "debug.h"
 #include "support/LAssert.h"
 #include "gettext.h"
 #include "debug.h"
+#include FORMS_H_LOCATION
 
 #include <boost/scoped_ptr.hpp>
 
 
 #include <boost/scoped_ptr.hpp>
 
index eedba5acce537a4e28bc2cc2ab96abcab2a7b5dd..85d895bba93c51e69179ef4bde77ef56eaf5c376 100644 (file)
@@ -23,7 +23,8 @@
 
 #include <boost/shared_ptr.hpp>
 
 
 #include <boost/shared_ptr.hpp>
 
-#include FORMS_H_LOCATION
+#include "forms_fwd.h"
+#include <X11/X.h> // Window
 
 #include <vector>
 #include <map>
 
 #include <vector>
 #include <map>
index e572c3a63118993da26d34644e94754926f34c3a..b0487e25198e8e11af72904dbcbb438b3808d70f 100644 (file)
@@ -15,6 +15,7 @@
 #endif
 
 #include "RadioButtonGroup.h"
 #endif
 
 #include "RadioButtonGroup.h"
+#include FORMS_H_LOCATION
 
 #include "debug.h" // for lyxerr
 #include "support/lyxfunctional.h"
 
 #include "debug.h" // for lyxerr
 #include "support/lyxfunctional.h"
index 682f344430f404a8adf85f8965fba88dc08b1441..382106f4e8c1b3db68d66cf9b225b80f2598b326 100644 (file)
@@ -19,7 +19,7 @@
 #include "support/types.h"
 #include <vector>
 #include <utility>
 #include "support/types.h"
 #include <vector>
 #include <utility>
-#include FORMS_H_LOCATION
+#include "forms_fwd.h"
 
 /** This class simplifies the work with a group of radio buttons,
  * the idea is that you register a bunch of radio buttons with the accompanying
 
 /** This class simplifies the work with a group of radio buttons,
  * the idea is that you register a bunch of radio buttons with the accompanying
index 4cf65b6999c2e406c47e802791ffd583b6446498..27a4d78894ca63f1f80e45f404ad79a3ee1d16c0 100644 (file)
@@ -28,6 +28,7 @@
 #include "MathsSymbols.h"
 #include "gettext.h"
 #include "Tooltips.h"
 #include "MathsSymbols.h"
 #include "gettext.h"
 #include "Tooltips.h"
+#include FORMS_H_LOCATION
 
 #include "support/LAssert.h"
 #include "support/filetools.h"
 
 #include "support/LAssert.h"
 #include "support/filetools.h"
index 8209d4f923af3d02eabddb06bb6c2b7c1cab4be1..c695c587e9dfbbbfcfbfadf7f8f8e238ddcd7607 100644 (file)
@@ -12,7 +12,7 @@
 #define TOOLBAR_PIMPL_H
 
 #include <vector>
 #define TOOLBAR_PIMPL_H
 
 #include <vector>
-#include FORMS_H_LOCATION
+#include "forms_fwd.h"
 
 #include "frontends/Toolbar.h"
 
 
 #include "frontends/Toolbar.h"
 
index 7d153e0820b5564a5a541b91739bddf37d43297c..a205683377f61b16dc03ce8a111c160fa027d7fb 100644 (file)
@@ -24,6 +24,7 @@
 #include "gettext.h"
 #include "support/lstrings.h"
 #include "support/LAssert.h"
 #include "gettext.h"
 #include "support/lstrings.h"
 #include "support/LAssert.h"
+#include FORMS_H_LOCATION
 
 #include <boost/bind.hpp>
 
 
 #include <boost/bind.hpp>
 
index 8f4958e4b8a2a0792962a0ef72233dba747b6118..0acff36e0e2f5a031975c249d72d854fdda38c2b 100644 (file)
@@ -22,7 +22,7 @@
 #include <boost/signals/signal0.hpp>
 #include <boost/signals/trackable.hpp>
 
 #include <boost/signals/signal0.hpp>
 #include <boost/signals/trackable.hpp>
 
-#include FORMS_H_LOCATION // Can't forward-declare FL_OBJECT
+#include "forms_fwd.h" // Can't forward-declare FL_OBJECT
 
 #include <map>
 
 
 #include <map>
 
index 057e2626eed4cf771530888523d4c5a83d23ad6a..672e0dabc9fb03fea2f556891e8bf923781da95d 100644 (file)
@@ -15,6 +15,7 @@
 #endif
 
 #include "XFormsView.h"
 #endif
 
 #include "XFormsView.h"
+#include FORMS_H_LOCATION
 #if FL_VERSION < 1 && (FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5))
 #include "frontends/xforms/lyxlookup.h"
 #endif
 #if FL_VERSION < 1 && (FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5))
 #include "frontends/xforms/lyxlookup.h"
 #endif
index cd2d8877eaeedd3d72774e381e5ef4120189f07b..703158041406283537f1ddc8a3250d88eb86fc94 100644 (file)
@@ -16,7 +16,7 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 
-#include FORMS_H_LOCATION
+#include "forms_fwd.h"
 
 #include "frontends/LyXView.h"
 
 
 #include "frontends/LyXView.h"
 
index 473f83df978a707ee3174f9d38d15f3dd04bd5f6..5caf8076d8475eda517d767ffe227861adc1faeb 100644 (file)
@@ -15,7 +15,6 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 
-#include FORMS_H_LOCATION
 #include "XPainter.h"
 #include "frontends/mouse_state.h"
 #include "frontends/key_state.h"
 #include "XPainter.h"
 #include "frontends/mouse_state.h"
 #include "frontends/key_state.h"
@@ -25,6 +24,7 @@
 #include <boost/signals/signal2.hpp>
 #include <boost/signals/signal3.hpp>
 
 #include <boost/signals/signal2.hpp>
 #include <boost/signals/signal3.hpp>
 
+#include FORMS_H_LOCATION
 #include <utility>
 
 ///
 #include <utility>
 
 ///
diff --git a/src/frontends/xforms/form_aboutlyx.C b/src/frontends/xforms/form_aboutlyx.C
deleted file mode 100644 (file)
index 59f7b17..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_aboutlyx.h"
-#include "FormAboutlyx.h"
-
-FD_form_aboutlyx::~FD_form_aboutlyx()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_aboutlyx * FormAboutlyx::build_aboutlyx()
-{
-  FL_OBJECT *obj;
-  FD_form_aboutlyx *fdui = new FD_form_aboutlyx;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 400);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 450, 400, "");
-  {
-    char const * const dummy = N_("Close|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 320, 360, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  fdui->tabfolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 10, 20, 430, 330, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_tab_version::~FD_form_tab_version()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_tab_version * FormAboutlyx::build_tab_version()
-{
-  FL_OBJECT *obj;
-  FD_form_tab_version *fdui = new FD_form_tab_version;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 430, 310);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 430, 310, "");
-  fdui->text_copyright = obj = fl_add_text(FL_NORMAL_TEXT, 10, 10, 410, 110, _("Text"));
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
-  fdui->text_version = obj = fl_add_text(FL_NORMAL_TEXT, 10, 130, 410, 170, _("Text"));
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_tab_credits::~FD_form_tab_credits()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_tab_credits * FormAboutlyx::build_tab_credits()
-{
-  FL_OBJECT *obj;
-  FD_form_tab_credits *fdui = new FD_form_tab_credits;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 430, 310);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 430, 310, "");
-  fdui->browser_credits = obj = fl_add_browser(FL_NORMAL_BROWSER, 10, 10, 410, 290, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_tab_license::~FD_form_tab_license()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_tab_license * FormAboutlyx::build_tab_license()
-{
-  FL_OBJECT *obj;
-  FD_form_tab_license *fdui = new FD_form_tab_license;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 430, 310);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 430, 310, "");
-  fdui->text_license = obj = fl_add_text(FL_NORMAL_TEXT, 10, 10, 410, 100, _("Text"));
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
-  fdui->text_warranty = obj = fl_add_text(FL_NORMAL_TEXT, 10, 120, 410, 180, _("Text"));
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_aboutlyx.h b/src/frontends/xforms/form_aboutlyx.h
deleted file mode 100644 (file)
index a118ac7..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_aboutlyx_h_
-#define FD_form_aboutlyx_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-
-
-
-/**** Forms and Objects ****/
-struct FD_form_aboutlyx {
-       ~FD_form_aboutlyx();
-
-       FL_FORM *form;
-       FL_OBJECT *button_close;
-       FL_OBJECT *tabfolder;
-};
-struct FD_form_tab_version {
-       ~FD_form_tab_version();
-
-       FL_FORM *form;
-       FL_OBJECT *text_copyright;
-       FL_OBJECT *text_version;
-};
-struct FD_form_tab_credits {
-       ~FD_form_tab_credits();
-
-       FL_FORM *form;
-       FL_OBJECT *browser_credits;
-};
-struct FD_form_tab_license {
-       ~FD_form_tab_license();
-
-       FL_FORM *form;
-       FL_OBJECT *text_license;
-       FL_OBJECT *text_warranty;
-};
-
-#endif /* FD_form_aboutlyx_h_ */
diff --git a/src/frontends/xforms/form_bibitem.C b/src/frontends/xforms/form_bibitem.C
deleted file mode 100644 (file)
index e656e0d..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_bibitem.h"
-#include "FormBibitem.h"
-
-FD_form_bibitem::~FD_form_bibitem()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_bibitem * FormBibitem::build_bibitem()
-{
-  FL_OBJECT *obj;
-  FD_form_bibitem *fdui = new FD_form_bibitem;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 220, 130);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 220, 130, "");
-  {
-    char const * const dummy = N_("Key:|#K");
-    fdui->input_key = obj = fl_add_input(FL_NORMAL_INPUT, 80, 10, 130, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 20, 90, 90, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 3);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 120, 90, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 2);
-  {
-    char const * const dummy = N_("Label:|#L");
-    fdui->input_label = obj = fl_add_input(FL_NORMAL_INPUT, 80, 50, 130, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_bibitem.h b/src/frontends/xforms/form_bibitem.h
deleted file mode 100644 (file)
index 2420f91..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_bibitem_h_
-#define FD_form_bibitem_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_bibitem {
-       ~FD_form_bibitem();
-
-       FL_FORM *form;
-       FL_OBJECT *input_key;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_close;
-       FL_OBJECT *input_label;
-};
-
-#endif /* FD_form_bibitem_h_ */
diff --git a/src/frontends/xforms/form_bibtex.C b/src/frontends/xforms/form_bibtex.C
deleted file mode 100644 (file)
index 0ec2c8f..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_bibtex.h"
-#include "FormBibtex.h"
-
-FD_form_bibtex::~FD_form_bibtex()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_bibtex * FormBibtex::build_bibtex()
-{
-  FL_OBJECT *obj;
-  FD_form_bibtex *fdui = new FD_form_bibtex;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 160);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 450, 160, "");
-  {
-    char const * const dummy = N_("Database:|#D");
-    fdui->input_database = obj = fl_add_input(FL_NORMAL_INPUT, 90, 10, 245, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 250, 120, 90, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 3);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 120, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 2);
-  {
-    char const * const dummy = N_("Style:|#S");
-    fdui->input_style = obj = fl_add_input(FL_NORMAL_INPUT, 90, 45, 245, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Browse...|#B");
-    fdui->button_database_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 10, 100, 29, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Browse...|#r");
-    fdui->button_style_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 45, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Add bibliography to TOC|#A");
-    fdui->check_bibtotoc = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 90, 80, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_bibtex.h b/src/frontends/xforms/form_bibtex.h
deleted file mode 100644 (file)
index d7d74cc..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_bibtex_h_
-#define FD_form_bibtex_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_bibtex {
-       ~FD_form_bibtex();
-
-       FL_FORM *form;
-       FL_OBJECT *input_database;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_close;
-       FL_OBJECT *input_style;
-       FL_OBJECT *button_database_browse;
-       FL_OBJECT *button_style_browse;
-       FL_OBJECT *check_bibtotoc;
-};
-
-#endif /* FD_form_bibtex_h_ */
diff --git a/src/frontends/xforms/form_browser.C b/src/frontends/xforms/form_browser.C
deleted file mode 100644 (file)
index 1461173..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_browser.h"
-#include "FormBrowser.h"
-
-FD_form_browser::~FD_form_browser()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_browser * FormBrowser::build_browser()
-{
-  FL_OBJECT *obj;
-  FD_form_browser *fdui = new FD_form_browser;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 470, 380);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 470, 380, "");
-  fdui->browser = obj = fl_add_browser(FL_NORMAL_BROWSER, 10, 10, 450, 320, "");
-    fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
-  {
-    char const * const dummy = N_("Close|^[^M");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 340, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  {
-    char const * const dummy = N_("Update|#Uu");
-    fdui->button_update = obj = fl_add_button(FL_NORMAL_BUTTON, 270, 340, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_browser.h b/src/frontends/xforms/form_browser.h
deleted file mode 100644 (file)
index a4f3a3d..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_browser_h_
-#define FD_form_browser_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_browser {
-       ~FD_form_browser();
-
-       FL_FORM *form;
-       FL_OBJECT *browser;
-       FL_OBJECT *button_close;
-       FL_OBJECT *button_update;
-};
-
-#endif /* FD_form_browser_h_ */
diff --git a/src/frontends/xforms/form_character.C b/src/frontends/xforms/form_character.C
deleted file mode 100644 (file)
index 73158cb..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_character.h"
-#include "FormCharacter.h"
-
-FD_form_character::~FD_form_character()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_character * FormCharacter::build_character()
-{
-  FL_OBJECT *obj;
-  FD_form_character *fdui = new FD_form_character;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 300, 415);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 300, 415, "");
-    fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 10, 280, 240, "");
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-  {
-    char const * const dummy = N_("Family:|#F");
-    fdui->choice_family = obj = fl_add_choice(FL_NORMAL_CHOICE, 94, 15, 191, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Series:|#S");
-    fdui->choice_series = obj = fl_add_choice(FL_NORMAL_CHOICE, 94, 55, 191, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Shape:|#H");
-    fdui->choice_shape = obj = fl_add_choice(FL_NORMAL_CHOICE, 94, 95, 191, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Size:|#Z");
-    fdui->choice_size = obj = fl_add_choice(FL_NORMAL_CHOICE, 95, 275, 191, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Misc:|#M");
-    fdui->choice_bar = obj = fl_add_choice(FL_NORMAL_CHOICE, 95, 335, 190, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 60, 375, 80, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  {
-    char const * const dummy = N_("Cancel|#N");
-    fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 175, 375, 80, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  {
-    char const * const dummy = N_("Color:|#C");
-    fdui->choice_color = obj = fl_add_choice(FL_NORMAL_CHOICE, 95, 135, 191, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Toggle on all these|#T");
-    fdui->check_toggle_all = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 215, 255, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->choice_language = obj = fl_add_choice(FL_DROPLIST_CHOICE, 95, 175, 190, 30, _("Language:"));
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 265, 280, 45, _("These are never toggled"));
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 325, 280, 45, _("These are always toggled"));
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-  obj = fl_add_text(FL_NORMAL_TEXT, 11, 170, 84, 40, _("Language:"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_character.h b/src/frontends/xforms/form_character.h
deleted file mode 100644 (file)
index 6b51444..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_character_h_
-#define FD_form_character_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_character {
-       ~FD_form_character();
-
-       FL_FORM *form;
-       FL_OBJECT *choice_family;
-       FL_OBJECT *choice_series;
-       FL_OBJECT *choice_shape;
-       FL_OBJECT *choice_size;
-       FL_OBJECT *choice_bar;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_close;
-       FL_OBJECT *choice_color;
-       FL_OBJECT *check_toggle_all;
-       FL_OBJECT *choice_language;
-};
-
-#endif /* FD_form_character_h_ */
diff --git a/src/frontends/xforms/form_citation.C b/src/frontends/xforms/form_citation.C
deleted file mode 100644 (file)
index 8194a2d..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_citation.h"
-#include "FormCitation.h"
-
-FD_form_citation::~FD_form_citation()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_citation * FormCitation::build_citation()
-{
-  FL_OBJECT *obj;
-  FD_form_citation *fdui = new FD_form_citation;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 680, 440);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 680, 440, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  {
-    char const * const dummy = N_("Inset keys|#I");
-    fdui->browser_cite = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 30, 150, 240, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_South);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Bibliography keys|#y");
-    fdui->browser_bib = obj = fl_add_browser(FL_HOLD_BROWSER, 200, 30, 160, 240, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-    fl_set_object_gravity(obj, FL_North, FL_SouthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->button_add = obj = fl_add_button(FL_NORMAL_BUTTON, 165, 30, 30, 30, _("@4->"));
-    fl_set_button_shortcut(obj, _("#&D"), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_North, FL_North);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->button_del = obj = fl_add_button(FL_NORMAL_BUTTON, 165, 65, 30, 30, _("@9+"));
-    fl_set_button_shortcut(obj, _("#X"), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_North, FL_North);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->button_up = obj = fl_add_button(FL_NORMAL_BUTTON, 165, 100, 30, 30, _("@8->"));
-    fl_set_button_shortcut(obj, _("#&A"), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_North, FL_North);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->button_down = obj = fl_add_button(FL_NORMAL_BUTTON, 165, 135, 30, 30, _("@2->"));
-    fl_set_button_shortcut(obj, _("#&B"), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_North, FL_North);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->browser_info = obj = fl_add_browser(FL_NORMAL_BROWSER, 10, 290, 350, 90, _("Info"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-  fdui->frame_search = obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 370, 30, 300, 130, _("Search"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
-  fdui->input_search = obj = fl_add_input(FL_NORMAL_INPUT, 380, 45, 280, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-  {
-    char const * const dummy = N_("Regular Expression|#R");
-    fdui->check_search_type = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 385, 90, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
-  {
-    char const * const dummy = N_("Case sensitive|#C");
-    fdui->check_search_case = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 385, 120, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
-  {
-    char const * const dummy = N_("Previous|#P");
-    fdui->button_previous = obj = fl_add_button(FL_NORMAL_BUTTON, 570, 85, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Next|#N");
-    fdui->button_next = obj = fl_add_button(FL_NORMAL_BUTTON, 570, 120, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->frame_style = obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 370, 170, 300, 110, _("Citation style"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  {
-    char const * const dummy = N_("Style:|#S");
-    fdui->choice_style = obj = fl_add_choice(FL_NORMAL_CHOICE, 435, 200, 170, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Full author list|#F");
-    fdui->check_full_author_list = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 240, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Upper case|#U");
-    fdui->check_force_uppercase = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 515, 240, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 370, 290, 300, 90, _("Optional text"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  {
-    char const * const dummy = N_("Before:|#B");
-    fdui->input_before = obj = fl_add_input(FL_NORMAL_INPUT, 460, 305, 200, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("After:|#e");
-    fdui->input_after = obj = fl_add_input(FL_NORMAL_INPUT, 460, 340, 200, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Restore|#R");
-    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 400, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
-    fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 360, 400, 90, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 470, 400, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 580, 400, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_citation.h b/src/frontends/xforms/form_citation.h
deleted file mode 100644 (file)
index f9cf6b2..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_citation_h_
-#define FD_form_citation_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_citation {
-       ~FD_form_citation();
-
-       FL_FORM *form;
-       FL_OBJECT *browser_cite;
-       FL_OBJECT *browser_bib;
-       FL_OBJECT *button_add;
-       FL_OBJECT *button_del;
-       FL_OBJECT *button_up;
-       FL_OBJECT *button_down;
-       FL_OBJECT *browser_info;
-       FL_OBJECT *frame_search;
-       FL_OBJECT *input_search;
-       FL_OBJECT *check_search_type;
-       FL_OBJECT *check_search_case;
-       FL_OBJECT *button_previous;
-       FL_OBJECT *button_next;
-       FL_OBJECT *frame_style;
-       FL_OBJECT *choice_style;
-       FL_OBJECT *check_full_author_list;
-       FL_OBJECT *check_force_uppercase;
-       FL_OBJECT *input_before;
-       FL_OBJECT *input_after;
-       FL_OBJECT *button_restore;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_close;
-};
-
-#endif /* FD_form_citation_h_ */
diff --git a/src/frontends/xforms/form_document.C b/src/frontends/xforms/form_document.C
deleted file mode 100644 (file)
index ba4322a..0000000
+++ /dev/null
@@ -1,682 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-#include "bmtable.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_document.h"
-#include "FormDocument.h"
-#include "bmtable.h"
-#include "support/filetools.h"
-
-FD_form_tabbed_document::~FD_form_tabbed_document()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_tabbed_document * FormDocument::build_tabbed_document()
-{
-  FL_OBJECT *obj;
-  FD_form_tabbed_document *fdui = new FD_form_tabbed_document;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 465, 500);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 465, 500, "");
-  fdui->tabfolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 20, 15, 435, 365, _("Tabbed folder"));
-    fl_set_object_resize(obj, FL_RESIZE_ALL);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 355, 460, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, INPUT);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 245, 460, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedApplyCB, INPUT);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 135, 460, 100, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedOKCB, INPUT);
-  fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 15, 385, 435, 30, "");
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-  {
-    char const * const dummy = N_("Restore|#R");
-    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 460, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedRestoreCB, INPUT);
-  {
-    char const * const dummy = N_("Save as Document Defaults|#v");
-    fdui->button_save_defaults = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 420, 195, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Use Class Defaults|#C");
-    fdui->button_reset_defaults = obj = fl_add_button(FL_NORMAL_BUTTON, 260, 420, 195, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_doc_paper::~FD_form_doc_paper()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_doc_paper * FormDocument::build_doc_paper()
-{
-  FL_OBJECT *obj;
-  FD_form_doc_paper *fdui = new FD_form_doc_paper;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 440, 345);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 440, 345, "");
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 15, 225, 120, _("Paper size"));
-  {
-    char const * const dummy = N_("Paper size:|#P");
-    fdui->choice_papersize = obj = fl_add_choice(FL_NORMAL_CHOICE, 110, 25, 115, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Width:|#W");
-    fdui->input_custom_width = obj = fl_add_input(FL_NORMAL_INPUT, 110, 60, 55, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fdui->choice_custom_width_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 170, 60, 55, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Height:|#H");
-    fdui->input_custom_height = obj = fl_add_input(FL_NORMAL_INPUT, 110, 95, 55, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fdui->choice_custom_height_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 170, 95, 55, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 245, 15, 180, 120, _("Orientation"));
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Portrait|#r");
-    fdui->radio_portrait = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 40, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Landscape|#L");
-    fdui->radio_landscape = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 75, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fl_end_group();
-
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 150, 415, 185, _("Margins"));
-  {
-    char const * const dummy = N_("Custom sizes|#M");
-    fdui->check_use_geometry = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 155, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Special (A4 portrait only):|#S");
-    fdui->choice_paperpackage = obj = fl_add_choice(FL_NORMAL_CHOICE, 230, 180, 185, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Top:|#T");
-    fdui->input_top_margin = obj = fl_add_input(FL_NORMAL_INPUT, 80, 190, 55, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fdui->choice_top_margin_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 140, 190, 55, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Bottom:|#B");
-    fdui->input_bottom_margin = obj = fl_add_input(FL_NORMAL_INPUT, 80, 225, 55, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fdui->choice_bottom_margin_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 140, 225, 55, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Inner:|#I");
-    fdui->input_inner_margin = obj = fl_add_input(FL_NORMAL_INPUT, 80, 260, 55, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fdui->choice_inner_margin_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 140, 260, 55, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Outer:|#u");
-    fdui->input_outer_margin = obj = fl_add_input(FL_NORMAL_INPUT, 80, 295, 55, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fdui->choice_outer_margin_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 140, 295, 55, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Headheight:|#H");
-    fdui->input_head_height = obj = fl_add_input(FL_NORMAL_INPUT, 300, 225, 55, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fdui->choice_head_height_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 360, 225, 55, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Headsep:|#d");
-    fdui->input_head_sep = obj = fl_add_input(FL_NORMAL_INPUT, 300, 260, 55, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fdui->choice_head_sep_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 360, 260, 55, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Footskip:|#F");
-    fdui->input_foot_skip = obj = fl_add_input(FL_NORMAL_INPUT, 300, 295, 55, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fdui->choice_foot_skip_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 360, 295, 55, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_doc_class::~FD_form_doc_class()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_doc_class * FormDocument::build_doc_class()
-{
-  FL_OBJECT *obj;
-  FD_form_doc_class *fdui = new FD_form_doc_class;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 440, 345);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 440, 345, "");
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 245, 400, 85, _("Separation"));
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 300, 110, 120, 75, _("Page cols"));
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 300, 20, 120, 75, _("Sides"));
-  {
-    char const * const dummy = N_("Fonts:|#F");
-    fdui->choice_doc_fonts = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 90, 160, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Font Size:|#O");
-    fdui->choice_doc_fontsize = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 125, 160, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Class:|#l");
-    fdui->choice_doc_class = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 20, 160, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, CHECKCHOICECLASS);
-  {
-    char const * const dummy = N_("Page style:|#P");
-    fdui->choice_doc_pagestyle = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 55, 160, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Spacing|#g");
-    fdui->choice_doc_spacing = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 200, 160, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Extra Options:|#X");
-    fdui->input_doc_extra = obj = fl_add_input(FL_NORMAL_INPUT, 120, 160, 160, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fdui->input_doc_skip = obj = fl_add_input(FL_NORMAL_INPUT, 285, 290, 60, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Default Skip:|#u");
-    fdui->choice_doc_skip = obj = fl_add_choice(FL_NORMAL_CHOICE, 285, 255, 125, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("One|#n");
-    fdui->radio_doc_sides_one = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 300, 30, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Two|#T");
-    fdui->radio_doc_sides_two = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 300, 60, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fl_end_group();
-
- fl_bgn_group();
-  {
-    char const * const dummy = N_("One|#e");
-    fdui->radio_doc_columns_one = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 300, 120, 110, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Two|#w");
-    fdui->radio_doc_columns_two = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 300, 150, 110, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fl_end_group();
-
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Indent|#I");
-    fdui->radio_doc_indent = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 50, 260, 110, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Skip|#K");
-    fdui->radio_doc_skip = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 50, 290, 110, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-    fl_set_button(obj, 1);
-  fl_end_group();
-
-  fdui->input_doc_spacing = obj = fl_add_input(FL_NORMAL_INPUT, 300, 200, 120, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fdui->choice_default_skip_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 350, 290, 60, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_doc_language::~FD_form_doc_language()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_doc_language * FormDocument::build_doc_language()
-{
-  FL_OBJECT *obj;
-  FD_form_doc_language *fdui = new FD_form_doc_language;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 440, 345);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 440, 345, "");
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 40, 120, 290, 110, _("Quote Style    "));
-  {
-    char const * const dummy = N_("Encoding:|#D");
-    fdui->choice_inputenc = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 70, 190, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Type:|#T");
-    fdui->choice_quotes_language = obj = fl_add_choice(FL_NORMAL_CHOICE, 110, 140, 190, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Single|#S");
-    fdui->radio_single = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 110, 180, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Double|#D");
-    fdui->radio_double = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 210, 180, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fl_end_group();
-
-  {
-    char const * const dummy = N_("Language:|#L");
-    fdui->choice_language = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 35, 190, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_doc_options::~FD_form_doc_options()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_doc_options * FormDocument::build_doc_options()
-{
-  FL_OBJECT *obj;
-  FD_form_doc_options *fdui = new FD_form_doc_options;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 440, 345);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 440, 345, "");
-  {
-    char const * const dummy = N_("Float Placement:|#L");
-    fdui->input_float_placement = obj = fl_add_input(FL_NORMAL_INPUT, 200, 35, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fdui->counter_secnumdepth = obj = fl_add_counter(FL_SIMPLE_COUNTER, 200, 75, 80, 30, _("Section number depth"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  fdui->counter_tocdepth = obj = fl_add_counter(FL_SIMPLE_COUNTER, 200, 115, 80, 30, _("Table of contents depth"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("PS Driver|#S");
-    fdui->choice_postscript_driver = obj = fl_add_choice(FL_NORMAL_CHOICE, 200, 155, 190, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Use AMS Math|#M");
-    fdui->check_use_amsmath = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 200, 200, 35, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Use Natbib|#N");
-    fdui->check_use_natbib = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 200, 245, 35, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUT);
-  {
-    char const * const dummy = N_("Citation style|#i");
-    fdui->choice_citation_format = obj = fl_add_choice(FL_NORMAL_CHOICE, 200, 285, 190, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_doc_bullet::~FD_form_doc_bullet()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_doc_bullet * FormDocument::build_doc_bullet()
-{
-  FL_OBJECT *obj;
-  FD_form_doc_bullet *fdui = new FD_form_doc_bullet;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 440, 345);
-  fdui->form->u_vdata = this;
-  fl_set_border_width(-1);
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 440, 345, "");
-  fl_set_border_width(-3);
-  fdui->bmtable_bullet_panel = obj = fl_add_bmtable(1, 135, 105, 260, 180, "");
-  fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETBMTABLE);
-  fl_set_object_lcol(obj, FL_BLUE);
-  fl_set_object_boxtype(obj, FL_UP_BOX);
-  fl_set_bmtable_pixmap_file(obj, 6, 6,
-                            LibFileSearch("images",
-                                  "standard",
-                                          "xpm").c_str());
-  fl_set_border_width(-1);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 135, 20, 260, 55, "");
-  {
-    char const * const dummy = N_("Size|#z");
-    fdui->choice_bullet_size = obj = fl_add_choice(FL_NORMAL_CHOICE, 15, 45, 65, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, CHOICEBULLETSIZE);
-  {
-    char const * const dummy = N_("LaTeX|#L");
-    fdui->input_bullet_latex = obj = fl_add_input(FL_NORMAL_INPUT, 80, 300, 275, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_FIXED_STYLE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, INPUTBULLETLATEX);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("1|#1");
-    fdui->radio_bullet_depth_1 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 150, 35, 55, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_LARGE_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETDEPTH1);
-    fl_set_button(obj, 1);
-  {
-    char const * const dummy = N_("2|#2");
-    fdui->radio_bullet_depth_2 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 215, 35, 55, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_LARGE_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETDEPTH2);
-  {
-    char const * const dummy = N_("3|#3");
-    fdui->radio_bullet_depth_3 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 275, 35, 55, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_LARGE_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETDEPTH3);
-  {
-    char const * const dummy = N_("4|#4");
-    fdui->radio_bullet_depth_4 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 335, 35, 55, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_LARGE_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETDEPTH4);
-  fl_end_group();
-
-  obj = fl_add_text(FL_NORMAL_TEXT, 145, 10, 85, 20, _("Bullet Depth"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Standard|#S");
-    fdui->radio_bullet_panel_standard = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 105, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL1);
-    fl_set_button(obj, 1);
-  {
-    char const * const dummy = N_("Maths|#M");
-    fdui->radio_bullet_panel_maths = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 135, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL2);
-  {
-    char const * const dummy = N_("Ding 1|#D");
-    fdui->radio_bullet_panel_ding1 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 165, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL6);
-  {
-    char const * const dummy = N_("Ding 2|#i");
-    fdui->radio_bullet_panel_ding2 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 195, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL3);
-  {
-    char const * const dummy = N_("Ding 3|#n");
-    fdui->radio_bullet_panel_ding3 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 225, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL4);
-  {
-    char const * const dummy = N_("Ding 4|#g");
-    fdui->radio_bullet_panel_ding4 = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 255, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETPANEL5);
-  fl_end_group();
-
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_document.h b/src/frontends/xforms/form_document.h
deleted file mode 100644 (file)
index 8211d45..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_tabbed_document_h_
-#define FD_form_tabbed_document_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedRestoreCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_tabbed_document {
-       ~FD_form_tabbed_document();
-
-       FL_FORM *form;
-       FL_OBJECT *tabfolder;
-       FL_OBJECT *button_close;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *text_warning;
-       FL_OBJECT *button_restore;
-       FL_OBJECT *button_save_defaults;
-       FL_OBJECT *button_reset_defaults;
-};
-struct FD_form_doc_paper {
-       ~FD_form_doc_paper();
-
-       FL_FORM *form;
-       FL_OBJECT *choice_papersize;
-       FL_OBJECT *input_custom_width;
-       FL_OBJECT *choice_custom_width_units;
-       FL_OBJECT *input_custom_height;
-       FL_OBJECT *choice_custom_height_units;
-       FL_OBJECT *radio_portrait;
-       FL_OBJECT *radio_landscape;
-       FL_OBJECT *check_use_geometry;
-       FL_OBJECT *choice_paperpackage;
-       FL_OBJECT *input_top_margin;
-       FL_OBJECT *choice_top_margin_units;
-       FL_OBJECT *input_bottom_margin;
-       FL_OBJECT *choice_bottom_margin_units;
-       FL_OBJECT *input_inner_margin;
-       FL_OBJECT *choice_inner_margin_units;
-       FL_OBJECT *input_outer_margin;
-       FL_OBJECT *choice_outer_margin_units;
-       FL_OBJECT *input_head_height;
-       FL_OBJECT *choice_head_height_units;
-       FL_OBJECT *input_head_sep;
-       FL_OBJECT *choice_head_sep_units;
-       FL_OBJECT *input_foot_skip;
-       FL_OBJECT *choice_foot_skip_units;
-};
-struct FD_form_doc_class {
-       ~FD_form_doc_class();
-
-       FL_FORM *form;
-       FL_OBJECT *choice_doc_fonts;
-       FL_OBJECT *choice_doc_fontsize;
-       FL_OBJECT *choice_doc_class;
-       FL_OBJECT *choice_doc_pagestyle;
-       FL_OBJECT *choice_doc_spacing;
-       FL_OBJECT *input_doc_extra;
-       FL_OBJECT *input_doc_skip;
-       FL_OBJECT *choice_doc_skip;
-       FL_OBJECT *radio_doc_sides_one;
-       FL_OBJECT *radio_doc_sides_two;
-       FL_OBJECT *radio_doc_columns_one;
-       FL_OBJECT *radio_doc_columns_two;
-       FL_OBJECT *radio_doc_indent;
-       FL_OBJECT *radio_doc_skip;
-       FL_OBJECT *input_doc_spacing;
-       FL_OBJECT *choice_default_skip_units;
-};
-struct FD_form_doc_language {
-       ~FD_form_doc_language();
-
-       FL_FORM *form;
-       FL_OBJECT *choice_inputenc;
-       FL_OBJECT *choice_quotes_language;
-       FL_OBJECT *radio_single;
-       FL_OBJECT *radio_double;
-       FL_OBJECT *choice_language;
-};
-struct FD_form_doc_options {
-       ~FD_form_doc_options();
-
-       FL_FORM *form;
-       FL_OBJECT *input_float_placement;
-       FL_OBJECT *counter_secnumdepth;
-       FL_OBJECT *counter_tocdepth;
-       FL_OBJECT *choice_postscript_driver;
-       FL_OBJECT *check_use_amsmath;
-       FL_OBJECT *check_use_natbib;
-       FL_OBJECT *choice_citation_format;
-};
-struct FD_form_doc_bullet {
-       ~FD_form_doc_bullet();
-
-       FL_FORM *form;
-       FL_OBJECT *bmtable_bullet_panel;
-       FL_OBJECT *choice_bullet_size;
-       FL_OBJECT *input_bullet_latex;
-       FL_OBJECT *radio_bullet_depth_1;
-       FL_OBJECT *radio_bullet_depth_2;
-       FL_OBJECT *radio_bullet_depth_3;
-       FL_OBJECT *radio_bullet_depth_4;
-       FL_OBJECT *radio_bullet_panel_standard;
-       FL_OBJECT *radio_bullet_panel_maths;
-       FL_OBJECT *radio_bullet_panel_ding1;
-       FL_OBJECT *radio_bullet_panel_ding2;
-       FL_OBJECT *radio_bullet_panel_ding3;
-       FL_OBJECT *radio_bullet_panel_ding4;
-};
-
-#endif /* FD_form_tabbed_document_h_ */
diff --git a/src/frontends/xforms/form_error.C b/src/frontends/xforms/form_error.C
deleted file mode 100644 (file)
index 920c1e9..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_error.h"
-#include "FormError.h"
-
-FD_form_error::~FD_form_error()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_error * FormError::build_error()
-{
-  FL_OBJECT *obj;
-  FD_form_error *fdui = new FD_form_error;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 400, 240);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 400, 240, "");
-  fdui->frame_message = obj = fl_add_box(FL_FRAME_BOX, 10, 10, 380, 180, "");
-    fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
-  {
-    char const * const dummy = N_("Close|^[^M");
-    fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 135, 200, 130, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_gravity(obj, FL_South, FL_South);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_error.h b/src/frontends/xforms/form_error.h
deleted file mode 100644 (file)
index d63c8f7..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_error_h_
-#define FD_form_error_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_error {
-       ~FD_form_error();
-
-       FL_FORM *form;
-       FL_OBJECT *frame_message;
-       FL_OBJECT *button_close;
-};
-
-#endif /* FD_form_error_h_ */
diff --git a/src/frontends/xforms/form_ert.C b/src/frontends/xforms/form_ert.C
deleted file mode 100644 (file)
index e877778..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_ert.h"
-#include "FormERT.h"
-
-FD_form_ert::~FD_form_ert()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_ert * FormERT::build_ert()
-{
-  FL_OBJECT *obj;
-  FD_form_ert *fdui = new FD_form_ert;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 430, 170);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 430, 170, "");
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 20, 410, 100, _("Status"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Open|#O");
-    fdui->radio_open = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 19, 30, 152, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Collapsed|#C");
-    fdui->radio_collapsed = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 19, 60, 152, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Inlined View|#I");
-    fdui->radio_inlined = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 19, 90, 152, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_group();
-
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 130, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 130, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 130, 130, 90, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_ert.h b/src/frontends/xforms/form_ert.h
deleted file mode 100644 (file)
index 893566b..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_ert_h_
-#define FD_form_ert_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_ert {
-       ~FD_form_ert();
-
-       FL_FORM *form;
-       FL_OBJECT *radio_open;
-       FL_OBJECT *radio_collapsed;
-       FL_OBJECT *radio_inlined;
-       FL_OBJECT *button_close;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_ok;
-};
-
-#endif /* FD_form_ert_h_ */
diff --git a/src/frontends/xforms/form_external.C b/src/frontends/xforms/form_external.C
deleted file mode 100644 (file)
index 02c8188..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_external.h"
-#include "FormExternal.h"
-
-FD_form_external::~FD_form_external()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_external * FormExternal::build_external()
-{
-  FL_OBJECT *obj;
-  FD_form_external *fdui = new FD_form_external;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 560, 310);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 560, 310, "");
-  {
-    char const * const dummy = N_("Template|#t");
-    fdui->choice_template = obj = fl_add_choice(FL_NORMAL_CHOICE, 130, 10, 300, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_color(obj, FL_COL1, FL_RIGHT_BCOL);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->browser_helptext = obj = fl_add_browser(FL_NORMAL_BROWSER, 130, 50, 300, 130, "");
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
-  {
-    char const * const dummy = N_("File|#F");
-    fdui->input_filename = obj = fl_add_input(FL_NORMAL_INPUT, 130, 190, 190, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Browse...|#B");
-    fdui->button_filenamebrowse = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 190, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Parameters|#P");
-    fdui->input_parameters = obj = fl_add_input(FL_NORMAL_INPUT, 130, 230, 300, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Edit file|#E");
-    fdui->button_edit = obj = fl_add_button(FL_NORMAL_BUTTON, 435, 50, 110, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("View result|#V");
-    fdui->button_view = obj = fl_add_button(FL_NORMAL_BUTTON, 435, 90, 110, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Update result|#U");
-    fdui->button_update = obj = fl_add_button(FL_NORMAL_BUTTON, 435, 130, 110, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 255, 270, 90, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 355, 270, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  {
-    char const * const dummy = N_("Cancel|#C^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 455, 270, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_external.h b/src/frontends/xforms/form_external.h
deleted file mode 100644 (file)
index bc4fd6b..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_external_h_
-#define FD_form_external_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_external {
-       ~FD_form_external();
-
-       FL_FORM *form;
-       FL_OBJECT *choice_template;
-       FL_OBJECT *browser_helptext;
-       FL_OBJECT *input_filename;
-       FL_OBJECT *button_filenamebrowse;
-       FL_OBJECT *input_parameters;
-       FL_OBJECT *button_edit;
-       FL_OBJECT *button_view;
-       FL_OBJECT *button_update;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_close;
-};
-
-#endif /* FD_form_external_h_ */
diff --git a/src/frontends/xforms/form_filedialog.C b/src/frontends/xforms/form_filedialog.C
deleted file mode 100644 (file)
index 5ddce85..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_filedialog.h"
-#include "FormFiledialog.h"
-
-FD_form_filedialog::~FD_form_filedialog()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_filedialog * FileDialog::Private::build_filedialog()
-{
-  FL_OBJECT *obj;
-  FD_form_filedialog *fdui = new FD_form_filedialog;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 440, 380);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 440, 380, "");
-  fdui->FileInfo = obj = fl_add_text(FL_NORMAL_TEXT, 10, 260, 420, 30, "");
-    fl_set_object_boxtype(obj, FL_SHADOW_BOX);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-  {
-    char const * const dummy = N_("Directory:|#D");
-    fdui->DirBox = obj = fl_add_input(FL_NORMAL_INPUT, 100, 10, 330, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-  {
-    char const * const dummy = N_("Pattern:|#P");
-    fdui->PatBox = obj = fl_add_input(FL_NORMAL_INPUT, 100, 40, 330, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-  fdui->List = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 80, 320, 170, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
-  {
-    char const * const dummy = N_("Filename:|#F");
-    fdui->Filename = obj = fl_add_input(FL_NORMAL_INPUT, 100, 300, 330, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-  {
-    char const * const dummy = N_("Rescan|#R#r");
-    fdui->Rescan = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 80, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-  {
-    char const * const dummy = N_("Home|#H#h");
-    fdui->Home = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 120, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-  {
-    char const * const dummy = N_("User1|#1");
-    fdui->User1 = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 160, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-  {
-    char const * const dummy = N_("User2|#2");
-    fdui->User2 = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 200, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-  fdui->Ready = obj = fl_add_button(FL_RETURN_BUTTON, 220, 340, 100, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->Cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 340, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-  fdui->timer = obj = fl_add_timer(FL_HIDDEN_TIMER, 10, 350, 20, 20, "");
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_filedialog.h b/src/frontends/xforms/form_filedialog.h
deleted file mode 100644 (file)
index ebb8c5a..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_filedialog_h_
-#define FD_form_filedialog_h_
-
-/** Callbacks, globals and object handlers **/
-
-
-/**** Forms and Objects ****/
-struct FD_form_filedialog {
-       ~FD_form_filedialog();
-
-       FL_FORM *form;
-       FL_OBJECT *FileInfo;
-       FL_OBJECT *DirBox;
-       FL_OBJECT *PatBox;
-       FL_OBJECT *List;
-       FL_OBJECT *Filename;
-       FL_OBJECT *Rescan;
-       FL_OBJECT *Home;
-       FL_OBJECT *User1;
-       FL_OBJECT *User2;
-       FL_OBJECT *Ready;
-       FL_OBJECT *Cancel;
-       FL_OBJECT *timer;
-};
-
-#endif /* FD_form_filedialog_h_ */
diff --git a/src/frontends/xforms/form_float.C b/src/frontends/xforms/form_float.C
deleted file mode 100644 (file)
index ea277eb..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_float.h"
-#include "FormFloat.h"
-
-FD_form_float::~FD_form_float()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_float * FormFloat::build_float()
-{
-  FL_OBJECT *obj;
-  FD_form_float *fdui = new FD_form_float;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 360, 200);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 360, 200, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 100, 340, 50, "");
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 20, 340, 80, _("Placement"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  {
-    char const * const dummy = N_("Top of the page|#T");
-    fdui->check_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 30, 152, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Bottom of the page|#B");
-    fdui->check_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 60, 152, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Page of floats|#P");
-    fdui->check_page = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 190, 30, 152, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Here, if possible|#i");
-    fdui->check_here = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 190, 60, 152, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Here, definitely|#H");
-    fdui->check_here_definitely = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 110, 152, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Restore|#R");
-    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 160, 80, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 120, 160, 70, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 160, 70, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 280, 160, 70, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_float.h b/src/frontends/xforms/form_float.h
deleted file mode 100644 (file)
index 4c02b55..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_float_h_
-#define FD_form_float_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_float {
-       ~FD_form_float();
-
-       FL_FORM *form;
-       FL_OBJECT *check_top;
-       FL_OBJECT *check_bottom;
-       FL_OBJECT *check_page;
-       FL_OBJECT *check_here;
-       FL_OBJECT *check_here_definitely;
-       FL_OBJECT *button_restore;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_close;
-};
-
-#endif /* FD_form_float_h_ */
diff --git a/src/frontends/xforms/form_forks.C b/src/frontends/xforms/form_forks.C
deleted file mode 100644 (file)
index d7768c9..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_forks.h"
-#include "FormForks.h"
-
-FD_form_forks::~FD_form_forks()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_forks * FormForks::build_forks()
-{
-  FL_OBJECT *obj;
-  FD_form_forks *fdui = new FD_form_forks;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 650, 390);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 650, 390, "");
-  {
-    char const * const dummy = N_("Forked child processes|#F");
-    fdui->browser_children = obj = fl_add_browser(FL_HOLD_BROWSER, 20, 30, 400, 290, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Kill processes|#K");
-    fdui->browser_kill = obj = fl_add_browser(FL_HOLD_BROWSER, 510, 30, 125, 290, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->button_all = obj = fl_add_button(FL_NORMAL_BUTTON, 432, 30, 65, 30, _("All ->"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->button_add = obj = fl_add_button(FL_NORMAL_BUTTON, 450, 70, 30, 30, _("@->"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->button_remove = obj = fl_add_button(FL_NORMAL_BUTTON, 450, 110, 30, 30, _("@4->"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 355, 350, 90, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 450, 350, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  {
-    char const * const dummy = N_("Close|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 545, 350, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_forks.h b/src/frontends/xforms/form_forks.h
deleted file mode 100644 (file)
index 7ca4800..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_forks_h_
-#define FD_form_forks_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_forks {
-       ~FD_form_forks();
-
-       FL_FORM *form;
-       FL_OBJECT *browser_children;
-       FL_OBJECT *browser_kill;
-       FL_OBJECT *button_all;
-       FL_OBJECT *button_add;
-       FL_OBJECT *button_remove;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_close;
-};
-
-#endif /* FD_form_forks_h_ */
diff --git a/src/frontends/xforms/form_graphics.C b/src/frontends/xforms/form_graphics.C
deleted file mode 100644 (file)
index 1ad1866..0000000
+++ /dev/null
@@ -1,526 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_graphics.h"
-#include "FormGraphics.h"
-
-FD_form_graphics::~FD_form_graphics()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_graphics * FormGraphics::build_graphics()
-{
-  FL_OBJECT *obj;
-  FD_form_graphics *fdui = new FD_form_graphics;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 510, 345);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 510, 345, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  fdui->tabfolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 5, 5, 500, 270, _("Tabbed folder"));
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_resize(obj, FL_RESIZE_ALL);
-  {
-    char const * const dummy = N_("Restore|#R");
-    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 5, 310, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
-    fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 225, 310, 90, 30, _("Ok"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 415, 310, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 320, 310, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 5, 280, 495, 25, "");
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_file::~FD_form_file()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_file * FormGraphics::build_file()
-{
-  FL_OBJECT *obj;
-  FD_form_file *fdui = new FD_form_file;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 500, 245);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 500, 245, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  {
-    char const * const dummy = N_("File|#F");
-    fdui->input_filename = obj = fl_add_input(FL_NORMAL_INPUT, 75, 10, 285, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Browse...|#B");
-    fdui->button_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 365, 10, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 55, 480, 60, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  {
-    char const * const dummy = N_("Subfigure|#S");
-    fdui->check_subcaption = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 70, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Title|#T");
-    fdui->input_subcaption = obj = fl_add_input(FL_NORMAL_INPUT, 190, 70, 290, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 115, 480, 60, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  {
-    char const * const dummy = N_("Angle|#A");
-    fdui->input_rotate_angle = obj = fl_add_input(FL_INT_INPUT, 190, 130, 55, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_text(FL_NORMAL_TEXT, 245, 130, 38, 30, _("deg"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-  {
-    char const * const dummy = N_("Origin|#O");
-    fdui->choice_origin = obj = fl_add_choice(FL_NORMAL_CHOICE, 360, 130, 118, 28, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Draft mode|#D");
-    fdui->check_draft = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 195, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Rotate|#R");
-    fdui->check_rotate = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 130, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Don't unzip, when exporting to LaTeX|#u");
-    fdui->check_nounzip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 175, 195, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_size::~FD_form_size()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_size * FormGraphics::build_size()
-{
-  FL_OBJECT *obj;
-  FD_form_size *fdui = new FD_form_size;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 500, 245);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 500, 245, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 355, 10, 135, 50, "");
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 10, 480, 225, _("Output size"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Original size|#O");
-    fdui->radio_asis = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 30, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Scale|#S");
-    fdui->radio_scale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 80, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Custom|#C");
-    fdui->radio_wh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 25, 130, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_group();
-
-  {
-    char const * const dummy = N_("Value|#V");
-    fdui->input_scale = obj = fl_add_input(FL_NORMAL_INPUT, 200, 80, 85, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  // xgettext:no-c-format
-  obj = fl_add_text(FL_NORMAL_TEXT, 285, 80, 25, 30, _("%"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-  {
-    char const * const dummy = N_("Width|#W");
-    fdui->input_width = obj = fl_add_input(FL_NORMAL_INPUT, 200, 130, 85, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->choice_width = obj = fl_add_choice(FL_NORMAL_CHOICE, 290, 130, 60, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Height|#H");
-    fdui->input_height = obj = fl_add_input(FL_NORMAL_INPUT, 200, 165, 85, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->choice_height = obj = fl_add_choice(FL_NORMAL_CHOICE, 290, 165, 60, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("keep Aspect ratio|#A");
-    fdui->check_aspectratio = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 200, 200, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Get LyX size|#L");
-    fdui->button_lyx_values = obj = fl_add_button(FL_NORMAL_BUTTON, 365, 20, 115, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_bbox::~FD_form_bbox()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_bbox * FormGraphics::build_bbox()
-{
-  FL_OBJECT *obj;
-  FD_form_bbox *fdui = new FD_form_bbox;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 500, 245);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 500, 245, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 10, 480, 180, _("Corner coordinates (X, Y)"));
-    fl_set_object_boxtype(obj, FL_UP_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  obj = fl_add_text(FL_NORMAL_TEXT, 195, 110, 30, 25, _(", "));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_text(FL_NORMAL_TEXT, 195, 55, 30, 25, _(", "));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  {
-    char const * const dummy = N_("Top right  ( |#T");
-    fdui->input_bb_x1 = obj = fl_add_input(FL_NORMAL_INPUT, 150, 45, 50, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->input_bb_y1 = obj = fl_add_input(FL_NORMAL_INPUT, 220, 45, 50, 30, _(" )"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Bottom left  ( |#B");
-    fdui->input_bb_x0 = obj = fl_add_input(FL_NORMAL_INPUT, 150, 95, 50, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->input_bb_y0 = obj = fl_add_input(FL_NORMAL_INPUT, 220, 95, 50, 30, _(" )"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Units|#U");
-    fdui->choice_bb_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 350, 70, 45, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Get values from file|#G");
-    fdui->button_getBB = obj = fl_add_button(FL_NORMAL_BUTTON, 20, 150, 165, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Clip to bounding box|#C");
-    fdui->check_clip = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 200, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_special::~FD_form_special()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_special * FormGraphics::build_special()
-{
-  FL_OBJECT *obj;
-  FD_form_special *fdui = new FD_form_special;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 500, 245);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 500, 245, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  {
-    char const * const dummy = N_("Additional LaTeX options|#L");
-    fdui->input_special = obj = fl_add_input(FL_NORMAL_INPUT, 190, 40, 265, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_lyxview::~FD_form_lyxview()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_lyxview * FormGraphics::build_lyxview()
-{
-  FL_OBJECT *obj;
-  FD_form_lyxview *fdui = new FD_form_lyxview;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 500, 245);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 500, 245, "");
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 155, 10, 335, 225, _("Screen size"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 355, 10, 135, 50, "");
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 10, 145, 225, _("Screen display"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  {
-    char const * const dummy = N_("Value|#V");
-    fdui->input_lyxscale = obj = fl_add_input(FL_NORMAL_INPUT, 350, 95, 70, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Original size|#O");
-    fdui->radio_lyxasis = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 25, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Scale|#S");
-    fdui->radio_lyxscale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 90, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Custom|#u");
-    fdui->radio_lyxwh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 155, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_group();
-
-  // xgettext:no-c-format
-  obj = fl_add_text(FL_NORMAL_TEXT, 420, 95, 25, 30, _("%"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Default|#f");
-    fdui->radio_pref = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 25, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Monochrome|#M");
-    fdui->radio_mono = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 65, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Grayscale|#G");
-    fdui->radio_gray = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 105, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Color|#C");
-    fdui->radio_color = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 145, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Don't display|#D");
-    fdui->radio_nodisplay = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 185, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_group();
-
-  {
-    char const * const dummy = N_("Width|#W");
-    fdui->input_lyxwidth = obj = fl_add_input(FL_NORMAL_INPUT, 350, 155, 70, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->choice_lyxwidth = obj = fl_add_choice(FL_NORMAL_CHOICE, 425, 155, 50, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Height|#H");
-    fdui->input_lyxheight = obj = fl_add_input(FL_NORMAL_INPUT, 350, 190, 70, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->choice_lyxheight = obj = fl_add_choice(FL_NORMAL_CHOICE, 425, 190, 50, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Get LaTeX size|#L");
-    fdui->button_latex_values = obj = fl_add_button(FL_NORMAL_BUTTON, 365, 20, 115, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_graphics.h b/src/frontends/xforms/form_graphics.h
deleted file mode 100644 (file)
index ea3af23..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_graphics_h_
-#define FD_form_graphics_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_graphics {
-       ~FD_form_graphics();
-
-       FL_FORM *form;
-       FL_OBJECT *tabfolder;
-       FL_OBJECT *button_restore;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_close;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *text_warning;
-};
-struct FD_form_file {
-       ~FD_form_file();
-
-       FL_FORM *form;
-       FL_OBJECT *input_filename;
-       FL_OBJECT *button_browse;
-       FL_OBJECT *check_subcaption;
-       FL_OBJECT *input_subcaption;
-       FL_OBJECT *input_rotate_angle;
-       FL_OBJECT *choice_origin;
-       FL_OBJECT *check_draft;
-       FL_OBJECT *check_rotate;
-       FL_OBJECT *check_nounzip;
-};
-struct FD_form_size {
-       ~FD_form_size();
-
-       FL_FORM *form;
-       FL_OBJECT *radio_asis;
-       FL_OBJECT *radio_scale;
-       FL_OBJECT *radio_wh;
-       FL_OBJECT *input_scale;
-       FL_OBJECT *input_width;
-       FL_OBJECT *choice_width;
-       FL_OBJECT *input_height;
-       FL_OBJECT *choice_height;
-       FL_OBJECT *check_aspectratio;
-       FL_OBJECT *button_lyx_values;
-};
-struct FD_form_bbox {
-       ~FD_form_bbox();
-
-       FL_FORM *form;
-       FL_OBJECT *input_bb_x1;
-       FL_OBJECT *input_bb_y1;
-       FL_OBJECT *input_bb_x0;
-       FL_OBJECT *input_bb_y0;
-       FL_OBJECT *choice_bb_units;
-       FL_OBJECT *button_getBB;
-       FL_OBJECT *check_clip;
-};
-struct FD_form_special {
-       ~FD_form_special();
-
-       FL_FORM *form;
-       FL_OBJECT *input_special;
-};
-struct FD_form_lyxview {
-       ~FD_form_lyxview();
-
-       FL_FORM *form;
-       FL_OBJECT *input_lyxscale;
-       FL_OBJECT *radio_lyxasis;
-       FL_OBJECT *radio_lyxscale;
-       FL_OBJECT *radio_lyxwh;
-       FL_OBJECT *radio_pref;
-       FL_OBJECT *radio_mono;
-       FL_OBJECT *radio_gray;
-       FL_OBJECT *radio_color;
-       FL_OBJECT *radio_nodisplay;
-       FL_OBJECT *input_lyxwidth;
-       FL_OBJECT *choice_lyxwidth;
-       FL_OBJECT *input_lyxheight;
-       FL_OBJECT *choice_lyxheight;
-       FL_OBJECT *button_latex_values;
-};
-
-#endif /* FD_form_graphics_h_ */
diff --git a/src/frontends/xforms/form_include.C b/src/frontends/xforms/form_include.C
deleted file mode 100644 (file)
index aeaeee9..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_include.h"
-#include "FormInclude.h"
-
-FD_form_include::~FD_form_include()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_include * FormInclude::build_include()
-{
-  FL_OBJECT *obj;
-  FD_form_include *fdui = new FD_form_include;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 340, 210);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 340, 210, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 70, 160, 90, "");
-  {
-    char const * const dummy = N_("Browse...|#B");
-    fdui->button_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 30, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Don't typeset|#D");
-    fdui->check_typeset = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 180, 70, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 120, 170, 100, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 170, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  {
-    char const * const dummy = N_("Load|#L");
-    fdui->button_load = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 130, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("File name:|#F");
-    fdui->input_filename = obj = fl_add_input(FL_NORMAL_INPUT, 10, 30, 210, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Visible space|#s");
-    fdui->check_visiblespace = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 180, 100, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Verbatim|#V");
-    fdui->radio_verbatim = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 130, 160, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Use input|#i");
-    fdui->radio_useinput = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 100, 160, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Use include|#U");
-    fdui->radio_useinclude = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 70, 160, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_group();
-
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_include.h b/src/frontends/xforms/form_include.h
deleted file mode 100644 (file)
index f414a82..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_include_h_
-#define FD_form_include_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_include {
-       ~FD_form_include();
-
-       FL_FORM *form;
-       FL_OBJECT *button_browse;
-       FL_OBJECT *check_typeset;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_close;
-       FL_OBJECT *button_load;
-       FL_OBJECT *input_filename;
-       FL_OBJECT *check_visiblespace;
-       FL_OBJECT *radio_verbatim;
-       FL_OBJECT *radio_useinput;
-       FL_OBJECT *radio_useinclude;
-};
-
-#endif /* FD_form_include_h_ */
diff --git a/src/frontends/xforms/form_index.C b/src/frontends/xforms/form_index.C
deleted file mode 100644 (file)
index a79fa5b..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_index.h"
-#include "FormIndex.h"
-
-FD_form_index::~FD_form_index()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_index * FormIndex::build_index()
-{
-  FL_OBJECT *obj;
-  FD_form_index *fdui = new FD_form_index;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 520, 100);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 520, 100, "");
-  {
-    char const * const dummy = N_("Keyword|#K");
-    fdui->input_key = obj = fl_add_input(FL_NORMAL_INPUT, 90, 10, 420, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Restore|#R");
-    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 60, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
-    fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 190, 60, 100, 30, _("OK"));
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 300, 60, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 60, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_index.h b/src/frontends/xforms/form_index.h
deleted file mode 100644 (file)
index 39b0cd1..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_index_h_
-#define FD_form_index_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_index {
-       ~FD_form_index();
-
-       FL_FORM *form;
-       FL_OBJECT *input_key;
-       FL_OBJECT *button_restore;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_close;
-};
-
-#endif /* FD_form_index_h_ */
diff --git a/src/frontends/xforms/form_maths_deco.C b/src/frontends/xforms/form_maths_deco.C
deleted file mode 100644 (file)
index c3260c7..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-#include "bmtable.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_maths_deco.h"
-#include "FormMathsDeco.h"
-
-FD_form_maths_deco::~FD_form_maths_deco()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_maths_deco * FormMathsDeco::build_maths_deco()
-{
-  FL_OBJECT *obj;
-  FD_form_maths_deco *fdui = new FD_form_maths_deco;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 160, 295);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 160, 295, "");
-  fdui->bmtable_deco1 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 10, 10, 140, 120, "");
-    fl_set_object_lcolor(obj, FL_BLUE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 30, 250, 100, 30, _("Close"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
-  fdui->bmtable_deco2 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 20, 140, 120, 90, "");
-    fl_set_object_lcolor(obj, FL_BLUE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_maths_deco.h b/src/frontends/xforms/form_maths_deco.h
deleted file mode 100644 (file)
index 01b4a37..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_maths_deco_h_
-#define FD_form_maths_deco_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_maths_deco {
-       ~FD_form_maths_deco();
-
-       FL_FORM *form;
-       FL_OBJECT *bmtable_deco1;
-       FL_OBJECT *button_close;
-       FL_OBJECT *bmtable_deco2;
-};
-
-#endif /* FD_form_maths_deco_h_ */
diff --git a/src/frontends/xforms/form_maths_delim.C b/src/frontends/xforms/form_maths_delim.C
deleted file mode 100644 (file)
index f757407..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-#include "bmtable.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_maths_delim.h"
-#include "FormMathsDelim.h"
-
-FD_form_maths_delim::~FD_form_maths_delim()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_maths_delim * FormMathsDelim::build_maths_delim()
-{
-  FL_OBJECT *obj;
-  FD_form_maths_delim *fdui = new FD_form_maths_delim;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 250, 307);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 250, 307, "");
-  fdui->bmtable = obj = fl_add_bmtable(FL_PUSH_BUTTON, 42, 112, 170, 140, "");
-    fl_set_object_lcolor(obj, FL_BLUE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 168, 268, 70, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
-  fdui->button_pix = obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 100, 58, 50, 40, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedApplyCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 90, 268, 70, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedApplyCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 12, 268, 70, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedOKCB, 0);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("()\nBoth|#B");
-    fdui->radio_both = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 80, 8, 80, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  {
-    char const * const dummy = N_(")\nRight|#R");
-    fdui->radio_right = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 162, 8, 80, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  {
-    char const * const dummy = N_("(\nLeft|#L");
-    fdui->radio_left = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 8, 8, 80, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  fl_end_group();
-
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_maths_delim.h b/src/frontends/xforms/form_maths_delim.h
deleted file mode 100644 (file)
index 9a55967..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_maths_delim_h_
-#define FD_form_maths_delim_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedOKCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_maths_delim {
-       ~FD_form_maths_delim();
-
-       FL_FORM *form;
-       FL_OBJECT *bmtable;
-       FL_OBJECT *button_close;
-       FL_OBJECT *button_pix;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *radio_both;
-       FL_OBJECT *radio_right;
-       FL_OBJECT *radio_left;
-};
-
-#endif /* FD_form_maths_delim_h_ */
diff --git a/src/frontends/xforms/form_maths_matrix.C b/src/frontends/xforms/form_maths_matrix.C
deleted file mode 100644 (file)
index 2d6a817..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_maths_matrix.h"
-#include "FormMathsMatrix.h"
-
-FD_form_maths_matrix::~FD_form_maths_matrix()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_maths_matrix * FormMathsMatrix::build_maths_matrix()
-{
-  FL_OBJECT *obj;
-  FD_form_maths_matrix *fdui = new FD_form_maths_matrix;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 295, 183);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 295, 183, "");
-  fdui->slider_rows = obj = fl_add_valslider(FL_VERT_NICE_SLIDER, 10, 30, 32, 140, _("Rows"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_slider_precision(obj, 0);
-    fl_set_slider_bounds(obj, 1, 20);
-     fl_set_slider_return(obj, FL_RETURN_END_CHANGED);
-  fdui->slider_columns = obj = fl_add_valslider(FL_HOR_NICE_SLIDER, 54, 28, 214, 30, _("Columns "));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_slider_precision(obj, 0);
-    fl_set_slider_bounds(obj, 1, 20);
-     fl_set_slider_return(obj, FL_RETURN_END_CHANGED);
-  {
-    char const * const dummy = N_("Vertical align|#V");
-    fdui->choice_valign = obj = fl_add_choice(FL_NORMAL_CHOICE, 56, 86, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Horizontal align|#H");
-    fdui->input_halign = obj = fl_add_input(FL_NORMAL_INPUT, 174, 86, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 44, 140, 80, 30, _("OK  "));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedOKCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 126, 140, 80, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedApplyCB, 0);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 208, 140, 80, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_maths_matrix.h b/src/frontends/xforms/form_maths_matrix.h
deleted file mode 100644 (file)
index 42a199d..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_maths_matrix_h_
-#define FD_form_maths_matrix_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_maths_matrix {
-       ~FD_form_maths_matrix();
-
-       FL_FORM *form;
-       FL_OBJECT *slider_rows;
-       FL_OBJECT *slider_columns;
-       FL_OBJECT *choice_valign;
-       FL_OBJECT *input_halign;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_close;
-};
-
-#endif /* FD_form_maths_matrix_h_ */
diff --git a/src/frontends/xforms/form_maths_panel.C b/src/frontends/xforms/form_maths_panel.C
deleted file mode 100644 (file)
index 8267e30..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_maths_panel.h"
-#include "FormMathsPanel.h"
-
-FD_form_maths_panel::~FD_form_maths_panel()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_maths_panel * FormMathsPanel::build_maths_panel()
-{
-  FL_OBJECT *obj;
-  FD_form_maths_panel *fdui = new FD_form_maths_panel;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 260, 211);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 260, 211, "");
-  fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 170, 170, 80, 30, _("Close "));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
-  fdui->browser_funcs = obj = fl_add_browser(FL_SELECT_BROWSER, 170, 30, 80, 130, _("Functions"));
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_FUNC);
-    fl_set_browser_hscrollbar(obj, FL_OFF);
-  fdui->button_greek = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 140, 50, 30, _("Greek"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, 15);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_GREEK);
-  fdui->button_arrow = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 80, 50, 30, _("­ Û"));
-    fl_set_object_lsize(obj, 0);
-    fl_set_object_lstyle(obj, 15);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_ARROW);
-  fdui->button_boperator = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 80, 50, 30, _("± ´"));
-    fl_set_object_lsize(obj, 0);
-    fl_set_object_lstyle(obj, 15);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_BOP);
-  fdui->button_brelats = obj = fl_add_button(FL_NORMAL_BUTTON, 60, 80, 50, 30, _("£ @"));
-    fl_set_object_lsize(obj, 0);
-    fl_set_object_lstyle(obj, 15);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_BRELATS);
-  fdui->button_misc = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 110, 50, 30, _("Misc"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_TIMESITALIC_STYLE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_MISC);
-  fdui->button_equation = obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 130, 40, 30, 30, "");
-    fl_set_object_color(obj, FL_MCOL, FL_BLUE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_EQU);
-  fdui->button_sqrt = obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 10, 10, 30, 30, "");
-    fl_set_object_color(obj, FL_MCOL, FL_BLUE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_SQRT);
-  fdui->button_frac = obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 40, 10, 30, 30, "");
-    fl_set_object_color(obj, FL_MCOL, FL_BLUE);
-    fl_set_object_lcolor(obj, FL_COL1);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_FRAC);
-  fdui->button_delim = obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 70, 10, 30, 30, "");
-    fl_set_object_color(obj, FL_MCOL, FL_BLUE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_DELIM);
-  fdui->button_matrix = obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 100, 40, 30, 30, "");
-    fl_set_object_color(obj, FL_MCOL, FL_BLUE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_MATRIX);
-  fdui->button_deco = obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 100, 10, 30, 30, "");
-    fl_set_object_color(obj, FL_MCOL, FL_BLUE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_DECO);
-  fdui->button_space = obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 130, 10, 30, 30, "");
-    fl_set_object_color(obj, FL_MCOL, FL_BLUE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_SPACE);
-  fdui->button_dots = obj = fl_add_button(FL_NORMAL_BUTTON, 60, 110, 50, 30, _("Dots"));
-    fl_set_object_lsize(obj, 0);
-    fl_set_object_lstyle(obj, FL_TIMESITALIC_STYLE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_DOTS);
-  fdui->button_varsize = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 110, 50, 30, _("S  ò"));
-    fl_set_object_lsize(obj, 0);
-    fl_set_object_lstyle(obj, 15);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_VARSIZE);
-  fdui->button_sub = obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 40, 40, 30, 30, "");
-    fl_set_object_color(obj, FL_MCOL, FL_BLUE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_SUB);
-  fdui->button_super = obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 10, 40, 30, 30, "");
-    fl_set_object_color(obj, FL_MCOL, FL_BLUE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_SUPER);
-  fdui->button_style = obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 70, 40, 30, 30, "");
-    fl_set_object_color(obj, FL_MCOL, FL_BLUE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_STYLE);
-  fdui->button_ams_arrows = obj = fl_add_button(FL_NORMAL_BUTTON, 60, 140, 50, 30, _("­ Û"));
-    fl_set_object_lcolor(obj, FL_BLUE);
-    fl_set_object_lsize(obj, 0);
-    fl_set_object_lstyle(obj, 15);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_AMS_ARROWS);
-  fdui->button_ams_brel = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 140, 50, 30, _("£ @"));
-    fl_set_object_lcolor(obj, FL_BLUE);
-    fl_set_object_lsize(obj, 0);
-    fl_set_object_lstyle(obj, 15);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_AMS_BREL);
-  fdui->button_ams_nrel = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 170, 50, 30, _("!(£ @)"));
-    fl_set_object_lcolor(obj, FL_BLUE);
-    fl_set_object_lsize(obj, 0);
-    fl_set_object_lstyle(obj, 15);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_AMS_NREL);
-  fdui->button_ams_ops = obj = fl_add_button(FL_NORMAL_BUTTON, 60, 170, 50, 30, _("± ´"));
-    fl_set_object_lcolor(obj, FL_BLUE);
-    fl_set_object_lsize(obj, 0);
-    fl_set_object_lstyle(obj, 15);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_AMS_OPS);
-  fdui->button_ams_misc = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 170, 50, 30, _("Misc"));
-    fl_set_object_lcolor(obj, FL_BLUE);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_TIMESITALIC_STYLE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, MM_AMS_MISC);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_maths_panel.h b/src/frontends/xforms/form_maths_panel.h
deleted file mode 100644 (file)
index b8b76b1..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_maths_panel_h_
-#define FD_form_maths_panel_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_maths_panel {
-       ~FD_form_maths_panel();
-
-       FL_FORM *form;
-       FL_OBJECT *button_close;
-       FL_OBJECT *browser_funcs;
-       FL_OBJECT *button_greek;
-       FL_OBJECT *button_arrow;
-       FL_OBJECT *button_boperator;
-       FL_OBJECT *button_brelats;
-       FL_OBJECT *button_misc;
-       FL_OBJECT *button_equation;
-       FL_OBJECT *button_sqrt;
-       FL_OBJECT *button_frac;
-       FL_OBJECT *button_delim;
-       FL_OBJECT *button_matrix;
-       FL_OBJECT *button_deco;
-       FL_OBJECT *button_space;
-       FL_OBJECT *button_dots;
-       FL_OBJECT *button_varsize;
-       FL_OBJECT *button_sub;
-       FL_OBJECT *button_super;
-       FL_OBJECT *button_style;
-       FL_OBJECT *button_ams_arrows;
-       FL_OBJECT *button_ams_brel;
-       FL_OBJECT *button_ams_nrel;
-       FL_OBJECT *button_ams_ops;
-       FL_OBJECT *button_ams_misc;
-};
-
-#endif /* FD_form_maths_panel_h_ */
diff --git a/src/frontends/xforms/form_maths_space.C b/src/frontends/xforms/form_maths_space.C
deleted file mode 100644 (file)
index 3c6e9b5..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_maths_space.h"
-#include "FormMathsSpace.h"
-
-FD_form_maths_space::~FD_form_maths_space()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_maths_space * FormMathsSpace::build_maths_space()
-{
-  FL_OBJECT *obj;
-  FD_form_maths_space *fdui = new FD_form_maths_space;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 259, 149);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 259, 149, "");
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Thin|#T");
-    fdui->button_thin = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 10, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 1);
-  {
-    char const * const dummy = N_("Medium|#M");
-    fdui->button_medium = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 40, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 2);
-  {
-    char const * const dummy = N_("Thick|#H");
-    fdui->button_thick = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 70, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 3);
-  {
-    char const * const dummy = N_("Negative|#N");
-    fdui->button_negative = obj = fl_add_button(FL_NORMAL_BUTTON, 130, 10, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Quadratin|#Q");
-    fdui->button_quadratin = obj = fl_add_button(FL_NORMAL_BUTTON, 130, 40, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 4);
-  {
-    char const * const dummy = N_("2Quadratin|#2");
-    fdui->button_twoquadratin = obj = fl_add_button(FL_NORMAL_BUTTON, 130, 70, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 5);
-  fl_end_group();
-
-  fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 92, 110, 80, 30, _("Close"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_maths_space.h b/src/frontends/xforms/form_maths_space.h
deleted file mode 100644 (file)
index 21f6b09..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_maths_space_h_
-#define FD_form_maths_space_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_maths_space {
-       ~FD_form_maths_space();
-
-       FL_FORM *form;
-       FL_OBJECT *button_thin;
-       FL_OBJECT *button_medium;
-       FL_OBJECT *button_thick;
-       FL_OBJECT *button_negative;
-       FL_OBJECT *button_quadratin;
-       FL_OBJECT *button_twoquadratin;
-       FL_OBJECT *button_close;
-};
-
-#endif /* FD_form_maths_space_h_ */
diff --git a/src/frontends/xforms/form_maths_style.C b/src/frontends/xforms/form_maths_style.C
deleted file mode 100644 (file)
index cff4cf6..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-#include "bmtable.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_maths_style.h"
-#include "FormMathsStyle.h"
-
-FD_form_maths_style::~FD_form_maths_style()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_maths_style * FormMathsStyle::build_maths_style()
-{
-  FL_OBJECT *obj;
-  FD_form_maths_style *fdui = new FD_form_maths_style;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 257, 253);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 257, 253, "");
-  fdui->bmtable_font2 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 148, 10, 100, 120, "");
-    fl_set_object_lcolor(obj, FL_BLUE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->bmtable_style1 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 8, 10, 60, 60, "");
-    fl_set_object_lcolor(obj, FL_BLUE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 90, 206, 80, 30, _("Close"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
-  fdui->bmtable_style2 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 8, 70, 60, 120, "");
-    fl_set_object_lcolor(obj, FL_BLUE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->bmtable_font1 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 88, 10, 60, 180, "");
-    fl_set_object_lcolor(obj, FL_BLUE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->button_reset = obj = fl_add_button(FL_NORMAL_BUTTON, 148, 160, 100, 30, _("Reset"));
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 13);
-  fdui->button_textrm = obj = fl_add_button(FL_NORMAL_BUTTON, 148, 130, 100, 30, _("textrm"));
-    fl_set_object_lstyle(obj, FL_FIXED_STYLE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 12);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_maths_style.h b/src/frontends/xforms/form_maths_style.h
deleted file mode 100644 (file)
index 856dfe0..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_maths_style_h_
-#define FD_form_maths_style_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_maths_style {
-       ~FD_form_maths_style();
-
-       FL_FORM *form;
-       FL_OBJECT *bmtable_font2;
-       FL_OBJECT *bmtable_style1;
-       FL_OBJECT *button_close;
-       FL_OBJECT *bmtable_style2;
-       FL_OBJECT *bmtable_font1;
-       FL_OBJECT *button_reset;
-       FL_OBJECT *button_textrm;
-};
-
-#endif /* FD_form_maths_style_h_ */
diff --git a/src/frontends/xforms/form_minipage.C b/src/frontends/xforms/form_minipage.C
deleted file mode 100644 (file)
index a10069a..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_minipage.h"
-#include "FormMinipage.h"
-
-FD_form_minipage::~FD_form_minipage()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_minipage * FormMinipage::build_minipage()
-{
-  FL_OBJECT *obj;
-  FD_form_minipage *fdui = new FD_form_minipage;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 430, 170);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 430, 170, "");
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 20, 200, 60, _("Width"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 240, 20, 180, 100, _("Alignment"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  fdui->input_width = obj = fl_add_input(FL_NORMAL_INPUT, 30, 30, 110, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->choice_width_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 150, 30, 60, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Top|#T");
-    fdui->radio_top = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 249, 30, 152, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Middle|#d");
-    fdui->radio_middle = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 249, 60, 152, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Bottom|#B");
-    fdui->radio_bottom = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 249, 90, 152, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_group();
-
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 130, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 130, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 130, 130, 90, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  {
-    char const * const dummy = N_("Restore|#R");
-    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 130, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
-  fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 20, 90, 210, 30, "");
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_minipage.h b/src/frontends/xforms/form_minipage.h
deleted file mode 100644 (file)
index f754489..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_minipage_h_
-#define FD_form_minipage_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_minipage {
-       ~FD_form_minipage();
-
-       FL_FORM *form;
-       FL_OBJECT *input_width;
-       FL_OBJECT *choice_width_units;
-       FL_OBJECT *radio_top;
-       FL_OBJECT *radio_middle;
-       FL_OBJECT *radio_bottom;
-       FL_OBJECT *button_close;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_restore;
-       FL_OBJECT *text_warning;
-};
-
-#endif /* FD_form_minipage_h_ */
diff --git a/src/frontends/xforms/form_paragraph.C b/src/frontends/xforms/form_paragraph.C
deleted file mode 100644 (file)
index 30bf22d..0000000
+++ /dev/null
@@ -1,217 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_paragraph.h"
-#include "FormParagraph.h"
-
-FD_form_paragraph::~FD_form_paragraph()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_paragraph * FormParagraph::build_paragraph()
-{
-  FL_OBJECT *obj;
-  FD_form_paragraph *fdui = new FD_form_paragraph;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 500, 450);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 500, 450, "");
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 20, 220, 75, _("Alignment"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Right|#R");
-    fdui->radio_align_right = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 30, 80, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Left|#f");
-    fdui->radio_align_left = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 60, 80, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Block|#c");
-    fdui->radio_align_block = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 115, 30, 80, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Center|#n");
-    fdui->radio_align_center = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 115, 60, 80, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_group();
-
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 240, 20, 120, 75, _("Lines"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  {
-    char const * const dummy = N_("Above|#b");
-    fdui->check_lines_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 245, 30, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Below|#E");
-    fdui->check_lines_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 245, 60, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 370, 20, 120, 75, _("Page breaks"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  {
-    char const * const dummy = N_("Above|#o");
-    fdui->check_pagebreaks_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 30, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Below|#l");
-    fdui->check_pagebreaks_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 60, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 110, 480, 105, _("Vertical spaces"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  {
-    char const * const dummy = N_("Above:|#v");
-    fdui->choice_space_above = obj = fl_add_choice(FL_NORMAL_CHOICE, 80, 130, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->input_space_above = obj = fl_add_input(FL_NORMAL_INPUT, 190, 130, 90, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Keep|#K");
-    fdui->check_space_above = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 130, 40, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Below:|#w");
-    fdui->choice_space_below = obj = fl_add_choice(FL_NORMAL_CHOICE, 80, 170, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->input_space_below = obj = fl_add_input(FL_NORMAL_INPUT, 190, 170, 90, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Keep|#p");
-    fdui->check_space_below = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 170, 40, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 230, 345, 55, _("Line spacing"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  {
-    char const * const dummy = N_("Spacing:|#S");
-    fdui->choice_linespacing = obj = fl_add_choice(FL_NORMAL_CHOICE, 80, 245, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->input_linespacing = obj = fl_add_input(FL_NORMAL_INPUT, 190, 245, 155, 30, "");
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 300, 480, 50, _("Label Width"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  {
-    char const * const dummy = N_("Longest Label:|#g");
-    fdui->input_labelwidth = obj = fl_add_input(FL_NORMAL_INPUT, 125, 310, 355, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_West, FL_East);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 365, 230, 125, 55, _("Indent"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  {
-    char const * const dummy = N_("No Indent|#I");
-    fdui->check_noindent = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 245, 115, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Restore|#R");
-    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 360, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 200, 360, 90, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 300, 360, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 360, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 395, 480, 1, "");
-  fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 10, 405, 480, 35, "");
-    fl_set_object_boxtype(obj, FL_NO_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  fdui->choice_value_space_above = obj = fl_add_choice(FL_NORMAL_CHOICE, 290, 130, 65, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->choice_value_space_below = obj = fl_add_choice(FL_NORMAL_CHOICE, 290, 170, 65, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_paragraph.h b/src/frontends/xforms/form_paragraph.h
deleted file mode 100644 (file)
index f7e3a89..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_paragraph_h_
-#define FD_form_paragraph_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_paragraph {
-       ~FD_form_paragraph();
-
-       FL_FORM *form;
-       FL_OBJECT *radio_align_right;
-       FL_OBJECT *radio_align_left;
-       FL_OBJECT *radio_align_block;
-       FL_OBJECT *radio_align_center;
-       FL_OBJECT *check_lines_top;
-       FL_OBJECT *check_lines_bottom;
-       FL_OBJECT *check_pagebreaks_top;
-       FL_OBJECT *check_pagebreaks_bottom;
-       FL_OBJECT *choice_space_above;
-       FL_OBJECT *input_space_above;
-       FL_OBJECT *check_space_above;
-       FL_OBJECT *choice_space_below;
-       FL_OBJECT *input_space_below;
-       FL_OBJECT *check_space_below;
-       FL_OBJECT *choice_linespacing;
-       FL_OBJECT *input_linespacing;
-       FL_OBJECT *input_labelwidth;
-       FL_OBJECT *check_noindent;
-       FL_OBJECT *button_restore;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_close;
-       FL_OBJECT *text_warning;
-       FL_OBJECT *choice_value_space_above;
-       FL_OBJECT *choice_value_space_below;
-};
-
-#endif /* FD_form_paragraph_h_ */
diff --git a/src/frontends/xforms/form_preamble.C b/src/frontends/xforms/form_preamble.C
deleted file mode 100644 (file)
index fe25888..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_preamble.h"
-#include "FormPreamble.h"
-
-FD_form_preamble::~FD_form_preamble()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_preamble * FormPreamble::build_preamble()
-{
-  FL_OBJECT *obj;
-  FD_form_preamble *fdui = new FD_form_preamble;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 380, 420);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 380, 420, "");
-  {
-    char const * const dummy = N_("OK|#O");
-    fdui->button_ok = obj = fl_add_button(FL_NORMAL_BUTTON, 50, 380, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 160, 380, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 270, 380, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  fdui->input_preamble = obj = fl_add_input(FL_MULTILINE_INPUT, 10, 10, 360, 360, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_preamble.h b/src/frontends/xforms/form_preamble.h
deleted file mode 100644 (file)
index d54d36d..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_preamble_h_
-#define FD_form_preamble_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_preamble {
-       ~FD_form_preamble();
-
-       FL_FORM *form;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_close;
-       FL_OBJECT *input_preamble;
-};
-
-#endif /* FD_form_preamble_h_ */
diff --git a/src/frontends/xforms/form_preferences.C b/src/frontends/xforms/form_preferences.C
deleted file mode 100644 (file)
index 1e7c6c2..0000000
+++ /dev/null
@@ -1,1208 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_preferences.h"
-#include "FormPreferences.h"
-
-FD_form_preferences::~FD_form_preferences()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_preferences * FormPreferences::build_preferences()
-{
-  FL_OBJECT *obj;
-  FD_form_preferences *fdui = new FD_form_preferences;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 470, 500);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 470, 500, "");
-  fdui->tabfolder_prefs = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 5, 10, 455, 375, "");
-    fl_set_object_boxtype(obj, FL_FLAT_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  {
-    char const * const dummy = N_("Restore|#R");
-    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 5, 390, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedRestoreCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 170, 390, 90, 30, _("Save"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedOKCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 270, 390, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedApplyCB, 0);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 390, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 0, 425, 470, 1, "");
-  fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 5, 430, 460, 70, "");
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_inner_tab::~FD_form_inner_tab()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_inner_tab * FormPreferences::build_inner_tab()
-{
-  FL_OBJECT *obj;
-  FD_form_inner_tab *fdui = new FD_form_inner_tab;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 455, 375);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 375, "");
-  fdui->tabfolder_inner = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 0, 0, 455, 375, "");
-    fl_set_object_boxtype(obj, FL_FLAT_BOX);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_screen_fonts::~FD_form_screen_fonts()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_screen_fonts * FormPreferences::build_screen_fonts()
-{
-  FL_OBJECT *obj;
-  FD_form_screen_fonts *fdui = new FD_form_screen_fonts;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 455, 375);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 375, "");
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 180, 285, 145, _("Scale & Resolution"));
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 15, 285, 155, _("Fonts used"));
-  {
-    char const * const dummy = N_("Roman|#R");
-    fdui->input_roman = obj = fl_add_input(FL_NORMAL_INPUT, 145, 25, 140, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Sans Serif|#S");
-    fdui->input_sans = obj = fl_add_input(FL_NORMAL_INPUT, 145, 60, 140, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Typewriter|#T");
-    fdui->input_typewriter = obj = fl_add_input(FL_NORMAL_INPUT, 145, 95, 140, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Encoding|#E");
-    fdui->input_screen_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 145, 130, 140, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Rescale bitmap fonts|#b");
-    fdui->check_scalable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 190, 34, 41, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  {
-    // xgettext:no-c-format
-    char const * const dummy = N_("Zoom %|#Z");
-    fdui->counter_zoom = obj = fl_add_counter(FL_NORMAL_COUNTER, 185, 245, 95, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_counter_precision(obj, 0);
-    fl_set_counter_bounds(obj, 0, 999);
-    fl_set_counter_value(obj, 150);
-    fl_set_counter_step(obj, 1, 1);
-  {
-    char const * const dummy = N_("Screen DPI|#D");
-    fdui->counter_dpi = obj = fl_add_counter(FL_NORMAL_COUNTER, 185, 280, 95, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_counter_precision(obj, 0);
-    fl_set_counter_bounds(obj, 0, 999);
-    fl_set_counter_value(obj, 150);
-    fl_set_counter_step(obj, 1, 1);
-  fdui->input_tiny = obj = fl_add_input(FL_FLOAT_INPUT, 370, 20, 70, 30, _("tiny"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_script = obj = fl_add_input(FL_FLOAT_INPUT, 370, 50, 70, 30, _("smallest"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_footnote = obj = fl_add_input(FL_FLOAT_INPUT, 370, 80, 70, 30, _("smaller"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_small = obj = fl_add_input(FL_FLOAT_INPUT, 370, 110, 70, 30, _("small"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_normal = obj = fl_add_input(FL_FLOAT_INPUT, 370, 140, 70, 30, _("normal"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_large = obj = fl_add_input(FL_FLOAT_INPUT, 370, 170, 70, 30, _("large"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_larger = obj = fl_add_input(FL_FLOAT_INPUT, 370, 200, 70, 30, _("larger"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_largest = obj = fl_add_input(FL_FLOAT_INPUT, 370, 230, 70, 30, _("largest"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_huge = obj = fl_add_input(FL_FLOAT_INPUT, 370, 260, 70, 30, _("huge"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_huger = obj = fl_add_input(FL_FLOAT_INPUT, 370, 290, 70, 30, _("huger"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 305, 15, 140, 310, _("Size"));
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_interface::~FD_form_interface()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_interface * FormPreferences::build_interface()
-{
-  FL_OBJECT *obj;
-  FD_form_interface *fdui = new FD_form_interface;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 350);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 350, "");
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 20, 425, 110, _("Popup Fonts & Encoding"));
-  {
-    char const * const dummy = N_("Normal Font|#N");
-    fdui->input_popup_normal_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 30, 200, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Bold Font|#B");
-    fdui->input_popup_bold_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 60, 200, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Popup Encoding|#P");
-    fdui->input_popup_font_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 230, 90, 200, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 150, 425, 85, _("Layout & Bindings"));
-  {
-    char const * const dummy = N_("User Interface file|#U");
-    fdui->input_ui_file = obj = fl_add_input(FL_NORMAL_INPUT, 160, 160, 170, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Browse...|#r");
-    fdui->button_ui_file_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 335, 160, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Bind file|#f");
-    fdui->input_bind_file = obj = fl_add_input(FL_NORMAL_INPUT, 160, 195, 170, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Browse...|#w");
-    fdui->button_bind_file_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 335, 195, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 255, 425, 45, _("Dead Keys"));
-  {
-    char const * const dummy = N_("Override X Window dead-keys|#O");
-    fdui->check_override_x_dead_keys = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 95, 265, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_colors::~FD_form_colors()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_colors * FormPreferences::build_colors()
-{
-  FL_OBJECT *obj;
-  FD_form_colors *fdui = new FD_form_colors;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 360);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 360, "");
-  {
-    char const * const dummy = N_("LyX objects|#L");
-    fdui->browser_lyx_objs = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 25, 195, 290, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("H|#H");
-    fdui->dial_hue = obj = fl_add_dial(FL_NORMAL_DIAL, 276, 23, 100, 100, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lalign(obj, FL_ALIGN_CENTER);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("S|#S");
-    fdui->slider_saturation = obj = fl_add_slider(FL_HOR_NICE_SLIDER, 251, 135, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_slider_size(obj, 0.15);
-  {
-    char const * const dummy = N_("V|#V");
-    fdui->slider_value = obj = fl_add_slider(FL_HOR_NICE_SLIDER, 251, 175, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_slider_size(obj, 0.15);
-  {
-    char const * const dummy = N_("R|#R");
-    fdui->slider_red = obj = fl_add_slider(FL_VERT_FILL_SLIDER, 250, 25, 40, 180, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_RED);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_slider_size(obj, 0.15);
-  {
-    char const * const dummy = N_("G|#G");
-    fdui->slider_green = obj = fl_add_slider(FL_VERT_FILL_SLIDER, 305, 25, 40, 180, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_GREEN);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_slider_size(obj, 0.15);
-  {
-    char const * const dummy = N_("B|#B");
-    fdui->slider_blue = obj = fl_add_slider(FL_VERT_FILL_SLIDER, 360, 25, 40, 180, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_BLUE);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_slider_size(obj, 0.15);
- fl_bgn_group();
-  fdui->radio_hsv = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 250, 220, 30, 30, _("HSV"));
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->radio_rgb = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 335, 220, 30, 30, _("RGB"));
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  fl_end_group();
-
-  fdui->text_color_values = obj = fl_add_text(FL_NORMAL_TEXT, 250, 250, 150, 30, "");
-    fl_set_object_boxtype(obj, FL_DOWN_BOX);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-  fdui->button_color = obj = fl_add_button(FL_NORMAL_BUTTON, 250, 285, 60, 30, "");
-    fl_set_object_boxtype(obj, FL_BORDER_BOX);
-    fl_set_object_color(obj, FL_WHITE, FL_COL1);
-  {
-    char const * const dummy = N_("Modify|#M");
-    fdui->button_modify = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 285, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_lnf_misc::~FD_form_lnf_misc()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_lnf_misc * FormPreferences::build_lnf_misc()
-{
-  FL_OBJECT *obj;
-  FD_form_lnf_misc *fdui = new FD_form_lnf_misc;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 350);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 350, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 15, 15, 255, 210, "");
-  {
-    char const * const dummy = N_("Show banner|#S");
-    fdui->check_banner = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 15, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  {
-    char const * const dummy = N_("Auto region delete|#A");
-    fdui->check_auto_region_delete = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 45, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  {
-    char const * const dummy = N_("Exit confirmation|#E");
-    fdui->check_exit_confirm = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 75, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  {
-    char const * const dummy = N_("Display keyboard shortcuts|#k");
-    fdui->check_display_shrtcuts = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 105, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  {
-    char const * const dummy = N_("File->New asks for name|#N");
-    fdui->check_ask_new_file = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 135, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  {
-    char const * const dummy = N_("Cursor follows scrollbar|#f");
-    fdui->check_cursor_follows_scrollbar = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 165, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  {
-    char const * const dummy = N_("Dialogs iconify with main window|#i");
-    fdui->check_dialogs_iconify_with_main = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 195, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  fdui->counter_wm_jump = obj = fl_add_counter(FL_NORMAL_COUNTER, 20, 235, 115, 30, _("Wheel mouse jump"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_counter_precision(obj, 0);
-    fl_set_counter_bounds(obj, 0, 250);
-    fl_set_counter_value(obj, 100);
-    fl_set_counter_step(obj, 1, 1);
-  fdui->counter_autosave = obj = fl_add_counter(FL_NORMAL_COUNTER, 20, 270, 115, 30, _("Autosave interval"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_counter_precision(obj, 0);
-    fl_set_counter_bounds(obj, 0, 1200);
-    fl_set_counter_value(obj, 300);
-    fl_set_counter_step(obj, 1, 1);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("in Monochrome|#M");
-    fdui->radio_display_monochrome = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 285, 35, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  {
-    char const * const dummy = N_("in Grayscale|#G");
-    fdui->radio_display_grayscale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 285, 65, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("in Color|#C");
-    fdui->radio_display_color = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 285, 95, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Don't display|#D");
-    fdui->radio_no_display = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 285, 125, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_group();
-
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 275, 15, 160, 210, _("Display Graphics"));
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 15, 230, 420, 75, "");
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_spelloptions::~FD_form_spelloptions()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_spelloptions * FormPreferences::build_spelloptions()
-{
-  FL_OBJECT *obj;
-  FD_form_spelloptions *fdui = new FD_form_spelloptions;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 360);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 360, "");
-  {
-    char const * const dummy = N_("Spell command|#S");
-    fdui->choice_spell_command = obj = fl_add_choice(FL_NORMAL_CHOICE, 240, 30, 171, 34, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Use alternative language|#a");
-    fdui->check_alt_lang = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 100, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_alt_lang = obj = fl_add_input(FL_NORMAL_INPUT, 239, 100, 170, 30, "");
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Use escape characters|#e");
-    fdui->check_escape_chars = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 130, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_escape_chars = obj = fl_add_input(FL_NORMAL_INPUT, 239, 130, 170, 30, "");
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Use personal dictionary|#d");
-    fdui->check_personal_dict = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 160, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_personal_dict = obj = fl_add_input(FL_NORMAL_INPUT, 239, 160, 170, 30, "");
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Browse...|#B");
-    fdui->button_personal_dict = obj = fl_add_button(FL_NORMAL_BUTTON, 240, 195, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Accept compound words|#w");
-    fdui->check_compound_words = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 155, 250, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Use input encoding|#i");
-    fdui->check_input_enc = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 155, 275, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 245, 425, 60, _("Advanced Options"));
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 20, 425, 55, _("Interface"));
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 90, 425, 140, _("Language Options"));
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_language::~FD_form_language()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_language * FormPreferences::build_language()
-{
-  FL_OBJECT *obj;
-  FD_form_language *fdui = new FD_form_language;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 360);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 360, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 5, 10, 440, 80, "");
-  {
-    char const * const dummy = N_("Package|#P");
-    fdui->input_package = obj = fl_add_input(FL_NORMAL_INPUT, 131, 18, 300, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Default language|#l");
-    fdui->choice_default_lang = obj = fl_add_choice(FL_NORMAL_CHOICE, 231, 56, 200, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Keyboard\nmap|#K");
-    fdui->check_use_kbmap = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 78, 113, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("1st|#1");
-    fdui->input_kbmap1 = obj = fl_add_input(FL_NORMAL_INPUT, 145, 100, 190, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("2nd|#2");
-    fdui->input_kbmap2 = obj = fl_add_input(FL_NORMAL_INPUT, 145, 135, 190, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Browse...|#o");
-    fdui->button_kbmap1_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 100, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Browse...|#w");
-    fdui->button_kbmap2_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 135, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("RtL support|#R");
-    fdui->check_rtl_support = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 140, 175, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Auto begin|#b");
-    fdui->check_auto_begin = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 265, 175, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Use babel|#U");
-    fdui->check_use_babel = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 390, 175, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Mark foreign|#M");
-    fdui->check_mark_foreign = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 140, 205, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Auto finish|#f");
-    fdui->check_auto_end = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 265, 205, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Global|#G");
-    fdui->check_global_options = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 390, 205, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Command start|#s");
-    fdui->input_command_begin = obj = fl_add_input(FL_NORMAL_INPUT, 130, 245, 300, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Command end|#e");
-    fdui->input_command_end = obj = fl_add_input(FL_NORMAL_INPUT, 130, 280, 300, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 5, 175, 440, 60, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 5, 240, 440, 80, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 5, 95, 440, 75, "");
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_formats::~FD_form_formats()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_formats * FormPreferences::build_formats()
-{
-  FL_OBJECT *obj;
-  FD_form_formats *fdui = new FD_form_formats;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 360);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 360, "");
-  {
-    char const * const dummy = N_("All formats|#l");
-    fdui->browser_all = obj = fl_add_browser(FL_HOLD_BROWSER, 30, 30, 160, 270, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Format|#F");
-    fdui->input_format = obj = fl_add_input(FL_NORMAL_INPUT, 280, 30, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("GUI name|#G");
-    fdui->input_gui_name = obj = fl_add_input(FL_NORMAL_INPUT, 280, 70, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Shortcut|#S");
-    fdui->input_shrtcut = obj = fl_add_input(FL_NORMAL_INPUT, 280, 110, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Extension|#E");
-    fdui->input_extension = obj = fl_add_input(FL_NORMAL_INPUT, 280, 150, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Viewer|#V");
-    fdui->input_viewer = obj = fl_add_input(FL_NORMAL_INPUT, 280, 190, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Add|#A");
-    fdui->button_add = obj = fl_add_button(FL_NORMAL_BUTTON, 240, 270, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Delete|#D");
-    fdui->button_delete = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 270, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_converters::~FD_form_converters()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_converters * FormPreferences::build_converters()
-{
-  FL_OBJECT *obj;
-  FD_form_converters *fdui = new FD_form_converters;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 360);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 360, "");
-  {
-    char const * const dummy = N_("All converters|#l");
-    fdui->browser_all = obj = fl_add_browser(FL_HOLD_BROWSER, 30, 30, 160, 270, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("From|#F");
-    fdui->choice_from = obj = fl_add_choice(FL_NORMAL_CHOICE, 280, 30, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("To|#T");
-    fdui->choice_to = obj = fl_add_choice(FL_NORMAL_CHOICE, 280, 70, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Converter|#C");
-    fdui->input_converter = obj = fl_add_input(FL_NORMAL_INPUT, 280, 110, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Extra flags|#E");
-    fdui->input_flags = obj = fl_add_input(FL_NORMAL_INPUT, 280, 150, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Add|#A");
-    fdui->button_add = obj = fl_add_button(FL_NORMAL_BUTTON, 240, 270, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Delete|#D");
-    fdui->button_delete = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 270, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_paths::~FD_form_paths()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_paths * FormPreferences::build_paths()
-{
-  FL_OBJECT *obj;
-  FD_form_paths *fdui = new FD_form_paths;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 350);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 350, "");
-  {
-    char const * const dummy = N_("Default path|#p");
-    fdui->input_default_path = obj = fl_add_input(FL_NORMAL_INPUT, 170, 10, 170, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->button_default_path_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 345, 10, 100, 30, _("Browse..."));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Template path|#T");
-    fdui->input_template_path = obj = fl_add_input(FL_NORMAL_INPUT, 170, 45, 170, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->button_template_path_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 345, 45, 100, 30, _("Browse..."));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Temp dir|#d");
-    fdui->check_use_temp_dir = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 140, 80, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  fdui->input_temp_dir = obj = fl_add_input(FL_NORMAL_INPUT, 170, 80, 170, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->button_temp_dir_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 345, 80, 100, 30, _("Browse..."));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Check last files|#C");
-    fdui->check_last_files = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 140, 115, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  fdui->input_lastfiles = obj = fl_add_input(FL_NORMAL_INPUT, 170, 115, 170, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->button_lastfiles_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 345, 115, 100, 30, _("Browse..."));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Last file count|#L");
-    fdui->counter_lastfiles = obj = fl_add_counter(FL_SIMPLE_COUNTER, 170, 150, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_counter_precision(obj, 0);
-    fl_set_counter_bounds(obj, 0, 9);
-    fl_set_counter_value(obj, 4);
-    fl_set_counter_step(obj, 1, 1);
-  {
-    char const * const dummy = N_("Backup path|#B");
-    fdui->check_make_backups = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 140, 205, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  fdui->input_backup_path = obj = fl_add_input(FL_NORMAL_INPUT, 170, 205, 170, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->button_backup_path_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 345, 205, 100, 30, _("Browse..."));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("LyXServer pipe|#S");
-    fdui->input_serverpipe = obj = fl_add_input(FL_NORMAL_INPUT, 170, 245, 170, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->button_serverpipe_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 345, 245, 100, 30, _("Browse..."));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_inputs_misc::~FD_form_inputs_misc()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_inputs_misc * FormPreferences::build_inputs_misc()
-{
-  FL_OBJECT *obj;
-  FD_form_inputs_misc *fdui = new FD_form_inputs_misc;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 360);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 360, "");
-  {
-    char const * const dummy = N_("date format|#f");
-    fdui->input_date_format = obj = fl_add_input(FL_NORMAL_INPUT, 120, 70, 285, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_printer::~FD_form_printer()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_printer * FormPreferences::build_printer()
-{
-  FL_OBJECT *obj;
-  FD_form_printer *fdui = new FD_form_printer;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 350);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 350, "");
-  fdui->input_name = obj = fl_add_input(FL_NORMAL_INPUT, 130, 10, 80, 30, _("name"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->check_adapt_output = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 240, 10, 30, 30, _("adapt output"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 60, 435, 260, _("Printer Command and Flags"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  fdui->input_command = obj = fl_add_input(FL_NORMAL_INPUT, 130, 75, 80, 30, _("command"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_page_range = obj = fl_add_input(FL_NORMAL_INPUT, 130, 105, 80, 30, _("page range"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_copies = obj = fl_add_input(FL_NORMAL_INPUT, 130, 135, 80, 30, _("copies"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_reverse = obj = fl_add_input(FL_NORMAL_INPUT, 130, 165, 80, 30, _("reverse"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_to_printer = obj = fl_add_input(FL_NORMAL_INPUT, 130, 195, 80, 30, _("to printer"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_file_extension = obj = fl_add_input(FL_NORMAL_INPUT, 130, 225, 80, 30, _("file extension"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_spool_command = obj = fl_add_input(FL_NORMAL_INPUT, 130, 255, 80, 30, _("spool command"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_paper_type = obj = fl_add_input(FL_NORMAL_INPUT, 130, 285, 80, 30, _("paper type"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_even_pages = obj = fl_add_input(FL_NORMAL_INPUT, 360, 75, 80, 30, _("even pages"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_odd_pages = obj = fl_add_input(FL_NORMAL_INPUT, 360, 105, 80, 30, _("odd pages"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_collated = obj = fl_add_input(FL_NORMAL_INPUT, 360, 135, 80, 30, _("collated"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_landscape = obj = fl_add_input(FL_NORMAL_INPUT, 360, 165, 80, 30, _("landscape"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_to_file = obj = fl_add_input(FL_NORMAL_INPUT, 360, 195, 80, 30, _("to file"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_extra_options = obj = fl_add_input(FL_NORMAL_INPUT, 360, 225, 80, 30, _("extra options"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_spool_prefix = obj = fl_add_input(FL_NORMAL_INPUT, 360, 255, 80, 30, _("spool printer prefix"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_paper_size = obj = fl_add_input(FL_NORMAL_INPUT, 360, 285, 80, 30, _("paper size"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 5, 435, 45, "");
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_outputs_misc::~FD_form_outputs_misc()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_outputs_misc * FormPreferences::build_outputs_misc()
-{
-  FL_OBJECT *obj;
-  FD_form_outputs_misc *fdui = new FD_form_outputs_misc;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 455, 375);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 375, "");
-    fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 10, 435, 165, "");
-  {
-    char const * const dummy = N_("Ascii line length|#A");
-    fdui->counter_line_len = obj = fl_add_counter(FL_NORMAL_COUNTER, 330, 25, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_counter_precision(obj, 0);
-    fl_set_counter_bounds(obj, 0, 120);
-    fl_set_counter_value(obj, 75);
-    fl_set_counter_step(obj, 1, 1);
-  {
-    char const * const dummy = N_("TeX encoding|#T");
-    fdui->input_tex_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 230, 65, 200, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Default paper size|#p");
-    fdui->choice_default_papersize = obj = fl_add_choice(FL_NORMAL_CHOICE, 230, 105, 199, 29, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 190, 435, 135, _("Outside code interaction"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  {
-    char const * const dummy = N_("ascii roff|#r");
-    fdui->input_ascii_roff = obj = fl_add_input(FL_NORMAL_INPUT, 145, 205, 285, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("checktex|#c");
-    fdui->input_checktex = obj = fl_add_input(FL_NORMAL_INPUT, 145, 245, 285, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("DVI paper option|#D");
-    fdui->input_paperoption = obj = fl_add_input(FL_NORMAL_INPUT, 145, 285, 285, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Autoreset Class Options on change|#u");
-    fdui->check_autoreset_classopt = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 140, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_preferences.h b/src/frontends/xforms/form_preferences.h
deleted file mode 100644 (file)
index 56b105a..0000000
+++ /dev/null
@@ -1,250 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_preferences_h_
-#define FD_form_preferences_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseDeprecatedRestoreCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long);
-
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_preferences {
-       ~FD_form_preferences();
-
-       FL_FORM *form;
-       FL_OBJECT *tabfolder_prefs;
-       FL_OBJECT *button_restore;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_close;
-       FL_OBJECT *text_warning;
-};
-struct FD_form_inner_tab {
-       ~FD_form_inner_tab();
-
-       FL_FORM *form;
-       FL_OBJECT *tabfolder_inner;
-};
-struct FD_form_screen_fonts {
-       ~FD_form_screen_fonts();
-
-       FL_FORM *form;
-       FL_OBJECT *input_roman;
-       FL_OBJECT *input_sans;
-       FL_OBJECT *input_typewriter;
-       FL_OBJECT *input_screen_encoding;
-       FL_OBJECT *check_scalable;
-       FL_OBJECT *counter_zoom;
-       FL_OBJECT *counter_dpi;
-       FL_OBJECT *input_tiny;
-       FL_OBJECT *input_script;
-       FL_OBJECT *input_footnote;
-       FL_OBJECT *input_small;
-       FL_OBJECT *input_normal;
-       FL_OBJECT *input_large;
-       FL_OBJECT *input_larger;
-       FL_OBJECT *input_largest;
-       FL_OBJECT *input_huge;
-       FL_OBJECT *input_huger;
-};
-struct FD_form_interface {
-       ~FD_form_interface();
-
-       FL_FORM *form;
-       FL_OBJECT *input_popup_normal_font;
-       FL_OBJECT *input_popup_bold_font;
-       FL_OBJECT *input_popup_font_encoding;
-       FL_OBJECT *input_ui_file;
-       FL_OBJECT *button_ui_file_browse;
-       FL_OBJECT *input_bind_file;
-       FL_OBJECT *button_bind_file_browse;
-       FL_OBJECT *check_override_x_dead_keys;
-};
-struct FD_form_colors {
-       ~FD_form_colors();
-
-       FL_FORM *form;
-       FL_OBJECT *browser_lyx_objs;
-       FL_OBJECT *dial_hue;
-       FL_OBJECT *slider_saturation;
-       FL_OBJECT *slider_value;
-       FL_OBJECT *slider_red;
-       FL_OBJECT *slider_green;
-       FL_OBJECT *slider_blue;
-       FL_OBJECT *radio_hsv;
-       FL_OBJECT *radio_rgb;
-       FL_OBJECT *text_color_values;
-       FL_OBJECT *button_color;
-       FL_OBJECT *button_modify;
-};
-struct FD_form_lnf_misc {
-       ~FD_form_lnf_misc();
-
-       FL_FORM *form;
-       FL_OBJECT *check_banner;
-       FL_OBJECT *check_auto_region_delete;
-       FL_OBJECT *check_exit_confirm;
-       FL_OBJECT *check_display_shrtcuts;
-       FL_OBJECT *check_ask_new_file;
-       FL_OBJECT *check_cursor_follows_scrollbar;
-       FL_OBJECT *check_dialogs_iconify_with_main;
-       FL_OBJECT *counter_wm_jump;
-       FL_OBJECT *counter_autosave;
-       FL_OBJECT *radio_display_monochrome;
-       FL_OBJECT *radio_display_grayscale;
-       FL_OBJECT *radio_display_color;
-       FL_OBJECT *radio_no_display;
-};
-struct FD_form_spelloptions {
-       ~FD_form_spelloptions();
-
-       FL_FORM *form;
-       FL_OBJECT *choice_spell_command;
-       FL_OBJECT *check_alt_lang;
-       FL_OBJECT *input_alt_lang;
-       FL_OBJECT *check_escape_chars;
-       FL_OBJECT *input_escape_chars;
-       FL_OBJECT *check_personal_dict;
-       FL_OBJECT *input_personal_dict;
-       FL_OBJECT *button_personal_dict;
-       FL_OBJECT *check_compound_words;
-       FL_OBJECT *check_input_enc;
-};
-struct FD_form_language {
-       ~FD_form_language();
-
-       FL_FORM *form;
-       FL_OBJECT *input_package;
-       FL_OBJECT *choice_default_lang;
-       FL_OBJECT *check_use_kbmap;
-       FL_OBJECT *input_kbmap1;
-       FL_OBJECT *input_kbmap2;
-       FL_OBJECT *button_kbmap1_browse;
-       FL_OBJECT *button_kbmap2_browse;
-       FL_OBJECT *check_rtl_support;
-       FL_OBJECT *check_auto_begin;
-       FL_OBJECT *check_use_babel;
-       FL_OBJECT *check_mark_foreign;
-       FL_OBJECT *check_auto_end;
-       FL_OBJECT *check_global_options;
-       FL_OBJECT *input_command_begin;
-       FL_OBJECT *input_command_end;
-};
-struct FD_form_formats {
-       ~FD_form_formats();
-
-       FL_FORM *form;
-       FL_OBJECT *browser_all;
-       FL_OBJECT *input_format;
-       FL_OBJECT *input_gui_name;
-       FL_OBJECT *input_shrtcut;
-       FL_OBJECT *input_extension;
-       FL_OBJECT *input_viewer;
-       FL_OBJECT *button_add;
-       FL_OBJECT *button_delete;
-};
-struct FD_form_converters {
-       ~FD_form_converters();
-
-       FL_FORM *form;
-       FL_OBJECT *browser_all;
-       FL_OBJECT *choice_from;
-       FL_OBJECT *choice_to;
-       FL_OBJECT *input_converter;
-       FL_OBJECT *input_flags;
-       FL_OBJECT *button_add;
-       FL_OBJECT *button_delete;
-};
-struct FD_form_paths {
-       ~FD_form_paths();
-
-       FL_FORM *form;
-       FL_OBJECT *input_default_path;
-       FL_OBJECT *button_default_path_browse;
-       FL_OBJECT *input_template_path;
-       FL_OBJECT *button_template_path_browse;
-       FL_OBJECT *check_use_temp_dir;
-       FL_OBJECT *input_temp_dir;
-       FL_OBJECT *button_temp_dir_browse;
-       FL_OBJECT *check_last_files;
-       FL_OBJECT *input_lastfiles;
-       FL_OBJECT *button_lastfiles_browse;
-       FL_OBJECT *counter_lastfiles;
-       FL_OBJECT *check_make_backups;
-       FL_OBJECT *input_backup_path;
-       FL_OBJECT *button_backup_path_browse;
-       FL_OBJECT *input_serverpipe;
-       FL_OBJECT *button_serverpipe_browse;
-};
-struct FD_form_inputs_misc {
-       ~FD_form_inputs_misc();
-
-       FL_FORM *form;
-       FL_OBJECT *input_date_format;
-};
-struct FD_form_printer {
-       ~FD_form_printer();
-
-       FL_FORM *form;
-       FL_OBJECT *input_name;
-       FL_OBJECT *check_adapt_output;
-       FL_OBJECT *input_command;
-       FL_OBJECT *input_page_range;
-       FL_OBJECT *input_copies;
-       FL_OBJECT *input_reverse;
-       FL_OBJECT *input_to_printer;
-       FL_OBJECT *input_file_extension;
-       FL_OBJECT *input_spool_command;
-       FL_OBJECT *input_paper_type;
-       FL_OBJECT *input_even_pages;
-       FL_OBJECT *input_odd_pages;
-       FL_OBJECT *input_collated;
-       FL_OBJECT *input_landscape;
-       FL_OBJECT *input_to_file;
-       FL_OBJECT *input_extra_options;
-       FL_OBJECT *input_spool_prefix;
-       FL_OBJECT *input_paper_size;
-};
-struct FD_form_outputs_misc {
-       ~FD_form_outputs_misc();
-
-       FL_FORM *form;
-       FL_OBJECT *counter_line_len;
-       FL_OBJECT *input_tex_encoding;
-       FL_OBJECT *choice_default_papersize;
-       FL_OBJECT *input_ascii_roff;
-       FL_OBJECT *input_checktex;
-       FL_OBJECT *input_paperoption;
-       FL_OBJECT *check_autoreset_classopt;
-};
-
-#endif /* FD_form_preferences_h_ */
diff --git a/src/frontends/xforms/form_print.C b/src/frontends/xforms/form_print.C
deleted file mode 100644 (file)
index 3db941b..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_print.h"
-#include "FormPrint.h"
-
-FD_form_print::~FD_form_print()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_print * FormPrint::build_print()
-{
-  FL_OBJECT *obj;
-  FD_form_print *fdui = new FD_form_print;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 340, 390);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 340, 390, "");
-  fdui->input_printer = obj = fl_add_input(FL_NORMAL_INPUT, 90, 225, 230, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->input_file = obj = fl_add_input(FL_NORMAL_INPUT, 90, 265, 230, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Printer|#P");
-    fdui->radio_printer = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 225, 80, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("File|#F");
-    fdui->radio_file = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 265, 80, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_group();
-
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 10, 350, 100, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 120, 350, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 350, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("All Pages|#G");
-    fdui->radio_all_pages = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 30, 160, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Only Odd Pages|#O");
-    fdui->radio_odd_pages = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 60, 160, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Only Even Pages|#E");
-    fdui->radio_even_pages = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 10, 90, 160, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_group();
-
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Normal Order|#N");
-    fdui->radio_order_normal = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 180, 30, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Reverse Order|#R");
-    fdui->radio_order_reverse = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 180, 60, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_group();
-
-  fdui->input_from_page = obj = fl_add_input(FL_INT_INPUT, 20, 160, 50, 30, _("Pages:"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->input_count = obj = fl_add_input(FL_INT_INPUT, 190, 160, 130, 30, _("Count:"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Collated|#C");
-    fdui->check_collated = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 180, 115, 140, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->input_to_page = obj = fl_add_input(FL_INT_INPUT, 110, 160, 50, 30, _("to"));
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 20, 160, 180, _("Print"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 180, 20, 150, 70, _("Order"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 180, 110, 150, 90, _("Copies"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 210, 320, 130, _("Print to"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  {
-    char const * const dummy = N_("Browse...|#B");
-    fdui->button_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 220, 300, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_print.h b/src/frontends/xforms/form_print.h
deleted file mode 100644 (file)
index 4e6fdd7..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_print_h_
-#define FD_form_print_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_print {
-       ~FD_form_print();
-
-       FL_FORM *form;
-       FL_OBJECT *input_printer;
-       FL_OBJECT *input_file;
-       FL_OBJECT *radio_printer;
-       FL_OBJECT *radio_file;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_close;
-       FL_OBJECT *radio_all_pages;
-       FL_OBJECT *radio_odd_pages;
-       FL_OBJECT *radio_even_pages;
-       FL_OBJECT *radio_order_normal;
-       FL_OBJECT *radio_order_reverse;
-       FL_OBJECT *input_from_page;
-       FL_OBJECT *input_count;
-       FL_OBJECT *check_collated;
-       FL_OBJECT *input_to_page;
-       FL_OBJECT *button_browse;
-};
-
-#endif /* FD_form_print_h_ */
diff --git a/src/frontends/xforms/form_ref.C b/src/frontends/xforms/form_ref.C
deleted file mode 100644 (file)
index 50e9125..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_ref.h"
-#include "FormRef.h"
-
-FD_form_ref::~FD_form_ref()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_ref * FormRef::build_ref()
-{
-  FL_OBJECT *obj;
-  FD_form_ref *fdui = new FD_form_ref;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 530, 380);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 530, 380, "");
-  {
-    char const * const dummy = N_("Buffer|#B");
-    fdui->choice_buffer = obj = fl_add_choice(FL_NORMAL_CHOICE, 105, 10, 350, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->browser_refs = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 50, 270, 240, "");
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_South);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Update|#U");
-    fdui->button_update = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 300, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Sort|#S");
-    fdui->check_sort = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 130, 300, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 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, 0);
-  {
-    char const * const dummy = N_("Name:|#N");
-    fdui->input_name = obj = fl_add_input(FL_NORMAL_INPUT, 370, 50, 150, 40, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-  fdui->input_ref = obj = fl_add_input(FL_NORMAL_INPUT, 370, 100, 150, 40, _("Ref:"));
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-  {
-    char const * const dummy = N_("Reference type|#R");
-    fdui->choice_type = obj = fl_add_choice(FL_NORMAL_CHOICE, 370, 170, 150, 40, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    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, 0);
-  {
-    char const * const dummy = N_("Goto reference|#G");
-    fdui->button_go = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 220, 150, 40, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Restore|#R");
-    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 340, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 230, 340, 90, 30, _("OK"));
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 430, 340, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 340, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_ref.h b/src/frontends/xforms/form_ref.h
deleted file mode 100644 (file)
index e7d9fa8..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_ref_h_
-#define FD_form_ref_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_ref {
-       ~FD_form_ref();
-
-       FL_FORM *form;
-       FL_OBJECT *choice_buffer;
-       FL_OBJECT *browser_refs;
-       FL_OBJECT *button_update;
-       FL_OBJECT *check_sort;
-       FL_OBJECT *input_name;
-       FL_OBJECT *input_ref;
-       FL_OBJECT *choice_type;
-       FL_OBJECT *button_go;
-       FL_OBJECT *button_restore;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_close;
-       FL_OBJECT *button_apply;
-};
-
-#endif /* FD_form_ref_h_ */
diff --git a/src/frontends/xforms/form_search.C b/src/frontends/xforms/form_search.C
deleted file mode 100644 (file)
index 8b68e19..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_search.h"
-#include "FormSearch.h"
-
-FD_form_search::~FD_form_search()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_search * FormSearch::build_search()
-{
-  FL_OBJECT *obj;
-  FD_form_search *fdui = new FD_form_search;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 440, 160);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 440, 160, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 300, 10, 130, 80, "");
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-  {
-    char const * const dummy = N_("Find|#n");
-    fdui->input_search = obj = fl_add_input(FL_NORMAL_INPUT, 110, 10, 180, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Replace with|#W");
-    fdui->input_replace = obj = fl_add_input(FL_NORMAL_INPUT, 110, 40, 180, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Forwards >|#F^s");
-    fdui->button_findnext = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 80, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_(" < Backwards|#B^r");
-    fdui->button_findprev = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 80, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Replace|#R#r");
-    fdui->button_replace = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 120, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Close|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 120, 80, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  {
-    char const * const dummy = N_("Case sensitive|#s#S");
-    fdui->check_casesensitive = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 300, 20, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Match word|#M#m");
-    fdui->check_matchword = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 300, 50, 150, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Replace All|#A#a");
-    fdui->button_replaceall = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 120, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_search.h b/src/frontends/xforms/form_search.h
deleted file mode 100644 (file)
index b5d3bcf..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_search_h_
-#define FD_form_search_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_search {
-       ~FD_form_search();
-
-       FL_FORM *form;
-       FL_OBJECT *input_search;
-       FL_OBJECT *input_replace;
-       FL_OBJECT *button_findnext;
-       FL_OBJECT *button_findprev;
-       FL_OBJECT *button_replace;
-       FL_OBJECT *button_close;
-       FL_OBJECT *check_casesensitive;
-       FL_OBJECT *check_matchword;
-       FL_OBJECT *button_replaceall;
-};
-
-#endif /* FD_form_search_h_ */
diff --git a/src/frontends/xforms/form_sendto.C b/src/frontends/xforms/form_sendto.C
deleted file mode 100644 (file)
index 51b581d..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_sendto.h"
-#include "FormSendto.h"
-
-FD_form_sendto::~FD_form_sendto()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_sendto * FormSendto::build_sendto()
-{
-  FL_OBJECT *obj;
-  FD_form_sendto *fdui = new FD_form_sendto;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 360, 410);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 360, 410, "");
-  {
-    char const * const dummy = N_("Export format|#E");
-    fdui->browser_formats = obj = fl_add_browser(FL_HOLD_BROWSER, 105, 30, 145, 250, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Command|#C");
-    fdui->input_command = obj = fl_add_input(FL_NORMAL_INPUT, 10, 315, 335, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 65, 370, 90, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 160, 370, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 255, 370, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_sendto.h b/src/frontends/xforms/form_sendto.h
deleted file mode 100644 (file)
index 457aa2b..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_sendto_h_
-#define FD_form_sendto_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_sendto {
-       ~FD_form_sendto();
-
-       FL_FORM *form;
-       FL_OBJECT *browser_formats;
-       FL_OBJECT *input_command;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_close;
-};
-
-#endif /* FD_form_sendto_h_ */
diff --git a/src/frontends/xforms/form_spellchecker.C b/src/frontends/xforms/form_spellchecker.C
deleted file mode 100644 (file)
index 377db38..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_spellchecker.h"
-#include "FormSpellchecker.h"
-
-FD_form_spellchecker::~FD_form_spellchecker()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_spellchecker * FormSpellchecker::build_spellchecker()
-{
-  FL_OBJECT *obj;
-  FD_form_spellchecker *fdui = new FD_form_spellchecker;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 540, 280);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 540, 280, "");
-    fl_set_object_lsize(obj, 0);
-  fdui->text = obj = fl_add_text(FL_NORMAL_TEXT, 80, 10, 220, 30, "");
-    fl_set_object_boxtype(obj, FL_DOWN_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->input = obj = fl_add_input(FL_NORMAL_INPUT, 80, 40, 220, 30, _("Replace"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->browser = obj = fl_add_browser(FL_SELECT_BROWSER, 80, 70, 220, 150, _("Suggestions"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Spellchecker Options...|#O");
-    fdui->button_options = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 210, 220, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Start spellchecking|#S");
-    fdui->button_start = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 10, 220, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Insert in personal dictionary|#I");
-    fdui->button_insert = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 50, 220, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Ignore word|#g");
-    fdui->button_ignore = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 110, 220, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Accept word in this session|#A");
-    fdui->button_accept = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 80, 220, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Stop spellchecking|#T");
-    fdui->button_stop = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 180, 220, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Close Spellchecker|#C^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 240, 220, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  // xgettext:no-c-format
-  obj = fl_add_box(FL_NO_BOX, 10, 250, 50, 20, _("0 %"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-  // xgettext:no-c-format
-  obj = fl_add_box(FL_NO_BOX, 250, 250, 50, 20, _("100 %"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
-  {
-    char const * const dummy = N_("Replace word|#R");
-    fdui->button_replace = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 140, 220, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->slider = obj = fl_add_slider(FL_HOR_FILL_SLIDER, 10, 230, 290, 20, "");
-    fl_set_object_color(obj, FL_BLUE, FL_COL1);
-    fl_set_object_lsize(obj, 0);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_spellchecker.h b/src/frontends/xforms/form_spellchecker.h
deleted file mode 100644 (file)
index 9edd631..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_spellchecker_h_
-#define FD_form_spellchecker_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_spellchecker {
-       ~FD_form_spellchecker();
-
-       FL_FORM *form;
-       FL_OBJECT *text;
-       FL_OBJECT *input;
-       FL_OBJECT *browser;
-       FL_OBJECT *button_options;
-       FL_OBJECT *button_start;
-       FL_OBJECT *button_insert;
-       FL_OBJECT *button_ignore;
-       FL_OBJECT *button_accept;
-       FL_OBJECT *button_stop;
-       FL_OBJECT *button_close;
-       FL_OBJECT *button_replace;
-       FL_OBJECT *slider;
-};
-
-#endif /* FD_form_spellchecker_h_ */
diff --git a/src/frontends/xforms/form_tabular.C b/src/frontends/xforms/form_tabular.C
deleted file mode 100644 (file)
index 77be5df..0000000
+++ /dev/null
@@ -1,543 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_tabular.h"
-#include "FormTabular.h"
-
-FD_form_tabular::~FD_form_tabular()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_tabular * FormTabular::build_tabular()
-{
-  FL_OBJECT *obj;
-  FD_form_tabular *fdui = new FD_form_tabular;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 510, 325);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 510, 325, "");
-  fdui->tabfolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 0, 0, 505, 250, _("Tabbed folder"));
-    fl_set_object_resize(obj, FL_RESIZE_ALL);
-  {
-    char const * const dummy = N_("Close|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 415, 290, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_tabular_column = obj = fl_add_input(FL_NORMAL_INPUT, 65, 290, 60, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-  fdui->input_tabular_row = obj = fl_add_input(FL_NORMAL_INPUT, 5, 290, 60, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-  fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 5, 255, 500, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_tabular_options::~FD_form_tabular_options()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_tabular_options * FormTabular::build_tabular_options()
-{
-  FL_OBJECT *obj;
-  FD_form_tabular_options *fdui = new FD_form_tabular_options;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 505, 225);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 225, "");
-  {
-    char const * const dummy = N_("Append Column|#A");
-    fdui->button_append_column = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 40, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Delete Column|#O");
-    fdui->button_delete_column = obj = fl_add_button(FL_NORMAL_BUTTON, 140, 40, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Append Row|#p");
-    fdui->button_append_row = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 70, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Delete Row|#w");
-    fdui->button_delete_row = obj = fl_add_button(FL_NORMAL_BUTTON, 140, 70, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Set Borders|#S");
-    fdui->button_set_borders = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 10, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Unset Borders|#U");
-    fdui->button_unset_borders = obj = fl_add_button(FL_NORMAL_BUTTON, 140, 10, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Longtable|#L");
-    fdui->check_longtable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 30, 90, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Rotate 90°|#9");
-    fdui->check_rotate_tabular = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 55, 90, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 280, 20, 120, 75, _("Spec. Table"));
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_column_options::~FD_form_column_options()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_column_options * FormTabular::build_column_options()
-{
-  FL_OBJECT *obj;
-  FD_form_column_options *fdui = new FD_form_column_options;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 505, 225);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 225, "");
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 325, 20, 170, 195, _("Fixed Width"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 20, 170, 105, _("Borders"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 200, 20, 115, 105, _("H. Alignment"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 140, 295, 75, _("Special column"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  {
-    char const * const dummy = N_(" |#W");
-    fdui->input_column_width = obj = fl_add_input(FL_NORMAL_INPUT, 335, 55, 75, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Top|#t");
-    fdui->check_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 45, 25, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Bottom|#b");
-    fdui->check_border_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 75, 25, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_BOTTOM_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Left|#l");
-    fdui->check_border_left = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 65, 60, 25, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Right|#r");
-    fdui->check_border_right = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 105, 60, 25, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Left|#e");
-    fdui->radio_align_left = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 35, 105, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  {
-    char const * const dummy = N_("Right|#i");
-    fdui->radio_align_right = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 85, 105, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Center|#c");
-    fdui->radio_align_center = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 60, 105, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_group();
-
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Top|#p");
-    fdui->radio_valign_top = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 330, 135, 155, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  {
-    char const * const dummy = N_("Center|#n");
-    fdui->radio_valign_center = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 330, 160, 155, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Bottom|#o");
-    fdui->radio_valign_bottom = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 330, 185, 155, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_group();
-
-  {
-    char const * const dummy = N_("LaTeX Argument|#A");
-    fdui->input_special_alignment = obj = fl_add_input(FL_NORMAL_INPUT, 30, 180, 275, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_(" |#L");
-    fdui->choice_value_column_width = obj = fl_add_choice(FL_NORMAL_CHOICE, 415, 55, 75, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_text(FL_NORMAL_TEXT, 335, 110, 155, 25, _("V. Alignment"));
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_cell_options::~FD_form_cell_options()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_cell_options * FormTabular::build_cell_options()
-{
-  FL_OBJECT *obj;
-  FD_form_cell_options *fdui = new FD_form_cell_options;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 505, 225);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 225, "");
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 135, 140, 80, _("Special Cell"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 160, 135, 175, 80, _("Special Multicolumn"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 345, 20, 150, 195, _("Fixed Width"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 190, 20, 145, 100, _("H. Alignment"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 20, 170, 100, _("Borders"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  {
-    char const * const dummy = N_("Top|#t");
-    fdui->check_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 75, 45, 25, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Bottom|#b");
-    fdui->check_border_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 75, 75, 25, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_BOTTOM_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Left|#l");
-    fdui->check_border_left = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 55, 60, 25, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Right|#r");
-    fdui->check_border_right = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 95, 60, 25, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Left|#e");
-    fdui->radio_align_left = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 35, 110, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  {
-    char const * const dummy = N_("Right|#i");
-    fdui->radio_align_right = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 85, 115, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Center|#c");
-    fdui->radio_align_center = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 60, 115, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_group();
-
- fl_bgn_group();
-  {
-    char const * const dummy = N_("Top|#p");
-    fdui->radio_valign_top = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 135, 125, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-    fl_set_button(obj, 1);
-  {
-    char const * const dummy = N_("Center|#n");
-    fdui->radio_valign_center = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 160, 125, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Bottom|#o");
-    fdui->radio_valign_bottom = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 185, 125, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_group();
-
-  {
-    char const * const dummy = N_(" |#W");
-    fdui->input_mcolumn_width = obj = fl_add_input(FL_NORMAL_INPUT, 350, 50, 75, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("LaTeX Argument|#A");
-    fdui->input_special_multialign = obj = fl_add_input(FL_NORMAL_INPUT, 165, 180, 165, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Multicolumn|#M");
-    fdui->check_multicolumn = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 140, 130, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Use Minipage|#s");
-    fdui->check_useminipage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 165, 130, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Rotate 90°|#9");
-    fdui->check_rotate_cell = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 190, 130, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_(" |#L");
-    fdui->choice_value_mcolumn_width = obj = fl_add_choice(FL_NORMAL_CHOICE, 430, 50, 60, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_text(FL_NORMAL_TEXT, 350, 110, 135, 25, _("V. Alignment"));
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_longtable_options::~FD_form_longtable_options()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_longtable_options * FormTabular::build_longtable_options()
-{
-  FL_OBJECT *obj;
-  FD_form_longtable_options *fdui = new FD_form_longtable_options;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 505, 225);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 225, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 15, 485, 30, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 150, 485, 35, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 115, 485, 35, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 80, 485, 35, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 45, 485, 35, "");
-  fdui->check_lt_firsthead = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 85, 60, 25, _("On"));
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->check_lt_head = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 50, 60, 25, _("On"));
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->check_lt_foot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 120, 60, 25, _("On"));
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->check_lt_lastfoot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 155, 60, 25, _("On"));
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Page break on the current row|#B");
-    fdui->check_lt_newpage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 190, 245, 25, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->check_head_2border_above = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 205, 50, 85, 25, _("Double"));
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->check_head_2border_below = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 300, 50, 75, 25, _("Double"));
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_text(FL_NORMAL_TEXT, 15, 50, 120, 25, _("Header"));
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_text(FL_NORMAL_TEXT, 15, 85, 120, 25, _("First Header"));
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_text(FL_NORMAL_TEXT, 15, 120, 120, 25, _("Footer"));
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_text(FL_NORMAL_TEXT, 15, 155, 120, 25, _("Last Footer"));
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  fdui->check_1head_2border_above = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 205, 85, 85, 25, _("Double"));
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->check_foot_2border_above = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 205, 120, 85, 25, _("Double"));
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->check_lastfoot_2border_above = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 205, 155, 85, 25, _("Double"));
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->check_1head_2border_below = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 300, 85, 75, 25, _("Double"));
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->check_foot_2border_below = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 300, 120, 75, 25, _("Double"));
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->check_lastfoot_2border_below = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 300, 155, 75, 25, _("Double"));
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->check_1head_empty = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 390, 85, 75, 25, _("Is Empty"));
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->check_lastfoot_empty = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 390, 155, 75, 25, _("Is Empty"));
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_text(FL_NORMAL_TEXT, 205, 20, 85, 20, _("Border Above"));
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_text(FL_NORMAL_TEXT, 300, 20, 85, 20, _("Border Below"));
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_text(FL_NORMAL_TEXT, 390, 20, 85, 20, _("Contents"));
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_text(FL_NORMAL_TEXT, 135, 20, 60, 20, _("Status"));
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_tabular.h b/src/frontends/xforms/form_tabular.h
deleted file mode 100644 (file)
index 7b3bdd3..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_tabular_h_
-#define FD_form_tabular_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_tabular {
-       ~FD_form_tabular();
-
-       FL_FORM *form;
-       FL_OBJECT *tabfolder;
-       FL_OBJECT *button_close;
-       FL_OBJECT *input_tabular_column;
-       FL_OBJECT *input_tabular_row;
-       FL_OBJECT *text_warning;
-};
-struct FD_form_tabular_options {
-       ~FD_form_tabular_options();
-
-       FL_FORM *form;
-       FL_OBJECT *button_append_column;
-       FL_OBJECT *button_delete_column;
-       FL_OBJECT *button_append_row;
-       FL_OBJECT *button_delete_row;
-       FL_OBJECT *button_set_borders;
-       FL_OBJECT *button_unset_borders;
-       FL_OBJECT *check_longtable;
-       FL_OBJECT *check_rotate_tabular;
-};
-struct FD_form_column_options {
-       ~FD_form_column_options();
-
-       FL_FORM *form;
-       FL_OBJECT *input_column_width;
-       FL_OBJECT *check_border_top;
-       FL_OBJECT *check_border_bottom;
-       FL_OBJECT *check_border_left;
-       FL_OBJECT *check_border_right;
-       FL_OBJECT *radio_align_left;
-       FL_OBJECT *radio_align_right;
-       FL_OBJECT *radio_align_center;
-       FL_OBJECT *radio_valign_top;
-       FL_OBJECT *radio_valign_center;
-       FL_OBJECT *radio_valign_bottom;
-       FL_OBJECT *input_special_alignment;
-       FL_OBJECT *choice_value_column_width;
-};
-struct FD_form_cell_options {
-       ~FD_form_cell_options();
-
-       FL_FORM *form;
-       FL_OBJECT *check_border_top;
-       FL_OBJECT *check_border_bottom;
-       FL_OBJECT *check_border_left;
-       FL_OBJECT *check_border_right;
-       FL_OBJECT *radio_align_left;
-       FL_OBJECT *radio_align_right;
-       FL_OBJECT *radio_align_center;
-       FL_OBJECT *radio_valign_top;
-       FL_OBJECT *radio_valign_center;
-       FL_OBJECT *radio_valign_bottom;
-       FL_OBJECT *input_mcolumn_width;
-       FL_OBJECT *input_special_multialign;
-       FL_OBJECT *check_multicolumn;
-       FL_OBJECT *check_useminipage;
-       FL_OBJECT *check_rotate_cell;
-       FL_OBJECT *choice_value_mcolumn_width;
-};
-struct FD_form_longtable_options {
-       ~FD_form_longtable_options();
-
-       FL_FORM *form;
-       FL_OBJECT *check_lt_firsthead;
-       FL_OBJECT *check_lt_head;
-       FL_OBJECT *check_lt_foot;
-       FL_OBJECT *check_lt_lastfoot;
-       FL_OBJECT *check_lt_newpage;
-       FL_OBJECT *check_head_2border_above;
-       FL_OBJECT *check_head_2border_below;
-       FL_OBJECT *check_1head_2border_above;
-       FL_OBJECT *check_foot_2border_above;
-       FL_OBJECT *check_lastfoot_2border_above;
-       FL_OBJECT *check_1head_2border_below;
-       FL_OBJECT *check_foot_2border_below;
-       FL_OBJECT *check_lastfoot_2border_below;
-       FL_OBJECT *check_1head_empty;
-       FL_OBJECT *check_lastfoot_empty;
-};
-
-#endif /* FD_form_tabular_h_ */
diff --git a/src/frontends/xforms/form_tabular_create.C b/src/frontends/xforms/form_tabular_create.C
deleted file mode 100644 (file)
index 6b75af6..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_tabular_create.h"
-#include "FormTabularCreate.h"
-
-FD_form_tabular_create::~FD_form_tabular_create()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_tabular_create * FormTabularCreate::build_tabular_create()
-{
-  FL_OBJECT *obj;
-  FD_form_tabular_create *fdui = new FD_form_tabular_create;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 310, 130);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 310, 130, "");
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 10, 90, 90, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 90, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 210, 90, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  fdui->slider_columns = obj = fl_add_valslider(FL_HOR_SLIDER, 80, 50, 220, 30, _("Columns"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-  fdui->slider_rows = obj = fl_add_valslider(FL_HOR_SLIDER, 80, 10, 220, 30, _("Rows"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_tabular_create.h b/src/frontends/xforms/form_tabular_create.h
deleted file mode 100644 (file)
index 548c74d..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_tabular_create_h_
-#define FD_form_tabular_create_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_tabular_create {
-       ~FD_form_tabular_create();
-
-       FL_FORM *form;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_close;
-       FL_OBJECT *slider_columns;
-       FL_OBJECT *slider_rows;
-};
-
-#endif /* FD_form_tabular_create_h_ */
diff --git a/src/frontends/xforms/form_texinfo.C b/src/frontends/xforms/form_texinfo.C
deleted file mode 100644 (file)
index c7db533..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_texinfo.h"
-#include "FormTexinfo.h"
-
-FD_form_texinfo::~FD_form_texinfo()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_texinfo * FormTexinfo::build_texinfo()
-{
-  FL_OBJECT *obj;
-  FD_form_texinfo *fdui = new FD_form_texinfo;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 513, 312);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 513, 312, "");
-    fl_set_object_lstyle(obj, FL_FIXED_STYLE);
-  fdui->browser = obj = fl_add_browser(FL_HOLD_BROWSER, 15, 12, 324, 241, "");
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_lstyle(obj, FL_FIXED_STYLE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
-    fl_set_object_resize(obj, FL_RESIZE_NONE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 345, 15, 155, 100, "");
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
- fl_bgn_group();
-  {
-    char const * const dummy = N_("LaTeX Classes|#C");
-    fdui->radio_cls = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 20, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-    fl_set_button(obj, 1);
-  {
-    char const * const dummy = N_("LaTeX Styles|#S");
-    fdui->radio_sty = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 50, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("BibTeX Styles|#B");
-    fdui->radio_bst = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 350, 80, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_group();
-
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 345, 122, 155, 128, "");
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-  {
-    char const * const dummy = N_("Rescan|#R");
-    fdui->button_rescan = obj = fl_add_button(FL_NORMAL_BUTTON, 355, 138, 135, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 2);
-  {
-    char const * const dummy = N_("View|#V");
-    fdui->button_view = obj = fl_add_button(FL_NORMAL_BUTTON, 355, 173, 135, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 2);
-  {
-    char const * const dummy = N_("Show Path|#P");
-    fdui->check_fullpath = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 350, 209, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 2);
-  {
-    char const * const dummy = N_("Run Texhash|#T");
-    fdui->button_texhash = obj = fl_add_button(FL_NORMAL_BUTTON, 14, 270, 131, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Close|^[^M");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 409, 270, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_texinfo.h b/src/frontends/xforms/form_texinfo.h
deleted file mode 100644 (file)
index d1996ee..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_texinfo_h_
-#define FD_form_texinfo_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_texinfo {
-       ~FD_form_texinfo();
-
-       FL_FORM *form;
-       FL_OBJECT *browser;
-       FL_OBJECT *radio_cls;
-       FL_OBJECT *radio_sty;
-       FL_OBJECT *radio_bst;
-       FL_OBJECT *button_rescan;
-       FL_OBJECT *button_view;
-       FL_OBJECT *check_fullpath;
-       FL_OBJECT *button_texhash;
-       FL_OBJECT *button_close;
-};
-
-#endif /* FD_form_texinfo_h_ */
diff --git a/src/frontends/xforms/form_thesaurus.C b/src/frontends/xforms/form_thesaurus.C
deleted file mode 100644 (file)
index e09d99f..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_thesaurus.h"
-#include "FormThesaurus.h"
-
-FD_form_thesaurus::~FD_form_thesaurus()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_thesaurus * FormThesaurus::build_thesaurus()
-{
-  FL_OBJECT *obj;
-  FD_form_thesaurus *fdui = new FD_form_thesaurus;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 465, 450);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 465, 450, "");
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthWest);
-  {
-    char const * const dummy = N_("Replace|^R");
-    fdui->button_replace = obj = fl_add_button(FL_NORMAL_BUTTON, 355, 375, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthWest);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Close|^C");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 180, 410, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthWest);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  fdui->input_entry = obj = fl_add_input(FL_NORMAL_INPUT, 60, 10, 315, 25, _("Entry : "));
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthWest);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->input_replace = obj = fl_add_input(FL_NORMAL_INPUT, 75, 375, 260, 30, _("Selection :"));
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthWest);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Meanings|#M");
-    fdui->browser_meanings = obj = fl_add_browser(FL_SELECT_BROWSER, 15, 50, 440, 305, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_thesaurus.h b/src/frontends/xforms/form_thesaurus.h
deleted file mode 100644 (file)
index d1ae364..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_thesaurus_h_
-#define FD_form_thesaurus_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_thesaurus {
-       ~FD_form_thesaurus();
-
-       FL_FORM *form;
-       FL_OBJECT *button_replace;
-       FL_OBJECT *button_close;
-       FL_OBJECT *input_entry;
-       FL_OBJECT *input_replace;
-       FL_OBJECT *browser_meanings;
-};
-
-#endif /* FD_form_thesaurus_h_ */
diff --git a/src/frontends/xforms/form_toc.C b/src/frontends/xforms/form_toc.C
deleted file mode 100644 (file)
index 6118d0e..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_toc.h"
-#include "FormToc.h"
-
-FD_form_toc::~FD_form_toc()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_toc * FormToc::build_toc()
-{
-  FL_OBJECT *obj;
-  FD_form_toc *fdui = new FD_form_toc;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 420, 340);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 420, 340, "");
-  fdui->browser_toc = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 10, 400, 280, "");
-    fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Update|#U");
-    fdui->button_update = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 300, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Type|#T");
-    fdui->choice_toc_type = obj = fl_add_choice(FL_NORMAL_CHOICE, 60, 300, 130, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Close|^[^M");
-    fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 310, 300, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_toc.h b/src/frontends/xforms/form_toc.h
deleted file mode 100644 (file)
index 12ddaba..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_toc_h_
-#define FD_form_toc_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_toc {
-       ~FD_form_toc();
-
-       FL_FORM *form;
-       FL_OBJECT *browser_toc;
-       FL_OBJECT *button_update;
-       FL_OBJECT *choice_toc_type;
-       FL_OBJECT *button_close;
-};
-
-#endif /* FD_form_toc_h_ */
diff --git a/src/frontends/xforms/form_url.C b/src/frontends/xforms/form_url.C
deleted file mode 100644 (file)
index b47b9bc..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-#include <config.h>
-#include "xforms_helpers.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <stdlib.h>
-#include "form_url.h"
-#include "FormUrl.h"
-
-FD_form_url::~FD_form_url()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_url * FormUrl::build_url()
-{
-  FL_OBJECT *obj;
-  FD_form_url *fdui = new FD_form_url;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 520, 170);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 520, 170, "");
-  {
-    char const * const dummy = N_("URL|#U");
-    fdui->input_url = obj = fl_add_input(FL_NORMAL_INPUT, 70, 50, 440, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Name|#N");
-    fdui->input_name = obj = fl_add_input(FL_NORMAL_INPUT, 70, 90, 440, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("HTML type|#H");
-    fdui->check_html = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 480, 10, 30, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 130, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 190, 130, 100, 30, _("OK"));
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  {
-    char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 300, 130, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  {
-    char const * const dummy = N_("Restore|#R");
-    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 130, 100, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-    fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/frontends/xforms/form_url.h b/src/frontends/xforms/form_url.h
deleted file mode 100644 (file)
index 7776e2e..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
-/** Header file generated with fdesign **/
-
-#ifndef FD_form_url_h_
-#define FD_form_url_h_
-
-/** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
-
-
-/**** Forms and Objects ****/
-struct FD_form_url {
-       ~FD_form_url();
-
-       FL_FORM *form;
-       FL_OBJECT *input_url;
-       FL_OBJECT *input_name;
-       FL_OBJECT *check_html;
-       FL_OBJECT *button_close;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_restore;
-};
-
-#endif /* FD_form_url_h_ */
index 07db02d2885777fe6337dc0e6914258391fc2eea..8d5d6cfade1ea79fdacd7427017e0aba89e98f18 100644 (file)
@@ -1,17 +1,21 @@
 include $(top_srcdir)/config/common.am
 
 include $(top_srcdir)/config/common.am
 
-EXTRA_DIST = $(SRCS) form_document.C.patch form_ert.C.patch form_filedialog.C.patch fdfixc.sed fdfixh.sed fdfix.sh makefile.old README
+EXTRA_DIST = fdfixc.sed fdfixh.sed fdfix.sh README
 
 
-updatesrc:
-       @echo Note:
-       @echo   To update the C files generated from XForms fd files
-       @echo   You should go to the source dir and do a
-       @echo        make -f makefile.old updatesrc
+noinst_LTLIBRARIES = libfdesign.la
+
+# For (forms_fwd.h, forms_gettext.h) and LString.h, respectively.
+INCLUDES = -I$(srcdir)/..  -I$(top_srcdir)/src
+
+# These are used to generate the .[Ch] files from the .fd ones.
+# It would be nice if we could make the .Ch files dependent on the fdfix files.
+SHELL = /bin/sh
+SCRIPT = $(srcdir)/fdfix.sh
+SUFFIXES = .fd
 
 SRCS =  form_aboutlyx.fd \
        form_bibitem.fd \
        form_bibtex.fd \
 
 SRCS =  form_aboutlyx.fd \
        form_bibitem.fd \
        form_bibtex.fd \
-       form_bibtex.fd \
        form_browser.fd \
        form_character.fd \
        form_citation.fd \
        form_browser.fd \
        form_character.fd \
        form_citation.fd \
@@ -46,3 +50,17 @@ SRCS =  form_aboutlyx.fd \
        form_thesaurus.fd \
        form_toc.fd \
        form_url.fd
        form_thesaurus.fd \
        form_toc.fd \
        form_url.fd
+
+libfdesign_la_SOURCES = $(SRCS:.fd=.C) $(SRCS:.fd=.h)
+
+libfdesign.la: $(libfdesign_la_OBJECTS) $(libfdesign_la_DEPENDENCIES)
+
+.fd.C:
+       $(SHELL) $(SCRIPT) $<
+
+clean-local:
+       rm -f *.[ChH] *.orig \
+       rm -f $(srcdir)/*.[hc] $(srcdir)/*.bak
+
+distclean-local:
+       rm -f $(srcdir)/*.orig $(srcdir)/*.rej $(srcdir)/*~
index b9cf5985d2e1b9c084797531b85cdba937ea3ebe..4bbbf0922fd3c3c99fe1a9ce66dc157885ceb2af 100644 (file)
@@ -5,16 +5,22 @@ NOTE: An exception to the above is any tabbed form which
       xforms requires multiple forms to create.  In that case
       the group of forms constitutes one gui form.
 
       xforms requires multiple forms to create.  In that case
       the group of forms constitutes one gui form.
 
-All forms should be named form_xxx and saved into a file by the same name.
+* All forms should be named form_xxx and saved into a file of the same name.
 For example, the copyright notice is called form_copyright and is stored in
 For example, the copyright notice is called form_copyright and is stored in
-form_copyright.fd.  Its used by class FormCopyright.  If you match this pattern
-the fdfix.sh script will do all the conversions for you.  That'll make
-updating the source incredibly easy.
+form_copyright.fd.
+Tabbed folders should be named form_xxx_yyy.
+For example, the file folder in the graphics dialog has the identifier
+form_graphics_file.
 
 
-Name all buttons and other form components that are likely to cause a callback.
-The names should be of the form:  button_ok, radio_group_item and so on.
+If you match this pattern, the fdfix.sh script will be able to manipulate
+the generated .c and .h files to produce the .C and .h files used by LyX. A form
+called form_xxx will result in a struct FD_xxx.
 
 
-Being more explicit (Angus, 12 Mar 2002):
+* Name all buttons and other form components that are likely to cause a
+callback. The names should be of the form:  button_ok, radio_group_item and
+so on.
+
+Being more explicit:
        class             | prefix
        ------------------+-------
        FL_BROWSER        | browser
        class             | prefix
        ------------------+-------
        FL_BROWSER        | browser
@@ -42,51 +48,13 @@ scripts. At the moment this applies only to bmtable:
 Enter the full name of the callback eg.:
         C_FormBaseOkCB
 
 Enter the full name of the callback eg.:
         C_FormBaseOkCB
 
-That is, they all have the same format: C_##FormName##CallbackName.
-Your code will then need to use the appropriate macro to setup this C callback
-function which will in turn call the corresponding static class member function
-of the form FormName::CallbackName.  You should be able to copy the macro
-entries from a similar dialog for reuse without having to change anything.
-
-The name of the wrapped dialog will be dialog_ eg.
-        typedef struct {
-        ...
-        } FD_form_copyright;
-
-        FD_form_copyright * dialog_;
-
-Angus Leeming has modified the scripts to forward declare FD_form_xxxx thereby
-removing one inter-file dependency and removing the struct declaration from the
-FormXxxx.h file which was the previous practice.
-
-If you follow these simple rules then the generated code for create_form_form_xxxx
-can will be converted as the FormXxxx::build_xxxx method without any extra 
-editting to make it work.  Every forms implementation will thereby follow a very
-simple pattern and make it easier to maintain.
-
-All the forms are rebuild by running `make test`.  This will generate all
-the form_xxxx.[Ch] files. You should run `make updatesrc` to install them in the
-parent directory.  `make updatesrc` will also regenerate all the files for you
-so you don't have to do the `make test` step unless, for example, you are
-testing the conversion scripts. The files fdfix.sh, fdfixc.sed, fdfixh.sed and
-makefile contain the necessary smarts to convert the generated code into
-something that can be used directly in the LyX codebase.
-
-The easiest way to fit into the pattern is to copy an existing dialogs
-implementation and adjust it to suit, keeping the variable names the same.
-Take a look at the existing .fd files as well to see what is needed in there
-in the way of callback names and widget names.
-
-In addition a lot of work can be saved by using the code that has already been
-written in the "lyx" module of the LyX CVS repository. This is where the old
-development branch is kept.  The code there will need to be modified slightly
-to meet these new guidelines.  In addition, an earlier generation signalling
-system was used in that code. A conversion script called gtkmmconvert2 is 
-available from the gtk-- distribution.  It updates all the signals to use
-libsigc++.
-
-Don't reinvent the wheel.  There's 18 months worth of code in the "lyx" cvs
-module that you should at least use as a guide even if you don't actually make
-direct use of it.
+If you follow these simple rules then you will generate code for functions
+build_xxx that will need no further editing to make them work. For example,
+form_graphics.h contains the struct declarations and build methods, so:
 
 
-Allan. (ARRae)
+extern FD_graphics * build_graphics();
+extern FD_graphics_file * build_graphics_file();
+extern FD_graphics_size * build_graphics_size();
+extern FD_graphics_bbox * build_graphics_bbox();
+extern FD_graphics_special * build_graphics_special();
+extern FD_graphics_lyxview * build_graphics_lyxview();
index 217b88f9c81cf398c8fccfacd247fcf660f74058..6a4d143dc8fb924c9d531867b2860ae268a52541 100644 (file)
-#! /bin/sh
+ #! /bin/sh
 #
 #
-# NOTE: This is NOT the same fdfix.sh as in ${top_srcdir}/forms
-#       It is a modified version to suit use for gui-indep.
+# \file fdfix.sh
+# Copyright 2002 the LyX Team
+# Read the file COPYING
 #
 #
-
+# \author Angus Leeming, leeming@lyx.org
+#
+# This shell script takes the dialog created with fdesign and generates the
+# .C and .h files used by LyX from it.
+# Note that the REAL magic is to be found in the sed scripts fdfixc.sed and
+# fdfixh.sed used by this shell script.
+
+INTRO_MESSAGE ()
+{
+DATE=`date +"%Y"`
+
+# Note that we can't create a variable containing this and then
+# echo it across because some machines require -e to recognize \n et al.
+# Other machines, of course output -e, it not being an option they
+# recognise ;-)
+
+# Set ${OUTPUT_FILE} to ${HOUT} or ${COUT} as appropriate
+cat - > ${OUTPUT_FILE} <<EOF
+// File generated by fdesign from ${FDFILE}
+// and modified by fdfix.sh for use by LyX.
+
+// WARNING! All changes made to this file will be lost!
+
+// Copyright $DATE the LyX Team
+// Read the file COPYING
+EOF
+}
+
+#===============
+# Initial checks
 if [ ! -f $1 ]; then
     echo "Input file does not exist. Cannot continue"
     exit 1
 fi
 
 if [ ! -f $1 ]; then
     echo "Input file does not exist. Cannot continue"
     exit 1
 fi
 
-FDESIGN=fdesign
-
-# names of the files generated by fdesign and by running the sed scripts
-BASE=`basename $1 .fd`
+DIRNAME=`dirname $1`
+BASENAME=`basename $1 .fd`
 
 
-if [ $1 = $BASE ]; then
+if [ $1 = ${BASENAME} ]; then
     echo "Input file is not a .fd file. Cannot continue"
     exit 1
 fi
 
     echo "Input file is not a .fd file. Cannot continue"
     exit 1
 fi
 
-CIN=$BASE.c
-COUT=$BASE.C
-HIN=$BASE.h
-HOUT=$BASE.H
-
-# Ascertain the class name from the name of the file
-# eg form_my_new_dialog -> FormMyNewDialog
-CLASSNAME=""
-SECTION="start"
-i=1
-while :
-do
-    SECTION=`echo $BASE | cut -d_ -f$i`
-    i=`expr $i + 1 `
-
-    if [ $SECTION ]
-    then
-       FIRST=`echo $SECTION | cut -c1 | tr a-z A-Z`
-       SECOND=`echo $SECTION | cut -c2-`
-       CLASSNAME=$CLASSNAME$FIRST$SECOND
-    else
-       break
-    fi
-done
-
-# Create .c and .h files
-$FDESIGN -convert $1
-FDFIXH=fdfixh.sed
-FDFIXC=fdfixc.sed
-FDFIXC_MOD=fdfixc_modified.sed
-
-# Modify .h file for use by LyX
-echo "// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext" > $HOUT
-sed -f $FDFIXH < $HIN >> $HOUT
+#===================================
+# Create the initial .c and .h files
+FDESIGN=fdesign
+FDFILE=${BASENAME}.fd
+(cd ${DIRNAME}; ${FDESIGN} -convert ${FDFILE})
+
+#==================================
+# Modify the .h file for use by LyX
+HIN=${DIRNAME}/${BASENAME}.h
+HPATCH=${DIRNAME}/${BASENAME}.h.patch
+HOUT=${BASENAME}.H
+
+FDFIXH=${DIRNAME}/fdfixh.sed
+
+OUTPUT_FILE=${HOUT}
+INTRO_MESSAGE
+
+sed -f $FDFIXH < $HIN >> ${HOUT}
 
 # Patch the .h file if a patch exists
 
 # Patch the .h file if a patch exists
-if [ -f "$HOUT.patch" ] ; then
-    echo "Patching $HOUT with $HOUT.patch"
-    patch -s $HOUT < $HOUT.patch
+if [ -f "${HPATCH}" ] ; then
+    echo "Patching ${HOUT} with ${HPATCH}"
+    patch -s ${HOUT} < ${HPATCH}
 fi
 
 fi
 
-# Modify the .c file sed-script
-# (Quicker to modify the sed script than the .c file!)
-sed -e "s/CLASSNAME/$CLASSNAME/" < $FDFIXC > $FDFIXC_MOD
+# Clean up, to leave the finished .h file
+rm -f ${HIN}
+mv ${HOUT} ${BASENAME}.h
+
+#==================================
+# Create the .C file for use by LyX
+CIN=${DIRNAME}/${BASENAME}.c
+CPATCH=${DIRNAME}/${BASENAME}.C.patch
+COUT=${BASENAME}.C
+
+FDFIXC=${DIRNAME}/fdfixc.sed
+
+OUTPUT_FILE=${COUT}
+INTRO_MESSAGE
 
 
-# Modify .c file for use by LyX
-echo "// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext" > $COUT
-echo "#include <config.h>" >> $COUT
-echo "#include \"xforms_helpers.h\"" >> $COUT
-echo "#include \"gettext.h\"" >> $COUT
+echo >> ${COUT}
+echo "#include <config.h>" >> ${COUT}
+echo "#include \"forms_gettext.h\"" >> ${COUT}
+echo "#include \"gettext.h\"" >> ${COUT}
 
 
-grep bmtable $CIN > /dev/null
+grep bmtable ${CIN} > /dev/null
 if [ $? -eq 0 ]; then
 if [ $? -eq 0 ]; then
-    echo "#include \"bmtable.h\"" >> $COUT
+    echo "#include \"bmtable.h\"" >> ${COUT}
 fi
 
 fi
 
-echo >> $COUT
+# This is (I hope) a very temporary fudge.
+# FormMathsPanel should be modified in input() to not use the data parameter.
+# Instead, use the FL_OBJECT * parameter.
+# Angus 12 June, 2002.
+grep MM_ ${CIN} > /dev/null
+if [ $? -eq 0 ]; then
+    echo "#include \"MathsSymbols.h\"" >> ${COUT}
+fi
 
 
-sed -f $FDFIXC_MOD < $CIN >> $COUT
+echo >> ${COUT}
+
+sed -f ${FDFIXC} < ${CIN} >> ${COUT}
 
 # Patch the .C file if a patch exists
 
 # Patch the .C file if a patch exists
-if [ -f "$COUT.patch" ] ; then
-    echo "Patching $COUT with $COUT.patch"
-    patch -s $COUT < $COUT.patch
+if [ -f "$CPATCH" ] ; then
+    echo "Patching ${COUT} with $CPATCH"
+    patch -s ${COUT} < $CPATCH
 fi
 
 fi
 
-# Clean up, to leave .C and .h files
-rm -f $CIN $HIN $FDFIXC_MOD
-mv $HOUT $HIN
+# Clean up, to leave the finished .C file
+rm -f ${CIN}
+
+#========================================
index 7b2e21c9dfc40eb2ffbaf213ea2a3ddb74539a02..3bbfd597e7d69fd93bd1d9f151c46b499ed889d7 100644 (file)
@@ -1,4 +1,41 @@
+# \file fdfixc.sed
+# Copyright 2002 the LyX Team
+# Read the file COPYING
+#
+# \author Angus Leeming, leeming@lyx.org and others
+#
+# Use so:
+# sed -f fdfixc.sed < somefile.c > fixedfile.C
+#
+# It contains the instructions that sed requires to manipulate
+# the .c files produced by fdesign into a form usable by LyX
+
+# Delete the fdesign comment
+/generated with fdesign/d
+
+# Rename struct FD_form_xxx as FD_xxx
+s/FD_form_\(.*\)/FD_\1/
+
+# In the struct declaration, we have renamed
+#       FL_FORM * form_xxx;
+# as
+#       FL_FORM * form;
+# so we must do so here too.
+#
+# 1. Rewrite "fdui->form_xxx->fdui = ..." as "fdui->form->fdui = ..."
+s/fdui->form_\([^ ]*\)->fdui =/fdui->form->fdui =/
+
+# 2. Rewrite "fdui->form_xxx = ..." as "fdui->form = ..."
+s/fdui->form_\([^ ]*\) =/fdui->form =/
+
+# 3. Rewrite "fdui->form_xxx->..." as "fdui->form->..."
+s/fdui->form_\([^ ]*\)->/fdui->form->/
+
+# Replace "forms.h" by FORMS_H_LOCATION in the #include directives
+s/#include \"forms\.h\"/#include FORMS_H_LOCATION/
+
 # Create the destructor.
 # Create the destructor.
+# When the wrappers are here, delete from here
 /\(.*\) *create_form_form/{
 h
 s/\(.*\) \*create_form_form[^ ]*/\1::~\1()/p
 /\(.*\) *create_form_form/{
 h
 s/\(.*\) \*create_form_form[^ ]*/\1::~\1()/p
@@ -8,45 +45,32 @@ i\
   if ( form->visible ) fl_hide_form( form );\
   fl_free_form( form );\
 }\
   if ( form->visible ) fl_hide_form( form );\
   fl_free_form( form );\
 }\
-\
 
 }
 x
 }
 
 }
 x
 }
+# When the wrappers are here, delete to here
 
 
-# Rewrite "fdui->form_xxx->fdui = ..." as "fdui->form->fdui = ..."
-s/fdui->form_\([^ ]*\)->fdui =/fdui->form->fdui =/
-
-# Rewrite "fdui->form_xxx = ..." as "fdui->form = ..."
-s/fdui->form_\([^ ]*\) =/fdui->form =/
+# Rename the function create_form_form_xxx(void) as build_xxx()
+s/\(.*\) \*create_form_form_\(.*\)\([(]void[)]\)/\1 * build_\2(void * parent)/
 
 
-# Rewrite "fdui->form_xxx->..." as "fdui->form->..."
-s/fdui->form_\([^ ]*\)->/fdui->form->/
-
-#  Replace "forms.h" by FORMS_H_LOCATION in #include directives. This
-#  macro is defined in config.h and is either <forms.h> or
-#  <X11/forms.h>. 
-s/#include \"forms\.h\"/#include FORMS_H_LOCATION/
+# We use new/delete not malloc/free so change to suit
+s/\(\(FD_[^ ]*\) \*fdui =\).*sizeof(\*fdui))/\1 new \2/
 
 
-#   For all lines containing "#include "form_*"", append a line
-#   containing the header file of the parent class
-/#include \"form_.*\"/a\
-#include \"CLASSNAME.h\"
+# For all lines containing "bmtable",
+# replace "fl_add_button" with "fl_add_bmtable"
+/bmtable/ s/fl_add_button/fl_add_bmtable/
 
 
-#  For all lines containing "fl_" and a string _not_ containing |,
-#  replace the string with _(string)
+# For all lines containing "fl_" and a string _not_ containing |,
+# replace the string with _(string)
 /fl_/ s/".[^|]*"/_(&)/
 
 /fl_/ s/".[^|]*"/_(&)/
 
-# For all lines containing "bmtable", replace "fl_add_button" by
-# "fl_add_bmtable"
-/bmtable/ s/fl_add_button/fl_add_bmtable/
-
 #  For all lines containing "_shortcut" and a string containing |, 
 #  replace the string with scex(_(string))
 /_shortcut/ s/".*[|].*"/scex(_(&))/
 
 #  For all lines containing "_shortcut" and a string containing |, 
 #  replace the string with scex(_(string))
 /_shortcut/ s/".*[|].*"/scex(_(&))/
 
-#  gettext will get confused if the string contains a "%" unless the line is
-#  preceeded immediately by // xgettext:no-c-format
+# gettext will get confused if the string contains a "%" unless the line is
+# preceeded immediately by // xgettext:no-c-format
 /_(".*[%].*")/i\
   // xgettext:no-c-format
 
 /_(".*[%].*")/i\
   // xgettext:no-c-format
 
@@ -59,51 +83,29 @@ s/#include \"forms\.h\"/#include FORMS_H_LOCATION/
 #   fdui->counter_zoom = obj;
 #   {
 #     // xgettext:no-c-format
 #   fdui->counter_zoom = obj;
 #   {
 #     // xgettext:no-c-format
-#     char const * const dummy = N_("Zoom %|#Z");
-#     fdui->counter_zoom = obj = fl_add_counter(FL_NORMAL_COUNTER,1,2,3,4,idex(_(dummy)));
-#     fl_set_button_shortcut(obj,scex(_(dummy)),1);
+#     char const * const dummy = _("Zoom %|#Z");
+#     fdui->counter_zoom = obj = fl_add_counter(FL_NORMAL_COUNTER,1,2,3,4,idex(dummy));
+#     fl_set_button_shortcut(obj,scex(dummy),1);
 #   }
 
 /fl_add/{
 /".*[|].*"/{
 
 #   }
 
 /fl_add/{
 /".*[|].*"/{
 
-  s/fdui\(.*\)"\(.*\)".*/{\
-    char const * const dummy = N_("\2");\
-    fdui\1idex(_(dummy)));\
-    fl_set_button_shortcut(obj,scex(_(dummy)),1);\
-  }/
+  s/fdui\(.*\)"\(.*\)".*/  {\
+      char const * const dummy = _("\2");\
+      fdui\1idex(dummy));\
+      fl_set_button_shortcut(obj,scex(dummy),1);\
+    }/
 
 
-  /N_(".*[%].*");/ s/\(.*\)\(char const [*]\)/\1\/\/ xgettext:no-c-format\
-    \2/
+  /_(".*[%].*");/ s/\(.*\)\(char const [*]\)/\1\/\/ xgettext:no-c-format\
+      \2/
 }
 }
 
 }
 }
 
-# /fl_add/{
-# /".*[|].*"/{
-# 
-#   s/ = fl_add\(.*\)"\(.*\)".*/;\
-#   {\
-#     char const * dummy = N_("\2");\
-#     obj = fl_add\1idex(_(dummy)));\
-#     fl_set_button_shortcut(obj,scex(_(dummy)),1);\
-#   }/
-# 
-#   /N_(".*[%].*");/ s/\(.*\)\(char const [*]\)/\1\/\/ xgettext:no-c-format\
-#     \2/
-# }
-# }
-
-# We use new/delete not malloc/free so change to suit.
-s/\(\(FD_[^ ]*\) \*fdui =\).*sizeof(\*fdui))/\1 new \2/
-
-# Fixup the name of the create_form... function to have a signature
-# matching that of the method it will become.
-s/\(FD_f\([^ _]*\)_\([^ ]*\)\) \*create_form_form[^ ]*/\1 * CLASSNAME::build_\3()/
-
 # We need to store a pointer to the dialog in u_vdata so that the
 # callbacks will work.
 s/\(fdui->form\)\(.*bgn_form.*\)/\1\2\
 # We need to store a pointer to the dialog in u_vdata so that the
 # callbacks will work.
 s/\(fdui->form\)\(.*bgn_form.*\)/\1\2\
-  \1->u_vdata = this;/
+  \1->u_vdata = parent;/
 
 # Someone got busy and put spaces in after commas but didn't allow for the
 # autogeneration of the files so their pretty formatting got lost. Not anymore.
 
 # Someone got busy and put spaces in after commas but didn't allow for the
 # autogeneration of the files so their pretty formatting got lost. Not anymore.
index 024385300fa621dd94979a1a77253c6ac170d30e..8455dd1791fb9b290dac8641224f44d4772e78c7 100644 (file)
+# \file fdfixh.sed
+# Copyright 2002 the LyX Team
+# Read the file COPYING
+#
+# \author Angus Leeming, leeming@lyx.org and others
+#
+# Use so:
 # sed -f fdfixh.sed < somefile.h > fixedfile.h
 #
 # It contains the instructions that sed requires to manipulate
 # sed -f fdfixh.sed < somefile.h > fixedfile.h
 #
 # It contains the instructions that sed requires to manipulate
-# the header files produced by fdesign into a form usable by LyX
+# the .h files produced by fdesign into a form usable by LyX
 
 
-s/\(extern \)\(.*\)/\1 "C" \2/
-#
-#  Replaces lines such as "extern void func(args);"
-#  with "extern "C" void func(args);"
+# Strip multiple blank lines, leaving only one
+/^$/{
+N
+/^\n$/D
+}
 
 
-/create_form_/d
-#
-#  Deletes lines containing "create_form_"
+# Rewrite FD_form_xxx as FD_xxx
+# This is done both for the structs and for the #define bounding the header
+s/\(.*\) FD_form_\(.*\)/\1 FD_\2/
 
 
-s,\(generated with fdesign\)\(.*\)\(\*\*/\),\1 \3,
+# Forward declare FL_FORM and FL_OBJECT
+/#define FD/a\
+\
+#include "forms_fwd.h"
+
+# Delete the fdesign comments
+/Callbacks, globals/d
+/generated with fdesign/d
+/Forms and Objects/d
+
+# Replace lines such as "extern void func(args);"
+# with "extern "C" void func(args);"
+# Note that these should not occur because we should be using signals. See the
+# README file for further information.
+s/\(extern \)\(void \)\(.*\)/\1 "C" \2\3/
+
+# Rename the function create_form_form_xxx(void) as build_xxx(void * parent)
+s/extern \(.*\) create_form_form_\(.*\)\([(]void[)]\)/\1 build_\2(void *)/
+
+# Manipulate the structs
 #
 #
-# Deletes the dated signature so we can rebuild everything as often
-# as we want without silly clashes due to the date.
-
-# Rewrites                     as
-# typedef struct {             struct FD_form_xxx {
-#      FL_FORM *form_xxx;              ~FD_form_xxx();
-#      void *vdata;
-#      char *cdata;                    FL_FORM *form;
-#      long  ldata;                    ...
-#        ...                   }
-# } FD_form_xxx;
+# Rewrite                       as
+# typedef struct {              struct FD_xxx {
+#      FL_FORM *form_xxx;              ~FD_xxx();
+#      void *vdata;                    FL_FORM   * form;
+#      char *cdata;                    FL_OBJECT * some_obj;
+#      long  ldata;                    ...
+#       FL_OBJECT *some_obj;    };
+#       ...
+# } FD_xxx;
 #
 # This is detailed more closely below 
 
 #
 # This is detailed more closely below 
 
-#Manipulate the struct
-#=====================
-/typedef struct {/,/} .*;/{
+# Delete lines containing:
+/typedef struct/d
+/vdata/d
+/cdata/d
+/ldata/d
 
 
-# delete lines containing ...
-       /typedef struct {/d
-       /vdata/d
-       /cdata/d
-       /ldata/d
+# Place all lines containing FL_FORM and FL_OBJECT in the hold space, deleting
+# them from the pattern space.
 
 
-# rewrite "FL_FORM *form_xxx;" as "FL_FORM *form;"
-       s/FL_FORM \(.*\);/FL_FORM *form;/
+# For all lines containing FL_FORM...
+/FL_FORM/{
 
 
-# copy remaining lines into the hold space
-       H
+# Rewrite "FL_FORM *form_xxx;" as "FL_FORM   * form;
+# Note that the spaces before FL_FORM are replaced with a <tab>
+s/\(.*\)FL_FORM \(.*\)/        FL_FORM   * form;/
 
 
-# rewrite "} someStruct;" as   "struct someStruct {"    and print
-#                              "     ~someStruct();"
-       /} \(.*\);/{
-               s/} \(.*\);/struct \1 {/p
-               s/struct \(.*\) {/      ~\1();/p
-       }
+# We know that FL_FORM comes before any FL_OBJECT, so can initialise
+# the hold space with it.
+h
+d
 
 
-# delete line from pattern space
-       d
 }
 }
-# swap the hold space back into the pattern space and...
-/^$/x
 
 
-# rewrite "} someStruct;" as "};"
-s/} \(.*\);/};/
+# For all lines containing FL_OBJECT and not containing extern...
+/FL_OBJECT/{
+/extern/!{
+
+# perform a little pretty formatting
+s/\(.*\)FL_OBJECT \([*]\)\(.*\)/       FL_OBJECT * \3/
+
+# append to the hold space
+H
+d
+
+}
+}
+
+# The struct is ended by "} FD_xxx;", so now's the time to paste back the
+# contents of the hold space.
+/} FD_/{
+# 1. Insert an empty line.
+i\
+
+# 2. Rewrite "} FD_xxx;" as   "struct FD_xxx {" and append a d-tor.
+s/} \(.*\);/struct \1 {/p
+# When the wrappers are here, delete this line and the p-print command above
+/struct/s/struct \(.*\) {/     ~\1();/
+
+# 3. Paste the contents of the hold space beneath it
+G
+
+# 4. Close the struct
+a\
+};
+}
index 19f99f65c09863eefea00216b0327631f3f54797..d212e924827dff4c68eb4fd8611c4023fcaa38e2 100644 (file)
@@ -67,7 +67,7 @@ callback:
 argument: 
 
 =============== FORM ===============
 argument: 
 
 =============== FORM ===============
-Name: form_tab_version
+Name: form_aboutlyx_version
 Width: 430
 Height: 310
 Number of Objects: 3
 Width: 430
 Height: 310
 Number of Objects: 3
@@ -127,7 +127,7 @@ callback:
 argument: 
 
 =============== FORM ===============
 argument: 
 
 =============== FORM ===============
-Name: form_tab_credits
+Name: form_aboutlyx_credits
 Width: 430
 Height: 310
 Number of Objects: 2
 Width: 430
 Height: 310
 Number of Objects: 2
@@ -169,7 +169,7 @@ callback: C_FormBaseInputCB
 argument: 0
 
 =============== FORM ===============
 argument: 0
 
 =============== FORM ===============
-Name: form_tab_license
+Name: form_aboutlyx_license
 Width: 430
 Height: 310
 Number of Objects: 3
 Width: 430
 Height: 310
 Number of Objects: 3
diff --git a/src/frontends/xforms/forms/form_document.C.patch b/src/frontends/xforms/forms/form_document.C.patch
deleted file mode 100644 (file)
index d8874b1..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
---- form_document.C    Mon Jan  7 09:19:31 2002
-+++ form_document.C.new        Mon Jan  7 09:19:24 2002
-@@ -10,6 +10,8 @@
- #include <stdlib.h>
- #include "form_document.h"
- #include "FormDocument.h"
-+#include "bmtable.h"
-+#include "support/filetools.h"
- FD_form_tabbed_document::~FD_form_tabbed_document()
- {
-@@ -543,10 +545,18 @@
-   fdui->form = fl_bgn_form(FL_NO_BOX, 440, 345);
-   fdui->form->u_vdata = this;
-+  fl_set_border_width(-1);
-   obj = fl_add_box(FL_FLAT_BOX, 0, 0, 440, 345, "");
--  fdui->bmtable_bullet_panel = obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 135, 105, 260, 180, "");
--    fl_set_object_boxtype(obj, FL_NO_BOX);
--    fl_set_pixmapbutton_file(obj, _("/nfs/sinco/source/lyx/lyx-devel/lib/images/psnfss2.xpm"));
-+  fl_set_border_width(-3);
-+  fdui->bmtable_bullet_panel = obj = fl_add_bmtable(1, 135, 105, 260, 180, "");
-+  fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, BULLETBMTABLE);
-+  fl_set_object_lcol(obj, FL_BLUE);
-+  fl_set_object_boxtype(obj, FL_UP_BOX);
-+  fl_set_bmtable_pixmap_file(obj, 6, 6,
-+                           LibFileSearch("images",
-+                                 "standard",
-+                                         "xpm").c_str());
-+  fl_set_border_width(-1);
-   obj = fl_add_frame(FL_ENGRAVED_FRAME, 135, 20, 260, 55, "");
-   {
-     char const * const dummy = N_("Size|#z");
index 0f206dfe8bbe8b87d784343ffd859b6f3169d8ca..0be98eeeb47012b315bd0f3023401170d2bbea38 100644 (file)
@@ -8,7 +8,7 @@ Unit of measure: FL_COORD_PIXEL
 SnapGrid: 5
 
 =============== FORM ===============
 SnapGrid: 5
 
 =============== FORM ===============
-Name: form_tabbed_document
+Name: form_document
 Width: 465
 Height: 500
 Number of Objects: 9
 Width: 465
 Height: 500
 Number of Objects: 9
@@ -65,7 +65,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: button_close
 callback: C_FormBaseDeprecatedCancelCB
 gravity: FL_NoGravity FL_NoGravity
 name: button_close
 callback: C_FormBaseDeprecatedCancelCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_BUTTON
 
 --------------------
 class: FL_BUTTON
@@ -83,7 +83,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: button_apply
 callback: C_FormBaseDeprecatedApplyCB
 gravity: FL_NoGravity FL_NoGravity
 name: button_apply
 callback: C_FormBaseDeprecatedApplyCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_BUTTON
 
 --------------------
 class: FL_BUTTON
@@ -101,7 +101,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: button_ok
 callback: C_FormBaseDeprecatedOKCB
 gravity: FL_NoGravity FL_NoGravity
 name: button_ok
 callback: C_FormBaseDeprecatedOKCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_TEXT
 
 --------------------
 class: FL_TEXT
@@ -137,7 +137,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: button_restore
 callback: C_FormBaseDeprecatedRestoreCB
 gravity: FL_NoGravity FL_NoGravity
 name: button_restore
 callback: C_FormBaseDeprecatedRestoreCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_BUTTON
 
 --------------------
 class: FL_BUTTON
@@ -155,7 +155,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: button_save_defaults
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: button_save_defaults
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_BUTTON
 
 --------------------
 class: FL_BUTTON
@@ -173,10 +173,10 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: button_reset_defaults
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: button_reset_defaults
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 =============== FORM ===============
 
 =============== FORM ===============
-Name: form_doc_paper
+Name: form_document_paper
 Width: 440
 Height: 345
 Number of Objects: 29
 Width: 440
 Height: 345
 Number of Objects: 29
@@ -233,7 +233,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_papersize
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_papersize
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_INPUT
 
 --------------------
 class: FL_INPUT
@@ -251,7 +251,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: input_custom_width
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: input_custom_width
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -269,7 +269,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_custom_width_units
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_custom_width_units
 callback: C_FormBaseDeprecatedInputCB
-argument: 0
+argument: 
 
 --------------------
 class: FL_INPUT
 
 --------------------
 class: FL_INPUT
@@ -287,7 +287,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: input_custom_height
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: input_custom_height
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -305,7 +305,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_custom_height_units
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_custom_height_units
 callback: C_FormBaseDeprecatedInputCB
-argument: 0
+argument: 
 
 --------------------
 class: FL_LABELFRAME
 
 --------------------
 class: FL_LABELFRAME
@@ -359,7 +359,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: radio_portrait
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_portrait
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_ROUND3DBUTTON
 
 --------------------
 class: FL_ROUND3DBUTTON
@@ -377,7 +377,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: radio_landscape
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_landscape
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_END_GROUP
 
 --------------------
 class: FL_END_GROUP
@@ -431,7 +431,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: check_use_geometry
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: check_use_geometry
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -449,7 +449,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_paperpackage
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_paperpackage
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_INPUT
 
 --------------------
 class: FL_INPUT
@@ -467,7 +467,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: input_top_margin
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: input_top_margin
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -485,7 +485,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_top_margin_units
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_top_margin_units
 callback: C_FormBaseDeprecatedInputCB
-argument: 0
+argument: 
 
 --------------------
 class: FL_INPUT
 
 --------------------
 class: FL_INPUT
@@ -503,7 +503,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: input_bottom_margin
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: input_bottom_margin
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -521,7 +521,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_bottom_margin_units
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_bottom_margin_units
 callback: C_FormBaseDeprecatedInputCB
-argument: 0
+argument: 
 
 --------------------
 class: FL_INPUT
 
 --------------------
 class: FL_INPUT
@@ -539,7 +539,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: input_inner_margin
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: input_inner_margin
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -557,7 +557,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_inner_margin_units
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_inner_margin_units
 callback: C_FormBaseDeprecatedInputCB
-argument: 0
+argument: 
 
 --------------------
 class: FL_INPUT
 
 --------------------
 class: FL_INPUT
@@ -575,7 +575,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: input_outer_margin
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: input_outer_margin
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -593,7 +593,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_outer_margin_units
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_outer_margin_units
 callback: C_FormBaseDeprecatedInputCB
-argument: 0
+argument: 
 
 --------------------
 class: FL_INPUT
 
 --------------------
 class: FL_INPUT
@@ -611,7 +611,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: input_head_height
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: input_head_height
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -629,7 +629,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_head_height_units
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_head_height_units
 callback: C_FormBaseDeprecatedInputCB
-argument: 0
+argument: 
 
 --------------------
 class: FL_INPUT
 
 --------------------
 class: FL_INPUT
@@ -647,7 +647,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: input_head_sep
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: input_head_sep
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -665,7 +665,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_head_sep_units
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_head_sep_units
 callback: C_FormBaseDeprecatedInputCB
-argument: 0
+argument: 
 
 --------------------
 class: FL_INPUT
 
 --------------------
 class: FL_INPUT
@@ -683,7 +683,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: input_foot_skip
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: input_foot_skip
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -701,10 +701,10 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_foot_skip_units
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_foot_skip_units
 callback: C_FormBaseDeprecatedInputCB
-argument: 0
+argument: 
 
 =============== FORM ===============
 
 =============== FORM ===============
-Name: form_doc_class
+Name: form_document_class
 Width: 440
 Height: 345
 Number of Objects: 26
 Width: 440
 Height: 345
 Number of Objects: 26
@@ -797,7 +797,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_doc_fonts
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_doc_fonts
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -815,7 +815,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_doc_fontsize
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_doc_fontsize
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -833,7 +833,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_doc_class
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_doc_class
 callback: C_FormBaseDeprecatedInputCB
-argument: CHECKCHOICECLASS
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -851,7 +851,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_doc_pagestyle
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_doc_pagestyle
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -869,7 +869,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_doc_spacing
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_doc_spacing
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_INPUT
 
 --------------------
 class: FL_INPUT
@@ -887,7 +887,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: input_doc_extra
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: input_doc_extra
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_INPUT
 
 --------------------
 class: FL_INPUT
@@ -905,7 +905,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: input_doc_skip
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: input_doc_skip
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -923,7 +923,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_doc_skip
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_doc_skip
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_BEGIN_GROUP
 
 --------------------
 class: FL_BEGIN_GROUP
@@ -959,7 +959,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: radio_doc_sides_one
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_doc_sides_one
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_ROUND3DBUTTON
 
 --------------------
 class: FL_ROUND3DBUTTON
@@ -977,7 +977,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: radio_doc_sides_two
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_doc_sides_two
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_END_GROUP
 
 --------------------
 class: FL_END_GROUP
@@ -1031,7 +1031,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: radio_doc_columns_one
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_doc_columns_one
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_ROUND3DBUTTON
 
 --------------------
 class: FL_ROUND3DBUTTON
@@ -1049,7 +1049,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: radio_doc_columns_two
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_doc_columns_two
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_END_GROUP
 
 --------------------
 class: FL_END_GROUP
@@ -1103,7 +1103,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: radio_doc_indent
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_doc_indent
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_ROUND3DBUTTON
 
 --------------------
 class: FL_ROUND3DBUTTON
@@ -1121,7 +1121,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: radio_doc_skip
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_doc_skip
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
        value: 1
 
 --------------------
        value: 1
 
 --------------------
@@ -1158,7 +1158,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: input_doc_spacing
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: input_doc_spacing
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -1176,10 +1176,10 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_default_skip_units
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_default_skip_units
 callback: C_FormBaseDeprecatedInputCB
-argument: 0
+argument: 
 
 =============== FORM ===============
 
 =============== FORM ===============
-Name: form_doc_language
+Name: form_document_language
 Width: 440
 Height: 345
 Number of Objects: 9
 Width: 440
 Height: 345
 Number of Objects: 9
@@ -1236,7 +1236,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_inputenc
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_inputenc
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -1254,7 +1254,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_quotes_language
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_quotes_language
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_BEGIN_GROUP
 
 --------------------
 class: FL_BEGIN_GROUP
@@ -1290,7 +1290,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: radio_single
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_single
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_ROUND3DBUTTON
 
 --------------------
 class: FL_ROUND3DBUTTON
@@ -1308,7 +1308,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: radio_double
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_double
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_END_GROUP
 
 --------------------
 class: FL_END_GROUP
@@ -1344,10 +1344,10 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_language
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_language
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 =============== FORM ===============
 
 =============== FORM ===============
-Name: form_doc_options
+Name: form_document_options
 Width: 440
 Height: 345
 Number of Objects: 8
 Width: 440
 Height: 345
 Number of Objects: 8
@@ -1386,7 +1386,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: input_float_placement
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: input_float_placement
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_COUNTER
 
 --------------------
 class: FL_COUNTER
@@ -1404,7 +1404,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: counter_secnumdepth
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: counter_secnumdepth
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_COUNTER
 
 --------------------
 class: FL_COUNTER
@@ -1422,7 +1422,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: counter_tocdepth
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: counter_tocdepth
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -1440,7 +1440,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_postscript_driver
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_postscript_driver
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHECKBUTTON
 
 --------------------
 class: FL_CHECKBUTTON
@@ -1458,7 +1458,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: check_use_amsmath
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: check_use_amsmath
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHECKBUTTON
 
 --------------------
 class: FL_CHECKBUTTON
@@ -1476,7 +1476,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: check_use_natbib
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: check_use_natbib
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUT
+argument: 
 
 --------------------
 class: FL_CHOICE
 
 --------------------
 class: FL_CHOICE
@@ -1494,10 +1494,10 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_citation_format
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_citation_format
 callback: C_FormBaseDeprecatedInputCB
-argument: 0
+argument: 
 
 =============== FORM ===============
 
 =============== FORM ===============
-Name: form_doc_bullet
+Name: form_document_bullet
 Width: 440
 Height: 345
 Number of Objects: 20
 Width: 440
 Height: 345
 Number of Objects: 20
@@ -1574,7 +1574,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: choice_bullet_size
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: choice_bullet_size
 callback: C_FormBaseDeprecatedInputCB
-argument: CHOICEBULLETSIZE
+argument: 
 
 --------------------
 class: FL_INPUT
 
 --------------------
 class: FL_INPUT
@@ -1592,7 +1592,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: input_bullet_latex
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: input_bullet_latex
 callback: C_FormBaseDeprecatedInputCB
-argument: INPUTBULLETLATEX
+argument: 
 
 --------------------
 class: FL_BEGIN_GROUP
 
 --------------------
 class: FL_BEGIN_GROUP
@@ -1628,7 +1628,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_depth_1
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_depth_1
 callback: C_FormBaseDeprecatedInputCB
-argument: BULLETDEPTH1
+argument: 
        value: 1
 
 --------------------
        value: 1
 
 --------------------
@@ -1647,7 +1647,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_depth_2
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_depth_2
 callback: C_FormBaseDeprecatedInputCB
-argument: BULLETDEPTH2
+argument: 
 
 --------------------
 class: FL_ROUND3DBUTTON
 
 --------------------
 class: FL_ROUND3DBUTTON
@@ -1665,7 +1665,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_depth_3
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_depth_3
 callback: C_FormBaseDeprecatedInputCB
-argument: BULLETDEPTH3
+argument: 
 
 --------------------
 class: FL_ROUND3DBUTTON
 
 --------------------
 class: FL_ROUND3DBUTTON
@@ -1683,7 +1683,7 @@ resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_depth_4
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_depth_4
 callback: C_FormBaseDeprecatedInputCB
-argument: BULLETDEPTH4
+argument: 
 
 --------------------
 class: FL_END_GROUP
 
 --------------------
 class: FL_END_GROUP
@@ -1755,7 +1755,7 @@ resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_panel_standard
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_panel_standard
 callback: C_FormBaseDeprecatedInputCB
-argument: BULLETPANEL1
+argument: 
        value: 1
 
 --------------------
        value: 1
 
 --------------------
@@ -1774,7 +1774,7 @@ resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_panel_maths
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_panel_maths
 callback: C_FormBaseDeprecatedInputCB
-argument: BULLETPANEL2
+argument: 
 
 --------------------
 class: FL_ROUND3DBUTTON
 
 --------------------
 class: FL_ROUND3DBUTTON
@@ -1792,7 +1792,7 @@ resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_panel_ding1
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_panel_ding1
 callback: C_FormBaseDeprecatedInputCB
-argument: BULLETPANEL6
+argument: 
 
 --------------------
 class: FL_ROUND3DBUTTON
 
 --------------------
 class: FL_ROUND3DBUTTON
@@ -1810,7 +1810,7 @@ resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_panel_ding2
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_panel_ding2
 callback: C_FormBaseDeprecatedInputCB
-argument: BULLETPANEL3
+argument: 
 
 --------------------
 class: FL_ROUND3DBUTTON
 
 --------------------
 class: FL_ROUND3DBUTTON
@@ -1828,7 +1828,7 @@ resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_panel_ding3
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_panel_ding3
 callback: C_FormBaseDeprecatedInputCB
-argument: BULLETPANEL4
+argument: 
 
 --------------------
 class: FL_ROUND3DBUTTON
 
 --------------------
 class: FL_ROUND3DBUTTON
@@ -1846,7 +1846,7 @@ resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_panel_ding4
 callback: C_FormBaseDeprecatedInputCB
 gravity: FL_NoGravity FL_NoGravity
 name: radio_bullet_panel_ding4
 callback: C_FormBaseDeprecatedInputCB
-argument: BULLETPANEL5
+argument: 
 
 --------------------
 class: FL_END_GROUP
 
 --------------------
 class: FL_END_GROUP
diff --git a/src/frontends/xforms/forms/form_ert.C.patch b/src/frontends/xforms/forms/form_ert.C.patch
deleted file mode 100644 (file)
index b414c0e..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- form_ert.C Mon Aug  6 14:17:17 2001
-+++ ../form_ert.C      Mon Aug  6 14:15:39 2001
-@@ -8,7 +8,7 @@
- #include FORMS_H_LOCATION
- #include <stdlib.h>
- #include "form_ert.h"
--#include "FormErt.h"
-+#include "FormERT.h"
- FD_form_ert::~FD_form_ert()
- {
-@@ -17,7 +17,7 @@
- }
--FD_form_ert * FormErt::build_ert()
-+FD_form_ert * FormERT::build_ert()
- {
-   FL_OBJECT *obj;
-   FD_form_ert *fdui = new FD_form_ert;
diff --git a/src/frontends/xforms/forms/form_filedialog.C.patch b/src/frontends/xforms/forms/form_filedialog.C.patch
deleted file mode 100644 (file)
index 7fc034d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- form_filedialog.C  Fri Mar  9 09:29:35 2001
-+++ .././form_filedialog.C     Thu Mar  8 14:18:08 2001
-@@ -17,7 +17,7 @@
- }
--FD_form_filedialog * FormFiledialog::build_filedialog()
-+FD_form_filedialog * FileDialog::Private::build_filedialog()
- {
-   FL_OBJECT *obj;
-   FD_form_filedialog *fdui = new FD_form_filedialog;
index 4b3942c47ed2430bd50d7d5215b9a80dbb8381a5..09e39a39a749d425c5bef85e175dfec7f592d412 100644 (file)
@@ -140,7 +140,7 @@ callback: C_FormBaseInputCB
 argument: 0
 
 =============== FORM ===============
 argument: 0
 
 =============== FORM ===============
-Name: form_file
+Name: form_graphics_file
 Width: 500
 Height: 245
 Number of Objects: 13
 Width: 500
 Height: 245
 Number of Objects: 13
@@ -380,7 +380,7 @@ callback: C_FormBaseInputCB
 argument: 0
 
 =============== FORM ===============
 argument: 0
 
 =============== FORM ===============
-Name: form_size
+Name: form_graphics_size
 Width: 500
 Height: 245
 Number of Objects: 16
 Width: 500
 Height: 245
 Number of Objects: 16
@@ -674,7 +674,7 @@ callback: C_FormBaseInputCB
 argument: 0
 
 =============== FORM ===============
 argument: 0
 
 =============== FORM ===============
-Name: form_bbox
+Name: form_graphics_bbox
 Width: 500
 Height: 245
 Number of Objects: 11
 Width: 500
 Height: 245
 Number of Objects: 11
@@ -878,7 +878,7 @@ callback: C_FormBaseInputCB
 argument: 0
 
 =============== FORM ===============
 argument: 0
 
 =============== FORM ===============
-Name: form_special
+Name: form_graphics_special
 Width: 500
 Height: 245
 Number of Objects: 2
 Width: 500
 Height: 245
 Number of Objects: 2
@@ -920,7 +920,7 @@ callback: C_FormBaseInputCB
 argument: 0
 
 =============== FORM ===============
 argument: 0
 
 =============== FORM ===============
-Name: form_lyxview
+Name: form_graphics_lyxview
 Width: 500
 Height: 245
 Number of Objects: 23
 Width: 500
 Height: 245
 Number of Objects: 23
index f5a00ee0aa546b6800be95511fae2a927acd16cb..c83481fe5b826d4f80ebdf58b3784c071c6e1070 100644 (file)
@@ -158,7 +158,7 @@ callback:
 argument: 
 
 =============== FORM ===============
 argument: 
 
 =============== FORM ===============
-Name: form_inner_tab
+Name: form_preferences_inner_tab
 Width: 455
 Height: 375
 Number of Objects: 2
 Width: 455
 Height: 375
 Number of Objects: 2
@@ -200,7 +200,7 @@ callback:
 argument: 
 
 =============== FORM ===============
 argument: 
 
 =============== FORM ===============
-Name: form_screen_fonts
+Name: form_preferences_screen_fonts
 Width: 455
 Height: 375
 Number of Objects: 21
 Width: 455
 Height: 375
 Number of Objects: 21
@@ -593,7 +593,7 @@ callback:
 argument: 
 
 =============== FORM ===============
 argument: 
 
 =============== FORM ===============
-Name: form_interface
+Name: form_preferences_interface
 Width: 450
 Height: 350
 Number of Objects: 12
 Width: 450
 Height: 350
 Number of Objects: 12
@@ -816,7 +816,7 @@ argument: 0
        value: 1
 
 =============== FORM ===============
        value: 1
 
 =============== FORM ===============
-Name: form_colors
+Name: form_preferences_colors
 Width: 450
 Height: 360
 Number of Objects: 15
 Width: 450
 Height: 360
 Number of Objects: 15
@@ -1098,7 +1098,7 @@ callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 =============== FORM ===============
 argument: 0
 
 =============== FORM ===============
-Name: form_lnf_misc
+Name: form_preferences_lnf_misc
 Width: 450
 Height: 350
 Number of Objects: 19
 Width: 450
 Height: 350
 Number of Objects: 19
@@ -1462,7 +1462,7 @@ callback:
 argument: 
 
 =============== FORM ===============
 argument: 
 
 =============== FORM ===============
-Name: form_spelloptions
+Name: form_preferences_spelloptions
 Width: 450
 Height: 360
 Number of Objects: 14
 Width: 450
 Height: 360
 Number of Objects: 14
@@ -1720,7 +1720,7 @@ callback:
 argument: 
 
 =============== FORM ===============
 argument: 
 
 =============== FORM ===============
-Name: form_language
+Name: form_preferences_language
 Width: 450
 Height: 360
 Number of Objects: 20
 Width: 450
 Height: 360
 Number of Objects: 20
@@ -2086,7 +2086,7 @@ callback:
 argument: 
 
 =============== FORM ===============
 argument: 
 
 =============== FORM ===============
-Name: form_formats
+Name: form_preferences_formats
 Width: 450
 Height: 360
 Number of Objects: 9
 Width: 450
 Height: 360
 Number of Objects: 9
@@ -2254,7 +2254,7 @@ callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 =============== FORM ===============
 argument: 0
 
 =============== FORM ===============
-Name: form_converters
+Name: form_preferences_converters
 Width: 450
 Height: 360
 Number of Objects: 8
 Width: 450
 Height: 360
 Number of Objects: 8
@@ -2404,7 +2404,7 @@ callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 =============== FORM ===============
 argument: 0
 
 =============== FORM ===============
-Name: form_paths
+Name: form_preferences_paths
 Width: 450
 Height: 350
 Number of Objects: 17
 Width: 450
 Height: 350
 Number of Objects: 17
@@ -2723,7 +2723,7 @@ callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 =============== FORM ===============
 argument: 0
 
 =============== FORM ===============
-Name: form_inputs_misc
+Name: form_preferences_inputs_misc
 Width: 450
 Height: 360
 Number of Objects: 2
 Width: 450
 Height: 360
 Number of Objects: 2
@@ -2765,7 +2765,7 @@ callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 =============== FORM ===============
 argument: 0
 
 =============== FORM ===============
-Name: form_printer
+Name: form_preferences_printer
 Width: 450
 Height: 350
 Number of Objects: 21
 Width: 450
 Height: 350
 Number of Objects: 21
@@ -3149,7 +3149,7 @@ callback:
 argument: 
 
 =============== FORM ===============
 argument: 
 
 =============== FORM ===============
-Name: form_outputs_misc
+Name: form_preferences_outputs_misc
 Width: 455
 Height: 375
 Number of Objects: 10
 Width: 455
 Height: 375
 Number of Objects: 10
index e8b81748375030c984fa0a4bd90343978103acf3..8a65ded426708d2747470258e22d946b8957d1ff 100644 (file)
@@ -308,7 +308,7 @@ callback:
 argument: 
 
 =============== FORM ===============
 argument: 
 
 =============== FORM ===============
-Name: form_column_options
+Name: form_tabular_column
 Width: 505
 Height: 225
 Number of Objects: 23
 Width: 505
 Height: 225
 Number of Objects: 23
@@ -730,7 +730,7 @@ callback:
 argument: 
 
 =============== FORM ===============
 argument: 
 
 =============== FORM ===============
-Name: form_cell_options
+Name: form_tabular_cell
 Width: 505
 Height: 225
 Number of Objects: 27
 Width: 505
 Height: 225
 Number of Objects: 27
@@ -1224,7 +1224,7 @@ callback:
 argument: 
 
 =============== FORM ===============
 argument: 
 
 =============== FORM ===============
-Name: form_longtable_options
+Name: form_tabular_longtable
 Width: 505
 Height: 225
 Number of Objects: 29
 Width: 505
 Height: 225
 Number of Objects: 29
diff --git a/src/frontends/xforms/forms/makefile.old b/src/frontends/xforms/forms/makefile.old
deleted file mode 100644 (file)
index b191c0c..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-###/* This file is part of
-###* ======================================================
-###*
-###*           LyX, the High Level Word Processor
-###*
-###*          Copyright 1995 Matthias Ettrich
-###*           Copyright 1995-2000 The LyX Team
-###*
-###*======================================================*/
-###
-###
-### Makefile by Lars Gullik Bjønnes (larsbj@lyx.org)
-### Modified by Allan Rae <rae@lyx.org>
-### Rewritten by Angus Leeming.
-### Only update files that really have changed. (Lgb 20000924))
-
-SHELL = /bin/sh
-.SUFFIXES: .fd .c
-
-SRCS =  form_aboutlyx.fd \
-       form_bibitem.fd \
-       form_bibtex.fd \
-       form_bibtex.fd \
-       form_browser.fd \
-       form_character.fd \
-       form_citation.fd \
-       form_document.fd \
-       form_error.fd \
-       form_ert.fd \
-       form_external.fd \
-       form_filedialog.fd \
-       form_float.fd \
-       form_forks.fd \
-       form_graphics.fd \
-       form_include.fd \
-       form_index.fd \
-       form_maths_deco.fd \
-       form_maths_delim.fd \
-       form_maths_matrix.fd \
-       form_maths_panel.fd \
-       form_maths_space.fd \
-       form_maths_style.fd \
-       form_minipage.fd \
-       form_paragraph.fd \
-       form_preamble.fd \
-       form_preferences.fd \
-       form_print.fd \
-       form_ref.fd \
-       form_search.fd \
-       form_sendto.fd \
-       form_spellchecker.fd \
-       form_tabular.fd \
-       form_tabular_create.fd \
-       form_texinfo.fd \
-       form_thesaurus.fd \
-       form_toc.fd \
-       form_url.fd
-
-OBJS = $(SRCS:.fd=.C)
-
-all:
-       @echo "This is a makefile intended for the maintainer only."
-       @echo "Only run it if you are absolutely sure about what you"
-       @echo "are doing."
-
-test: clean $(OBJS)
-
-updatesrc: test
-       for fil in *.C *.h; \
-       do cmp -s $$fil ../$$fil || mv $$fil ..; \
-       done
-       rm -f *.[hHcC] *.bak
-
-.fd.C:
-       ${SHELL} ./fdfix.sh $<
-
-clean:
-       rm -f *.[hHcC] *.bak fdfixc_modified.sed
-
-distclean: clean
-       rm -f *.orig *.rej *~
diff --git a/src/frontends/xforms/forms_fwd.h b/src/frontends/xforms/forms_fwd.h
new file mode 100644 (file)
index 0000000..1efec48
--- /dev/null
@@ -0,0 +1,26 @@
+// -*- C++ -*-
+/**
+ * \file xforms/forms_fwd.h
+ * Copyright 2000-2002 the LyX Team
+ * Read the file COPYING
+ *
+ * \author Angus Leeming, leeming@lyx.org
+ */
+
+#ifndef FORMS_FWD_H
+#define FORMS_FWD_H
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+/// Can't forward declare the typedef, but this works fine.
+class forms_;
+typedef forms_ FL_FORM;
+
+class flobjs_;
+typedef flobjs_ FL_OBJECT;
+
+typedef int FL_Coord;
+
+#endif // FORMS_FWD_H
diff --git a/src/frontends/xforms/forms_gettext.C b/src/frontends/xforms/forms_gettext.C
new file mode 100644 (file)
index 0000000..090e76b
--- /dev/null
@@ -0,0 +1,50 @@
+/**
+ * \file forms_gettext.C
+ * Copyright 2002 the LyX Team
+ * Read the file COPYING
+ *
+ * \author Angus Leeming, leeming@lyx.org
+ */
+#include <config.h>
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include "forms_gettext.h"
+
+#include FORMS_H_LOCATION
+
+// Extract shortcut from <ident>|<shortcut> string
+char const * flyx_shortcut_extract(char const * sc)
+{
+       // Find '|' in the sc and return the string after that.
+       register char const * sd = sc;
+       while (sd[0]!= 0 && sd[0] != '|') ++sd;
+
+       if (sd[0] == '|') {
+               ++sd;
+               return sd;
+       }
+       return "";
+}
+
+
+// Extract identifier from <ident>|<shortcut> string
+char const * flyx_ident_extract(char const * sc)
+{
+       register char const * se = sc;
+       while (se[0]!= 0 && se[0] != '|') ++se;
+
+       if (se[0] == 0) return sc;
+
+       char * sb = new char[se - sc + 1];
+       int index = 0;
+       register char const * sd = sc;
+       while (sd != se) {
+               sb[index] = sd[0];
+               ++index; ++sd;
+       }
+       sb[index] = 0;
+       return sb;
+}
diff --git a/src/frontends/xforms/forms_gettext.h b/src/frontends/xforms/forms_gettext.h
new file mode 100644 (file)
index 0000000..3a450b6
--- /dev/null
@@ -0,0 +1,29 @@
+// -*- C++ -*-
+/**
+ * \file forms_gettext.h
+ * Copyright 2002 the LyX Team
+ * Read the file COPYING
+ *
+ * \author Angus Leeming, leeming@lyx.org
+ */
+
+#ifndef FORMS_GETTEXT_H
+#define FORMS_GETTEXT_H
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#include "forms_fwd.h"
+
+/// Extract shortcut from <ident>|<shortcut> string
+char const * flyx_shortcut_extract(char const * sc);
+/// Shortcut for flyx_shortcut_extract
+#define scex flyx_shortcut_extract
+
+/// Extract shortcut from <ident>|<shortcut> string
+char const * flyx_ident_extract(char const * sc);
+/// Shortcut for flyx_ident_extract
+#define idex flyx_ident_extract
+
+#endif // FORMS_GETTEXT_H
index bbb704afc46289f1cdfa94d6cf2cb2a3416b431c..ff888f54e3cbc3ca0d8e0ea4defacaf8e8cb40a6 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "xformsBC.h"
 #include "xforms_helpers.h"
 
 #include "xformsBC.h"
 #include "xforms_helpers.h"
+#include FORMS_H_LOCATION
 
 
 xformsBC::xformsBC(string const & cancel, string const & close)
 
 
 xformsBC::xformsBC(string const & cancel, string const & close)
index c8ec742a478ade0416406fe9bb1badb30560edbf..5fa232158fb58367121410bcc1aaeef3ce27ec9b 100644 (file)
@@ -12,7 +12,7 @@
 #ifndef XFORMSBC_H
 #define XFORMSBC_H
 
 #ifndef XFORMSBC_H
 #define XFORMSBC_H
 
-#include FORMS_H_LOCATION
+#include "forms_fwd.h"
 
 #ifdef __GNUG__
 #pragma interface
 
 #ifdef __GNUG__
 #pragma interface
index 94e95d65a84b792da80a7693d26abb4ad0bcff85..7db8d1a1145094e673a9f5ca76660b6c0b7016ac 100644 (file)
 #include "support/LAssert.h"
 #include "support/lyxfunctional.h"  // compare_memfun
 
 #include "support/LAssert.h"
 #include "support/lyxfunctional.h"  // compare_memfun
 
+#include FORMS_H_LOCATION
+
+#ifdef HAVE_FLIMAGE_H
+# include <flimage.h>
+#else
+# ifdef HAVE_X11_FLIMAGE_H
+# include <X11/flimage.h>
+# endif
+#endif
+
 using std::find_if;
 
 namespace {
 using std::find_if;
 
 namespace {
index 13f6a0a43f33d1f709722e95a49e25ea4a9929b4..4cef86efb3826414238d5dbc50b34c0fff62d36d 100644 (file)
 #endif
 
 #include "graphics/GraphicsImage.h"
 #endif
 
 #include "graphics/GraphicsImage.h"
-#include FORMS_H_LOCATION
-
-#ifdef HAVE_FLIMAGE_H
-# include <flimage.h>
-#else
-# ifdef HAVE_X11_FLIMAGE_H
-# include <X11/flimage.h>
-# endif
-#endif
+
+struct flimage_;
+typedef flimage_ FL_IMAGE;
 
 namespace grfx {
 
 
 namespace grfx {
 
index a4bd349cc53f7ad661a3bda9a63472df95898ca3..cfc3474e803bf51fb77bcf318ad92c8113640f59 100644 (file)
 #include <algorithm>
 #include <fstream>
 #include <vector>
 #include <algorithm>
 #include <fstream>
 #include <vector>
+#include FORMS_H_LOCATION
 
 using std::ofstream;
 using std::pair;
 using std::vector;
 
 
 using std::ofstream;
 using std::pair;
 using std::vector;
 
-// Extract shortcut from <ident>|<shortcut> string
-char const * flyx_shortcut_extract(char const * sc)
-{
-       // Find '|' in the sc and return the string after that.
-       register char const * sd = sc;
-       while (sd[0]!= 0 && sd[0] != '|') ++sd;
-
-       if (sd[0] == '|') {
-               ++sd;
-               return sd;
-       }
-       return "";
-}
-
-
-// Extract identifier from <ident>|<shortcut> string
-char const * flyx_ident_extract(char const * sc)
-{
-       register char const * se = sc;
-       while (se[0]!= 0 && se[0] != '|') ++se;
-
-       if (se[0] == 0) return sc;
-
-       char * sb = new char[se - sc + 1];
-       int index = 0;
-       register char const * sd = sc;
-       while (sd != se) {
-               sb[index] = sd[0];
-               ++index; ++sd;
-       }
-       sb[index] = 0;
-       return sb;
-}
-
-
 // Set an FL_OBJECT to activated or deactivated
 void setEnabled(FL_OBJECT * ob, bool enable)
 {
 // Set an FL_OBJECT to activated or deactivated
 void setEnabled(FL_OBJECT * ob, bool enable)
 {
index 7e0acc9ed09359831249ce742048452149520e7b..f5a7d9993cde5e4b24ed9372643fce294f9f2991 100644 (file)
@@ -14,7 +14,7 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 
-#include FORMS_H_LOCATION
+#include "forms_fwd.h"
 
 #include "Color.h"
 #include "LString.h"
 
 #include "Color.h"
 #include "LString.h"
@@ -30,22 +30,12 @@ string const choice_Length_All =
 string const choice_Length_WithUnit =
     "cm|mm|in|ex|em|pt|sp|bp|dd|pc|cc|mu";     // all with a Unit
 
 string const choice_Length_WithUnit =
     "cm|mm|in|ex|em|pt|sp|bp|dd|pc|cc|mu";     // all with a Unit
 
-/// Extract shortcut from <ident>|<shortcut> string
-char const * flyx_shortcut_extract(char const * sc);
-/// Shortcut for flyx_shortcut_extract
-#define scex flyx_shortcut_extract
-
-/// Extract shortcut from <ident>|<shortcut> string
-char const * flyx_ident_extract(char const * sc);
-/// Shortcut for flyx_ident_extract
-#define idex flyx_ident_extract
-
 /// Set an FL_OBJECT to activated or deactivated
 void setEnabled(FL_OBJECT *, bool enable);
 
 /// Take a string and add breaks so that it fits into a desired label width, w
 string formatted(string const &label, int w,
 /// Set an FL_OBJECT to activated or deactivated
 void setEnabled(FL_OBJECT *, bool enable);
 
 /// Take a string and add breaks so that it fits into a desired label width, w
 string formatted(string const &label, int w,
-                int = FL_NORMAL_SIZE, int = FL_NORMAL_STYLE);
+                int = 12 /*FL_NORMAL_SIZE*/, int = 0 /*FL_NORMAL_STYLE*/);
 
 /// Given an fl_choice, create a vector of its entries
 std::vector<string> const getVectorFromChoice(FL_OBJECT *);
 
 /// Given an fl_choice, create a vector of its entries
 std::vector<string> const getVectorFromChoice(FL_OBJECT *);
index 96ddf581571dd025a61e1be1061b9e92b95cb98b..bbdd388df09afcdb7c260dbb9ec305aa823f4b70 100644 (file)
@@ -17,6 +17,7 @@
 #include "LString.h"
 #include <algorithm>
 #include <vector>
 #include "LString.h"
 #include <algorithm>
 #include <vector>
+#include FORMS_H_LOCATION
 
 using std::vector;
 
 
 using std::vector;
 
index d5e7d9117d7fac4fd30a8b882ce04dbc0b71a7c6..98a6980bec5aca78ac379f1ea45645eda50af743 100644 (file)
@@ -14,7 +14,7 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 
-#include FORMS_H_LOCATION
+#include "forms_fwd.h"
 
 /** If the form contains a tabfolder, then by how much should the form be
     scaled (enlarged only) to render the tabs (buttons) visible?
 
 /** If the form contains a tabfolder, then by how much should the form be
     scaled (enlarged only) to render the tabs (buttons) visible?