FYI. Just stuff to make it compile.
--
Angus
Index: src/frontends/gtk/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/ChangeLog,v
retrieving revision 1.23
diff -u -p -r1.23 ChangeLog
--- src/frontends/gtk/ChangeLog 17 Mar 2004 21:21:45 -0000 1.23
+++ src/frontends/gtk/ChangeLog 24 Mar 2004 16:59:36 -0000
@@ -1,3 +1,13 @@
+2004-03-24 Angus Leeming <[EMAIL PROTECTED]>
+
+ * GMenubar.C (submenuDisabled, onSubMenuActivate): compile fixes
+ due to the changes in FuncStatus.
+
+ * GToolbar.C (update): ditto.
+
+ * lyx_gui.C (start): remove code to order buffers as it no longer
+ compiles and none of the other frontends do this anymore.
+
2004-03-17 Angus Leeming <[EMAIL PROTECTED]>
* Makefile.am: remove mention of the forks dialog.
Index: src/frontends/gtk/GMenubar.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/GMenubar.C,v
retrieving revision 1.7
diff -u -p -r1.7 GMenubar.C
--- src/frontends/gtk/GMenubar.C 28 Oct 2003 16:45:08 -0000 1.7
+++ src/frontends/gtk/GMenubar.C 24 Mar 2004 16:59:36 -0000
@@ -140,7 +140,7 @@ bool GMenubar::submenuDisabled(MenuItem
{
FuncStatus const flag =
view_->getLyXFunc().getStatus(i->func());
- if (!flag.disabled())
+ if (flag.enabled())
return false;
break;
}
@@ -206,7 +206,7 @@ void GMenubar::onSubMenuActivate(MenuIte
item.signal_activate().connect(
SigC::bind(SigC::slot(*this, &GMenubar::onCommandActivate),
&(*i), &item));
- if (flag.disabled())
+ if (!flag.enabled())
item.set_sensitive(false);
break;
}
Index: src/frontends/gtk/GToolbar.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/GToolbar.C,v
retrieving revision 1.10
diff -u -p -r1.10 GToolbar.C
--- src/frontends/gtk/GToolbar.C 30 Oct 2003 17:58:06 -0000 1.10
+++ src/frontends/gtk/GToolbar.C 24 Mar 2004 16:59:36 -0000
@@ -211,13 +211,13 @@ void GToolbar::update()
if (item->first.action == ToolbarBackend::LAYOUTS) {
LyXFunc const & lf = view_->getLyXFunc();
bool const sensitive =
- !lf.getStatus(FuncRequest(LFUN_LAYOUT)).disabled();
+ lf.getStatus(FuncRequest(LFUN_LAYOUT)).enabled();
widget->set_sensitive(sensitive);
continue;
}
FuncStatus const status = view_->
getLyXFunc().getStatus(item->first);
- bool sensitive = !status.disabled();
+ bool sensitive = status.enabled();
widget->set_sensitive(sensitive);
if (it->get_type() != Gtk::TOOLBAR_CHILD_BUTTON)
return;
Index: src/frontends/gtk/lyx_gui.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/lyx_gui.C,v
retrieving revision 1.13
diff -u -p -r1.13 lyx_gui.C
--- src/frontends/gtk/lyx_gui.C 15 Oct 2003 10:55:42 -0000 1.13
+++ src/frontends/gtk/lyx_gui.C 24 Mar 2004 16:59:36 -0000
@@ -325,8 +325,6 @@ void lyx_gui::start(string const & batch
view.show();
view.init();
- Buffer * last = 0;
-
// FIXME: some code below needs moving
lyxserver = new LyXServer(&view.getLyXFunc(), lyxrc.lyxpipes);
@@ -335,16 +333,8 @@ void lyx_gui::start(string const & batch
std::vector<string>::const_iterator cit = files.begin();
std::vector<string>::const_iterator end = files.end();
- for (; cit != end; ++cit) {
- Buffer * b = bufferlist.newBuffer(*cit);
- if (loadLyXFile(b, *cit))
- last = b;
- }
-
- // switch to the last buffer successfully loaded
- if (last) {
- view.view()->buffer(last);
- }
+ for (; cit != end; ++cit)
+ view.view()->loadLyXFile(*cit, true);
// handle the batch commands the user asked for
if (!batch.empty()) {
