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 f1ffab7c70a3f015a062a1cbe3782793a46b7f1c..ea9324e037d1889905e6f870b78d77ec16bdf1cb 100644 (file)
--- a/src/WorkArea.C
+++ b/src/WorkArea.C
@@ -356,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)"
@@ -396,7 +396,7 @@ 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
@@ -525,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);
 }