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

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

diff --git a/src/insets/inset.C b/src/insets/inset.C
index 3a1fcb939d2b61266e233c1bf05c4845633d6755..c07a0f384cb3fc9ebdb6d92aa8c88893e660df59 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.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.
  *
  * ====================================================== */
 
@@ -20,6 +20,8 @@
 #include "support/lstrings.h"
 #include "Painter.h"
 
+using std::endl;
+
 /* Insets default methods */
 
 bool Inset::Deletable() const
@@ -39,6 +41,13 @@ Inset::EDITABLE Inset::Editable() const
   return NOT_EDITABLE;
 }
 
+bool Inset::IsTextInset() const
+{
+       return ((LyxCode() == TEXT_CODE) ||
+               (LyxCode() == ERT_CODE) ||
+               (LyxCode() == FOOT_CODE) ||
+               (LyxCode() == MARGIN_CODE));
+}
 
 void Inset::Validate(LaTeXFeatures &) const
 {
@@ -62,6 +71,11 @@ LyXFont Inset::ConvertFont(LyXFont font)
 }
 
 
+char const * Inset::EditMessage() const 
+{
+       return _("Opened inset");
+}
+
  /* some stuff for inset locking */
 
 void UpdatableInset::InsetButtonPress(BufferView *, int x, int y, int button)
@@ -108,6 +122,14 @@ void UpdatableInset::ToggleInsetCursor(BufferView *)
 {
 }
 
+void UpdatableInset::ShowInsetCursor(BufferView *)
+{
+}
+
+void UpdatableInset::HideInsetCursor(BufferView *)
+{
+}
+
 
 void UpdatableInset::Edit(BufferView * bv, int, int, unsigned int)
 {
@@ -115,16 +137,17 @@ void UpdatableInset::Edit(BufferView * bv, int, int, unsigned int)
 
     scx = 0;
 
-    mx_scx=abs((width(bv->getPainter(), font) - bv->paperWidth()) / 2);
+    mx_scx = abs((width(bv->painter(), font) - bv->paperWidth()) / 2);
 }
 
 
 void UpdatableInset::draw(Painter &, LyXFont const &,
-                         int baseline, float & x) const
+                         int /* baseline */, float & x) const
 {
     if (scx) x += float(scx);
-    top_x = int(x);
-    top_baseline = baseline;
+// ATTENTION: this is not good doing here
+//    top_x = int(x);
+//    top_baseline = baseline;
 }
 
 
@@ -156,10 +179,9 @@ UpdatableInset::LocalDispatch(BufferView *, int, string const &)
     return UNDISPATCHED; 
 }
 
-int UpdatableInset::getMaxWidth(Painter & pain) const
+int UpdatableInset::getMaxWidth(Painter & pain, UpdatableInset const *inset) const
 {
-    if (owner_)
-        return owner_->getMaxWidth(pain);
+    if (owner())
+        return static_cast<UpdatableInset*>(owner())->getMaxWidth(pain, inset);
     return pain.paperWidth();
 }
-