fix typo that put too many include paths for most people

[lyx.git] / src / insets / insetfloat.C

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 1d22dce160550e8b0e60003c6e071ca96a68efaa..7037a3801bc316441cf784cdeb750b190bc2d6a6 100644 (file)
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -1,8 +1,8 @@
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- *      
+ *
  *          Copyright 1998-2001 The LyX Team.
  *
  * ====================================================== */
@@ -20,11 +20,14 @@
 #include "lyxtext.h"
 #include "insets/insettext.h"
 #include "support/LOstream.h"
+#include "support/lstrings.h"
 #include "FloatList.h"
 #include "LaTeXFeatures.h"
 #include "debug.h"
 #include "Floating.h"
 #include "buffer.h"
+#include "LyXView.h"
+#include "frontends/Dialogs.h"
 
 using std::ostream;
 using std::endl;
@@ -58,7 +61,7 @@ using std::endl;
 //     within    - This (optional) argument determines whether floats of this
 //                 class will be numbered within some sectional unit of the
 //                 document. For example, if within is equal to chapter, the
-//                 floats will be numbered within chapters. 
+//                 floats will be numbered within chapters.
 //   \floatstyle{style}
 //     style -  plain, boxed, ruled
 //   \floatname{float}{floatname}
@@ -96,8 +99,8 @@ using std::endl;
 //
 // Lgb
 
-InsetFloat::InsetFloat(string const & type)
-       : InsetCollapsable(), wide_(false)
+InsetFloat::InsetFloat(BufferParams const & bp, string const & type)
+       : InsetCollapsable(bp), wide_(false)
 {
        string lab(_("float:"));
        lab += type;
@@ -118,6 +121,12 @@ InsetFloat::InsetFloat(InsetFloat const & in, bool same_id)
 {}
 
 
+InsetFloat::~InsetFloat()
+{
+       hideDialog();
+}
+
+
 void InsetFloat::write(Buffer const * buf, ostream & os) const
 {
        os << "Float " // getInsetName()
@@ -134,19 +143,19 @@ void InsetFloat::write(Buffer const * buf, ostream & os) const
        } else {
                os << "wide false\n";
        }
-       
+
        InsetCollapsable::write(buf, os);
 }
 
 
 void InsetFloat::read(Buffer const * buf, LyXLex & lex)
 {
-       if (lex.IsOK()) {
+       if (lex.isOK()) {
                lex.next();
-               string token = lex.GetString();
+               string token = lex.getString();
                if (token == "placement") {
                        lex.next();
-                       floatPlacement_ = lex.GetString();
+                       floatPlacement_ = lex.getString();
                } else {
                        lyxerr << "InsetFloat::Read: Missing placement!"
                               << endl;
@@ -154,10 +163,10 @@ void InsetFloat::read(Buffer const * buf, LyXLex & lex)
                        lex.pushToken(token);
                }
                lex.next();
-               token = lex.GetString();
+               token = lex.getString();
                if (token == "wide") {
                        lex.next();
-                       string const tmptoken = lex.GetString();
+                       string const tmptoken = lex.getString();
                        if (tmptoken == "true")
                                wide(true);
                        else
@@ -175,7 +184,11 @@ void InsetFloat::read(Buffer const * buf, LyXLex & lex)
 
 void InsetFloat::validate(LaTeXFeatures & features) const
 {
-       features.usedFloats.insert(floatType_);
+       if (contains(placement(), "H")) {
+               features.require("float");
+       }
+
+       features.useFloat(floatType_);
        InsetCollapsable::validate(features);
 }
 
@@ -211,26 +224,26 @@ int InsetFloat::latex(Buffer const * buf,
                   && buf_placement != def_placement) {
                placement = buf_placement;
        }
-       
+
        os << "\\begin{" << tmptype << "}";
        // We only output placement if different from the def_placement.
        if (!placement.empty()) {
                os << "[" << placement << "]";
        }
-       
+
        os << "%\n";
-    
+
        int const i = inset.latex(buf, os, fragile, fp);
        os << "\\end{" << tmptype << "}%\n";
-       
+
        return i + 2;
 }
 
 
-int InsetFloat::docBook(Buffer const * buf, ostream & os) const
+int InsetFloat::docbook(Buffer const * buf, ostream & os) const
 {
        os << "<" << floatType_ << ">";
-       int const i = inset.docBook(buf, os);
+       int const i = inset.docbook(buf, os);
        os << "</" << floatType_ << ">";
 
        return i;
@@ -249,24 +262,16 @@ bool InsetFloat::insetAllowed(Inset::Code code) const
 }
 
 
-void InsetFloat::insetButtonRelease(BufferView * bv, int x, int y, int button)
+bool InsetFloat::showInsetDialog(BufferView * bv) const
 {
-       if (x >= top_x
-           && x < button_length
-           && y >= button_top_y
-           && y < button_bottom_y
-           && button == 3) {
-               // This obviously need to change.
-               lyxerr << "InsetFloat: Let's edit this floats parameters!"
-                      << endl;
-               //bv->owner()->getDialogs()->showFloat(this);
-       } else {
-               InsetCollapsable::insetButtonRelease(bv, x, y, button);
+       if (!inset.showInsetDialog(bv)) {
+               bv->owner()->getDialogs()->showFloat(const_cast<InsetFloat *>(this));
        }
+       return true;
 }
 
 
-string const & InsetFloat::type() const 
+string const & InsetFloat::type() const
 {
        return floatType_;
 }
@@ -274,11 +279,8 @@ string const & InsetFloat::type() const
 
 void InsetFloat::placement(string const & p)
 {
-       // Here we should only allow the placement to be set
+       // FIX: Here we should only allow the placement to be set
        // if a valid value.
-#ifdef WITH_WARNINGS
-#warning FIX!
-#endif
        floatPlacement_ = p;
 }