Added new FINISED states FINISHED_RIGHT, FINISHED_UP, FINISHED_DOWN.

[lyx.git] / src / WorkArea.C

diff --git a/src/WorkArea.C b/src/WorkArea.C
index 8483620d142be81c6be8a719347d19d3e27e8352..ea9324e037d1889905e6f870b78d77ec16bdf1cb 100644 (file)
--- a/src/WorkArea.C
+++ b/src/WorkArea.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -19,7 +19,6 @@
 #include "debug.h"
 #include "support/lstrings.h"
 #include "LyXView.h"
-#include "lyxfunc.h"
 
 #if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
 #include "lyxlookup.h"
@@ -35,7 +34,6 @@ FL_OBJECT * figinset_canvas;
 
 namespace {
 
-//static
 inline
 void waitForX()
 {
@@ -358,7 +356,7 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
                               << keysym << "]" << endl;
                }
 
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
                if (keysym == NoSymbol) {
                        lyxerr[Debug::KEY]
                                << "Empty kdb action (probably composing)"
@@ -398,15 +396,15 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
                                //}
                }
                
-#endif 
+#endif
                unsigned int const ret_state = xke->state;
 
                // If you have a better way to handle "wild-output" of
                // characters after the key has been released than the one
                // below, please contact me. (Lgb)
-               static Time last_time_pressed = 0;
-               static unsigned int last_key_pressed = 0;
-               static unsigned int last_state_pressed = 0;
+               static Time last_time_pressed;
+               static unsigned int last_key_pressed;
+               static unsigned int last_state_pressed;
                lyxerr[Debug::KEY] << "Workarea Diff: "
                                   << xke->time - last_time_pressed
                                   << endl;
@@ -482,11 +480,12 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
 }
 
 
-static string clipboard_selection;
-static bool clipboard_read = false;
+namespace {
 
-extern "C" {
-       static
+string clipboard_selection;
+bool clipboard_read = false;
+
+extern "C"
 int request_clipboard_cb(FL_OBJECT * /*ob*/, long /*type*/,
                        void const * data, long size) 
 {
@@ -499,8 +498,8 @@ int request_clipboard_cb(FL_OBJECT * /*ob*/, long /*type*/,
        clipboard_read = true;
        return 0;
 }
-} // extern "C"
 
+} // namespace anon
 
 string const WorkArea::getClipboard() const 
 {
@@ -526,5 +525,5 @@ void WorkArea::putClipboard(string const & s) const
        static string hold;
        hold = s;
        
-       fl_stuff_clipboard(work_area, 0, hold.c_str(), hold.size(), 0);
+       fl_stuff_clipboard(work_area, 0, hold.data(), hold.size(), 0);
 }