X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormTabular.h;h=08002a16b1df8b86460f3a981471f8ff4af7bdc0;hb=2c3af1475e2a408f725b5eea93583ee13e3d09cc;hp=bd890000d7176c597a830056f30074acf65a5838;hpb=4505b2f7b35d2d1e7f48128c41d3797dbd53fe97;p=lyx.git

diff --git a/src/frontends/xforms/FormTabular.h b/src/frontends/xforms/FormTabular.h
index bd890000d7..08002a16b1 100644
--- a/src/frontends/xforms/FormTabular.h
+++ b/src/frontends/xforms/FormTabular.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  * 	 
  *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  *======================================================*/
 /* FormTabular.h
@@ -15,6 +15,12 @@
 #ifndef FORMTABULAR_H
 #define FORMTABULAR_H
 
+#include <boost/smart_ptr.hpp>
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "FormInset.h"
 
 class InsetTabular;
@@ -31,10 +37,10 @@ class FormTabular : public FormInset {
 public:
 	/// #FormTabular x(LyXFunc ..., Dialogs ...);#
 	FormTabular(LyXView *, Dialogs *);
-	///
-	~FormTabular();
 
 private:
+	/// Pointer to the actual instantiation of the ButtonController.
+	virtual xformsBC & bc();
 	/** Redraw the form (on receipt of a Signal indicating, for example,
 	    that the xforms colours have been re-mapped). */
 	virtual void redraw();
@@ -53,6 +59,8 @@ private:
 	virtual bool input(FL_OBJECT *, long);
 	/// Pointer to the actual instantiation of the xforms form
 	virtual FL_FORM * form() const;
+	///
+	virtual int checkLongtableOptions(FL_OBJECT *, string &);
 
 	/// Fdesign generated methods
 	FD_form_tabular * build_tabular();
@@ -66,20 +74,30 @@ private:
 	FD_form_longtable_options * build_longtable_options();
 
 	/// Real GUI implementation.
-	FD_form_tabular * dialog_;
+	boost::scoped_ptr<FD_form_tabular> dialog_;
 	///
-	FD_form_tabular_options * tabular_options_;
+	boost::scoped_ptr<FD_form_tabular_options> tabular_options_;
 	///
-	FD_form_column_options * column_options_;
+	boost::scoped_ptr<FD_form_column_options> column_options_;
 	///
-	FD_form_cell_options * cell_options_;
+	boost::scoped_ptr<FD_form_cell_options> cell_options_;
 	///
-	FD_form_longtable_options * longtable_options_;
+	boost::scoped_ptr<FD_form_longtable_options> longtable_options_;
 
 	/// pointer to the inset passed through showInset
 	InsetTabular * inset_;
 	///
 	int actCell_;
+	/// The ButtonController
+	ButtonController<OkCancelReadOnlyPolicy, xformsBC> bc_;
+	/// if we are applying stuff during a close of the dialog
+	bool closing_;
 };
 
+
+inline
+xformsBC & FormTabular::bc()
+{
+	return bc_;
+}
 #endif