Hello,
With the attached patch, the qt3 frontend in the "younes" branch has
exactly the same functionality as in "trunk". I have tested it quite a
lot. I expect the xforms and gtk frontends to behave the same as they
share the same encapsulation code (of the old API into the new API) as qt3.
IMHO the only thing to do before merging to trunk is to agree on the
namespace issue. I like Angus idea that namespaces are named after
directories.
Lars, Jean-Marc please express your opinions.
Abdel.
Index: gtk/Gui.h
===================================================================
--- gtk/Gui.h (revision 14091)
+++ gtk/Gui.h (working copy)
@@ -56,6 +56,7 @@
old_screen_.reset(new FScreen(*old_work_area_.get()));
work_area_.reset(new WorkArea(owner_, w, h, old_screen_.get(),
old_work_area_.get()));
clipboard_.reset(new Clipboard(old_work_area_.get()));
+ cursor().connect(work_area_.get());
}
WorkArea& workArea(size_t id)
Index: GuiCursor.C
===================================================================
--- GuiCursor.C (revision 14091)
+++ GuiCursor.C (working copy)
@@ -107,6 +107,8 @@
y -= asc;
//lyxerr << "Cursor::show x: " << x << " y: " << y << endl;
+ BOOST_ASSERT(work_area_);
+
// if it doesn't touch the screen, don't try to show it
if (y + h < 0 || y >= work_area_->height())
return;
@@ -122,6 +124,7 @@
return;
cursor_visible_ = false;
+ BOOST_ASSERT(work_area_);
work_area_->removeCursor();
}
Index: qt3/Gui.h
===================================================================
--- qt3/Gui.h (revision 14092)
+++ qt3/Gui.h (working copy)
@@ -54,6 +54,7 @@
old_screen_.reset(new FScreen(*old_work_area_.get()));
work_area_.reset(new WorkArea(owner_, w, h, old_screen_.get(),
old_work_area_.get()));
clipboard_.reset(new Clipboard(old_work_area_.get()));
+ cursor().connect(work_area_.get());
}
WorkArea& workArea(size_t id)
Index: xforms/Gui.h
===================================================================
--- xforms/Gui.h (revision 14091)
+++ xforms/Gui.h (working copy)
@@ -56,6 +56,7 @@
old_screen_.reset(new FScreen(*old_work_area_.get()));
work_area_.reset(new WorkArea(owner_, w, h, old_screen_.get(),
old_work_area_.get()));
clipboard_.reset(new Clipboard(old_work_area_.get()));
+ cursor().connect(work_area_.get());
}
WorkArea& workArea(size_t id)
