Bugfixes: checkboxes to radiobuttons (from J�rgen S) and remove a little

[lyx.git] / src / frontends / xforms / FormDocument.h

diff --git a/src/frontends/xforms/FormDocument.h b/src/frontends/xforms/FormDocument.h
index 20e5e43fdda0bfb09311ef49de003ae66a1b5c9b..a27d9f659cff84cfc232fedb190738fa7813c285 100644 (file)
--- a/src/frontends/xforms/FormDocument.h
+++ b/src/frontends/xforms/FormDocument.h
@@ -4,7 +4,7 @@
  * 
  *           LyX, The Document Processor
  *      
- *           Copyright (C) 2000 The LyX Team.
+ *           Copyright 2000-2001 The LyX Team.
  *
  *           @author Jürgen Vigna
  *
@@ -15,15 +15,13 @@
 
 #include <vector>
 #include <boost/smart_ptr.hpp>
-#include "FormBaseDeprecated.h"
-#include "xformsBC.h"
 
 #ifdef __GNUG_
 #pragma interface
 #endif
 
-class LyXView;
-class Dialogs;
+#include "FormBaseDeprecated.h"
+
 class Combox;
 class BufferParams;
 
@@ -34,13 +32,12 @@ struct FD_form_doc_language;
 struct FD_form_doc_options;
 struct FD_form_doc_bullet;
 
-/** This class provides an XForms implementation of the FormDocument Popup.
+/** This class provides an XForms implementation of the FormDocument dialog.
     The table-layout-form here changes values for latex-tabulars
     @author Jürgen Vigna
  */
 class FormDocument : public FormBaseBD {
 public:
-       /// #FormDocument x(Communicator ..., Popups ...);#
        FormDocument(LyXView *, Dialogs *);
        ///
        static void ComboInputCB(int, void *, Combox *);
@@ -87,11 +84,11 @@ private:
        virtual void build();
        /// Filter the inputs
        virtual bool input( FL_OBJECT *, long );
-       /// Update the popup.
+       /// Update the dialog.
        virtual void update();
-       /// Apply from popup
+       /// Apply from dialog
        virtual void apply();
-       /// Cancel from popup
+       /// Cancel from dialog
        virtual void cancel();
 
        ///
@@ -110,8 +107,6 @@ private:
        ///
        void BulletBMTable(FL_OBJECT * ob, long);
        ///
-       void checkMarginValues();
-       ///
        void checkReadOnly();
        ///
        void CheckChoiceClass(FL_OBJECT * ob, long);
@@ -129,6 +124,17 @@ private:
        ///
        void bullets_update(BufferParams const &);
 
+       ///
+       void paper_apply(BufferParams &);
+       ///
+       bool class_apply(BufferParams &);
+       ///
+       bool language_apply(BufferParams &);
+       ///
+       bool options_apply(BufferParams &);
+       ///
+       void bullets_apply(BufferParams &);
+
        ///
        void paper_apply();
        ///
@@ -140,7 +146,7 @@ private:
        ///
        void bullets_apply();
 
-       /// Typedefinitions from the fdesign produced Header file
+       /// Fdesign generated methods
        FD_form_tabbed_document * build_tabbed_document();
        ///
        FD_form_doc_paper * build_doc_paper();