reformatting and remove using delc

[lyx.git] / src / insets / figinset.h

diff --git a/src/insets/figinset.h b/src/insets/figinset.h
index b48d9235d2df810bf41085f73239aff84a06ebbd..02cb893e2d600655650a3a465e7f3d6f58bc01b1 100644 (file)
--- a/src/insets/figinset.h
+++ b/src/insets/figinset.h
@@ -7,20 +7,21 @@
 #ifndef FIGINSET_H
 #define FIGINSET_H
 
-#include "form1.h"
+#include "figure_form.h"
 #include "LString.h"
 #include "buffer.h"
 #include "LaTeXFeatures.h"
 #include "insets/lyxinset.h"
+#include <sigc++/signal_system.h>
 /* the rest is figure stuff */
 
 struct Figref;
 
 ///
-class InsetFig: public Inset {
+class InsetFig: public Inset, public SigC::Object {
 public:
        ///
-       InsetFig(int tmpx, int tmpy, Buffer *);
+       InsetFig(int tmpx, int tmpy, Buffer const &);
        ///
        ~InsetFig();
        ///
@@ -38,7 +39,7 @@ public:
        ///
        int Latex(Buffer const *, std::ostream &, bool fragile, bool free_space) const;
        ///
-       int Ascii(Buffer const *, std::ostream &) const;
+       int Ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
        int Linuxdoc(Buffer const *, std::ostream &) const;
        ///
@@ -47,7 +48,7 @@ public:
        void Validate(LaTeXFeatures & features) const;
 
        /// what appears in the minibuffer when opening
-       char const * EditMessage() const;
+       string const EditMessage() const;
        
        ///
        void Edit(BufferView *, int, int, unsigned int);
@@ -58,11 +59,11 @@ public:
        ///
        Inset::Code LyxCode() const;
        ///
-       Inset * Clone() const;
+       Inset * Clone(Buffer const &) const;
        ///
        void CallbackFig(long arg);
        ///
-       void Preview(char const * p);
+       void Preview(string const & p);
        /// browse for file
        void BrowseFile();
 
@@ -132,9 +133,13 @@ public:
        ///
        bool psubfigure;
 private:
+       /** Redraw the form (on receipt of a Signal indicating, for example,
+           that the xform colors have been re-mapped).
+       */
+       void redraw();
 
        ///
-       Buffer * owner;
+       Buffer const * owner;
        /// restore values on the form
        void RestoreForm();
        /// recompute screen params
@@ -145,6 +150,8 @@ private:
        void TempRegenerate();
        /// get sizes from .eps file
        void GetPSSizes();
+       /// Redraw connection.
+       SigC::Connection r_;
 };