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

diff --git a/src/frontends/xforms/FormGraphics.h b/src/frontends/xforms/FormGraphics.h
index 5f327a207d..97364f3472 100644
--- a/src/frontends/xforms/FormGraphics.h
+++ b/src/frontends/xforms/FormGraphics.h
@@ -5,24 +5,22 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Baruch Even
- * \author Herbert Voss
+ * \author Herbert Voß
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef FORMGRAPHICS_H
 #define FORMGRAPHICS_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "FormBase.h"
-
+#include "FormDialogView.h"
 #include <boost/scoped_ptr.hpp>
-
 #include <vector>
 
+namespace lyx {
+namespace frontend {
+
+class CheckedPath;
 class ControlGraphics;
 struct FD_graphics;
 struct FD_graphics_file;
@@ -31,10 +29,11 @@ struct FD_graphics_extra;
 
 /** This class provides an XForms implementation of the Graphics Dialog.
  */
-class FormGraphics : public FormCB<ControlGraphics, FormDB<FD_graphics> > {
+class FormGraphics
+	: public FormController<ControlGraphics, FormView<FD_graphics> > {
 public:
 	///
-	FormGraphics();
+	FormGraphics(Dialog &);
 private:
 
 	/** Redraw the form (on receipt of a Signal indicating, for example,
@@ -47,10 +46,13 @@ 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);
 
+	// Accessor to checker owned by the button controller.
+	CheckedPath * file_checker_;
+
 	/// Real GUI implementation.
 	boost::scoped_ptr<FD_graphics_file> file_;
 	///
@@ -59,7 +61,10 @@ private:
 	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