LyX Drinkers United: patch 2

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

diff --git a/src/insets/inset.C b/src/insets/inset.C
index bae82b6f9c130d8345b7fea29754c3323826f386..5fe964448777f7add2b73930487595da7c934f5b 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -4,17 +4,17 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
 
 #ifdef __GNUG__
-#pragma implementation "lyxinset.h"
+#pragma implementation
 #endif
 
-#include "lyxinset.h"
+#include "inset.h"
 #include "debug.h"
 #include "BufferView.h"
 #include "support/lstrings.h"
@@ -22,6 +22,7 @@
 #include "commandtags.h"
 #include "support/lstrings.h"
 #include "gettext.h"
+#include "lyxfont.h"
 
 using std::endl;
 
@@ -84,34 +85,34 @@ LyXText * Inset::getLyXText(BufferView const * bv, bool const) const
 
 void UpdatableInset::InsetButtonPress(BufferView *, int x, int y, int button)
 {
-       lyxerr.debug() << "Inset Button Press x=" << x
+       lyxerr[Debug::INFO] << "Inset Button Press x=" << x
                       << ", y=" << y << ", button=" << button << endl;
 }
 
 
 void UpdatableInset::InsetButtonRelease(BufferView *, int x, int y, int button)
 {
-       lyxerr.debug() << "Inset Button Release x=" << x
+       lyxerr[Debug::INFO] << "Inset Button Release x=" << x
                       << ", y=" << y << ", button=" << button << endl;
 }
 
 
 void UpdatableInset::InsetKeyPress(XKeyEvent *)
 {
-       lyxerr.debug() << "Inset Keypress" << endl;
+       lyxerr[Debug::INFO] << "Inset Keypress" << endl;
 }
 
 
 void UpdatableInset::InsetMotionNotify(BufferView *, int x, int y, int state)
 {
-       lyxerr.debug() << "Inset Motion Notify x=" << x
+       lyxerr[Debug::INFO] << "Inset Motion Notify x=" << x
                       << ", y=" << y << ", state=" << state << endl;
 }
 
 
 void UpdatableInset::InsetUnlock(BufferView *)
 {
-       lyxerr.debug() << "Inset Unlock" << endl;
+       lyxerr[Debug::INFO] << "Inset Unlock" << endl;
 }
 
 
@@ -149,7 +150,7 @@ void UpdatableInset::draw(BufferView *, LyXFont const &,
 }
 
 
-void UpdatableInset::SetFont(BufferView *, LyXFont const &, bool )
+void UpdatableInset::SetFont(BufferView *, LyXFont const &, bool, bool )
 {}
 
 
@@ -181,6 +182,7 @@ void UpdatableInset::scroll(BufferView * bv, float s) const
        if ((tmp_top_x + scx + width(bv, font)) < (workW / 2)) {
                scx += (workW / 2) - (tmp_top_x + scx + width(bv, font));
        }
+
        // bv->updateInset(const_cast<UpdatableInset *>(this), false);
 }
 
@@ -204,7 +206,7 @@ void UpdatableInset::scroll(BufferView * bv, int offset) const
                        scx += offset;
                }
        }
-       // bv->updateInset(const_cast<UpdatableInset *>(this), false);
+//     bv->updateInset(const_cast<UpdatableInset *>(this), false);
 }