citation patch from Angus

[lyx.git] / src / WorkArea.C

diff --git a/src/WorkArea.C b/src/WorkArea.C
index ca9bd91de144b5a0bfe1d53981fc39e69f94fab0..02f5e97e70016520ac1910dc2229a797363e1e48 100644 (file)
--- a/src/WorkArea.C
+++ b/src/WorkArea.C
@@ -21,7 +21,10 @@
 #include "BufferView.h"
 #include "LyXView.h"
 #include "lyxfunc.h"
+
+#if FL_REVISION < 89
 #include "lyxlookup.h"
+#endif
 
 using std::endl;
 
@@ -29,7 +32,7 @@ FL_OBJECT * figinset_canvas;
 
 // needed to make the c++ compiler find the correct version of abs.
 // This is at least true for g++.
-using std::abs;
+//using std::abs;
 
 static inline
 void waitForX()
@@ -319,7 +322,7 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
                break;
        case FL_KEYBOARD:
        {
-               lyxerr[Debug::KEY] << "Workarea event: KEYBOARD";
+               lyxerr[Debug::KEY] << "Workarea event: KEYBOARD" << endl;
                
                KeySym keysym = 0;
                char dummy[1];
@@ -352,6 +355,8 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
                }
                KeySym ret_key = keysym;
 #else
+               // Ok, this is a bit simplistic...seems that the rules
+               // need to be a bit more...
                if (!key) break;
                KeySym ret_key = (keysym ? keysym : key);
 #endif