2001-12-28 Lars Gullik Bj�nnes <larsbj@birdstep.com>

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

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 16d47652bdc14a68dae1c7b5fe206d50ef53c8bf..1d4c3614cb81a9fbc0dc6b67415468138b08ec09 100644 (file)
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -185,10 +185,10 @@ void InsetFloat::read(Buffer const * buf, LyXLex & lex)
 void InsetFloat::validate(LaTeXFeatures & features) const
 {
        if (contains(placement(), "H")) {
-               features.floats = true;
+               features.require("floats");
        }
        
-       features.usedFloats.insert(floatType_);
+       features.useFloat(floatType_);
        InsetCollapsable::validate(features);
 }
 
@@ -240,10 +240,10 @@ int InsetFloat::latex(Buffer const * buf,
 }
 
 
-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;
@@ -271,26 +271,6 @@ bool InsetFloat::showInsetDialog(BufferView * bv) const
 }
 
 
-void InsetFloat::insetButtonRelease(BufferView * bv, int x, int y, int button)
-{
-#if 1
-       if ((x >= 0)  && (x < button_length) &&
-           (y >= button_top_y) &&  (y <= button_bottom_y) &&
-           (button == 3))
-       {
-               showInsetDialog(bv);
-               return;
-       }
-#else
-       if (button == 3) {
-               showInsetDialog(bv);
-               return;
-       }
-#endif
-       InsetCollapsable::insetButtonRelease(bv, x, y, button);
-}
-
-
 string const & InsetFloat::type() const 
 {
        return floatType_;
@@ -299,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;
 }