X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FWorkArea.C;h=ea9324e037d1889905e6f870b78d77ec16bdf1cb;hb=32ef0d04c48a1751abbb5e3b17d1bec25f22c255;hp=33be3fd150aa0d667c1025a6721a849cab62aa18;hpb=fc8465aa1f6f29774d2f35d627b40198fa489cb1;p=lyx.git

diff --git a/src/WorkArea.C b/src/WorkArea.C
index 33be3fd150..ea9324e037 100644
--- 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"
@@ -357,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)"
@@ -397,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;
@@ -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);
 }