Fix deleting of paragraphs after undo (fix #236).

[lyx.git] / src / WorkArea.C

diff --git a/src/WorkArea.C b/src/WorkArea.C
index ad4751de09e88104465aac971c3e679018c0cf66..7b028ef122966cb1b47716aa94a61582c1f94193 100644 (file)
--- a/src/WorkArea.C
+++ b/src/WorkArea.C
@@ -37,8 +37,7 @@ FL_APPEVENT_CB fl_set_preemptive_callback(Window, FL_APPEVENT_CB, void *);
  
 using std::endl;
 using std::abs;
-
-FL_OBJECT * figinset_canvas;
+using std::hex;
 
 namespace {
 
@@ -83,8 +82,6 @@ WorkArea::WorkArea(int xpos, int ypos, int width, int height)
 {
        fl_freeze_all_forms();
 
-       figinset_canvas = 0;
-
        if (lyxerr.debugging(Debug::WORKAREA))
                lyxerr << "Creating work area: +"
                       << xpos << '+' << ypos << ' '
@@ -93,14 +90,6 @@ WorkArea::WorkArea(int xpos, int ypos, int width, int height)
        FL_OBJECT * obj;
        int const bw = int(abs(fl_get_border_width()));
 
-       // We really want to get rid of figinset_canvas.
-       ::figinset_canvas = figinset_canvas = obj =
-                 fl_add_canvas(FL_NORMAL_CANVAS,
-                               xpos + 1, ypos + 1, 1, 1, "");
-       fl_set_object_boxtype(obj, FL_NO_BOX);
-       fl_set_object_resize(obj, FL_RESIZE_ALL);
-       fl_set_object_gravity(obj, NorthWestGravity, NorthWestGravity);
-
        // a box
        if (lyxerr.debugging(Debug::WORKAREA))
                lyxerr << "\tbackground box: +"
@@ -354,7 +343,7 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
 
        if (!area) return 1;
        
-       switch (event){
+       switch (event) {
        case FL_DRAW:
                if (!area->work_area ||
                    !area->work_area->form->visible)
@@ -614,8 +603,8 @@ string const WorkArea::getClipboard() const
                if (fl_check_forms() == FL_EVENT) {
                        fl_XNextEvent(&ev);
                        lyxerr << "Received unhandled X11 event" << endl; 
-                       lyxerr << "Type: 0x" << std::hex << ev.xany.type <<
-                               "Target: 0x" << std::hex << ev.xany.window << endl;
+                       lyxerr << "Type: 0x" << hex << ev.xany.type <<
+                               " Target: 0x" << hex << ev.xany.window << endl;
                }
        }
        return clipboard_selection;