X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormGraphics.h;h=97364f34720de1e8ef0637b6edbfb914b9c32202;hb=d5443737342903de489d527802cd2cdd38987d74;hp=fc9bdec8f5e114826d209ebe63582d63edc8e490;hpb=482c04ecca95e00aaa649dc74f33ca33ad864e89;p=lyx.git

diff --git a/src/frontends/xforms/FormGraphics.h b/src/frontends/xforms/FormGraphics.h
index fc9bdec8f5..97364f3472 100644
--- a/src/frontends/xforms/FormGraphics.h
+++ b/src/frontends/xforms/FormGraphics.h
@@ -1,42 +1,39 @@
 // -*- C++ -*-
 /**
  * \file FormGraphics.h
- * Copyright 2000-2001 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Baruch Even, baruch.even@writeme.com
- * \author Herbert Voss, voss@lyx.org
+ * \author Baruch Even
+ * \author Herbert Voß
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef FORMGRAPHICS_H
 #define FORMGRAPHICS_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "FormBase.h"
-#include "RadioButtonGroup.h"
-
+#include "FormDialogView.h"
 #include <boost/scoped_ptr.hpp>
-
 #include <vector>
 
+namespace lyx {
+namespace frontend {
+
+class CheckedPath;
 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_bbox;
+struct FD_graphics_extra;
 
 /** This class provides an XForms implementation of the Graphics Dialog.
  */
-class FormGraphics : public FormCB<ControlGraphics, FormDB<FD_form_graphics> > {
+class FormGraphics
+	: public FormController<ControlGraphics, FormView<FD_graphics> > {
 public:
 	///
-	FormGraphics(ControlGraphics &);
-
+	FormGraphics(Dialog &);
 private:
 
 	/** Redraw the form (on receipt of a Signal indicating, for example,
@@ -49,36 +46,25 @@ private:
 	/// Update dialog before/whilst showing it.
 	virtual void update();
 	/// Update the BoundingBox info.
-	void updateBB(string const & filename, string const & bb_inset);
+	void updateBB(std::string const & filename, std::string const & bb_inset);
 	/// 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();
+	// Accessor to checker owned by the button controller.
+	CheckedPath * file_checker_;
 
 	/// 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_bbox> bbox_;
 	///
-	boost::scoped_ptr<FD_form_size> size_;
-	///
-	boost::scoped_ptr<FD_form_bbox> bbox_;
-	///
-	boost::scoped_ptr<FD_form_special> special_;
+	boost::scoped_ptr<FD_graphics_extra> extra_;
 
 	/// Store the LaTeX names for the rotation origins.
-	std::vector<string> origins_;
+	std::vector<std::string> origins_;
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif  // FORMGRAPHICS_H