clear()->erase() ; lots of using directives for cxx

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

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index cb9838acd025ada6a6ba2f35143951a7a55dc091..69322ae8905cc40caa50164553a0d2bf939f3760 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -18,6 +18,10 @@
 #include "debug.h"
 #include "Painter.h"
 
+using std::ostream;
+using std::endl;
+
+
 InsetCommand::InsetCommand()
 {
 }
@@ -32,7 +36,6 @@ InsetCommand::InsetCommand(string const & cmd, string const & arg,
 
 int InsetCommand::ascent(Painter & pain, LyXFont const &) const
 {
-#if 1
        LyXFont font(LyXFont::ALL_SANE);
        font.decSize();
        
@@ -48,17 +51,11 @@ int InsetCommand::ascent(Painter & pain, LyXFont const &) const
                              false, width, ascent, descent);
        }
        return ascent;
-#else
-       LyXFont f = font;
-       f.decSize();
-       return f.maxAscent() + 3;
-#endif
 }
 
 
 int InsetCommand::descent(Painter & pain, LyXFont const &) const
 {
-#if 1
        LyXFont font(LyXFont::ALL_SANE);
        font.decSize();
        
@@ -74,17 +71,11 @@ int InsetCommand::descent(Painter & pain, LyXFont const &) const
                              false, width, ascent, descent);
        }
        return descent;
-#else
-       LyXFont f = font;
-       f.decSize();
-       return f.maxDescent() + 3;
-#endif
 }
 
 
 int InsetCommand::width(Painter & pain, LyXFont const &) const
 {
-#if 1
        LyXFont font(LyXFont::ALL_SANE);
        font.decSize();
        
@@ -99,13 +90,7 @@ int InsetCommand::width(Painter & pain, LyXFont const &) const
                              LColor::commandbg, LColor::commandframe,
                              false, width, ascent, descent);
        }
-       return width;
-#else
-       LyXFont f = font;
-       f.decSize();
-       string s = getScreenLabel();
-       return 10 + f.stringWidth(s);
-#endif
+       return width + 4;
 }
 
 
@@ -113,7 +98,6 @@ void InsetCommand::draw(Painter & pain, LyXFont const &,
                        int baseline, float & x) const
 {
        // Draw it as a box with the LaTeX text
-#if 1
        LyXFont font(LyXFont::ALL_SANE);
        font.setColor(LColor::command).decSize();
 
@@ -121,45 +105,14 @@ void InsetCommand::draw(Painter & pain, LyXFont const &,
        string s = getScreenLabel();
 
        if (Editable()) {
-               pain.buttonText(int(x), baseline, s, font, true, width);
+               pain.buttonText(int(x)+2, baseline, s, font, true, width);
        } else {
-               pain.rectText(int(x), baseline, s, font,
+               pain.rectText(int(x)+2, baseline, s, font,
                              LColor::commandbg, LColor::commandframe,
                              true, width);
        }
 
-       x += width;
-#else
-               
-       x += 3;
-
-       pain.fillRectangle(int(x), baseline - ascent(pain, font) + 1,
-                          width(pain, font) - 6,
-                          ascent(pain, font) + descent(pain, font) - 2,
-                          LColor::insetbg);
-        // Tell whether this slows down the drawing  (ale)
-       // lets draw editable and non-editable insets differently
-        if (Editable()) {
-               int y = baseline - ascent(pain, font) + 1;
-               int w = width(pain, font) - 6;
-               int h = ascent(pain, font) + descent(pain, font) - 2;
-               pain.rectangle(int(x), y, w, h, LColor::insetframe);
-       } else {
-               
-               pain.rectangle(int(x), baseline - ascent(pain, font) + 1,
-                              width(pain, font) - 6,
-                              ascent(pain, font) + descent(pain, font) - 2,
-                              LColor::insetframe); 
-       }
-        string s = getScreenLabel();
-               LyXFont f(font);
-       f.decSize();
-       f.setColor(LColor::none);
-       f.setLatex(LyXFont::OFF);
-       pain.text(int(x + 2), baseline, s, f);
-       
-       x +=  width(pain, font) - 3;
-#endif
+       x += width + 4;
 }
 
 
@@ -244,34 +197,19 @@ void InsetCommand::Read(LyXLex & lex)
 }
 
 
-int InsetCommand::Latex(ostream & os, signed char /*fragile*/, bool/*fs*/) const
+int InsetCommand::Latex(ostream & os, bool /*fragile*/, bool/*fs*/) const
 {
        os << getCommand();
        return 0;
 }
 
 
-#ifndef USE_OSTREAM_ONLY
-int InsetCommand::Latex(string & file, signed char /*fragile*/, bool/*fs*/) const
+int InsetCommand::Ascii(ostream &) const
 {
-       file += getCommand();
        return 0;
 }
 
 
-int InsetCommand::Linuxdoc(string &/*file*/) const
-{
-       return 0;
-}
-
-
-int InsetCommand::DocBook(string &/*file*/) const
-{
-       return 0;
-}
-
-#else
-
 int InsetCommand::Linuxdoc(ostream &) const
 {
        return 0;
@@ -282,7 +220,6 @@ int InsetCommand::DocBook(ostream &) const
 {
        return 0;
 }
-#endif
 
 
 Inset * InsetCommand::Clone() const