Lars Gullik Bjønnes wrote:
[EMAIL PROTECTED] (Lars Gullik Bjønnes) writes:
| This patch makes it compile (and probably breaks qt), but xforms fails
| brutally upon start up.
This patch even makes it run, albeit with a grabled screen. The gui
operations (adding objects and such) are done in the wrong order.
The next patch solves this?
+// X11 use a define called CursorShape, and we really want to use
+// that name our selves. Therefore we do something similar to what is done
+// in kde/fixx11h.h:
I was tempted to do that also but I've read about this X11 CursorShape
so I've let it be.
XFormsView::XFormsView(Gui & owner, int width, int height)
: LyXView(owner),
window_(Box(width, height)),
- icon_pixmap_(0), icon_mask_(0), frontend_(*this)
+ icon_pixmap_(0), icon_mask_(0)
Ah... I forgot that one.
{
int const air = 2;
@@ -108,7 +108,6 @@
menubar_.reset(new XFormsMenubar(this, menubackend));
getToolbars().init();
- bufferview_.reset(new BufferView(this, width, height));
And this one...
// Make sure the buttons are disabled if needed.
- updateToolbars();
+ //updateToolbars();
Are you sure about this change? I haven't touched at the toolbars and
menubars API yet.
Index: src/frontends/xforms/GuiImplementation.C
===================================================================
--- src/frontends/xforms/GuiImplementation.C (revision 0)
+++ src/frontends/xforms/GuiImplementation.C (revision 0)
FYI, the reason I implemented everything in the header with the typedef
trick is that it enables to have a common part for qt3, gtk and xforms.
This way, once the qt3 was ready, I just had to copy and paste the
common part to gtk and xforms.
The rest looks good to me.
Index: src/frontends/GuiCursor.C
===================================================================
--- src/frontends/GuiCursor.C (revision 14200)
+++ src/frontends/GuiCursor.C (working copy)
@@ -42,10 +42,6 @@
#include "support/filetools.h" // LibFileSearch
-#include <boost/utility.hpp>
-#include <boost/bind.hpp>
-#include <boost/signals/trackable.hpp>
-
This was a remnant of qscreen, thanks for cleaning that.
Thanks,
Abdel.
