From aa3ddafe96d6b4e216cd39abd57bd4174cfa53ee Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Wed, 24 Mar 2004 17:03:02 +0000 Subject: [PATCH] GTK compile fixes. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8524 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/gtk/ChangeLog | 10 ++++++++++ src/frontends/gtk/GMenubar.C | 4 ++-- src/frontends/gtk/GToolbar.C | 4 ++-- src/frontends/gtk/lyx_gui.C | 14 ++------------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog index c85b401e9a..6f7b26a4fb 100644 --- a/src/frontends/gtk/ChangeLog +++ b/src/frontends/gtk/ChangeLog @@ -1,3 +1,13 @@ +2004-03-24 Angus Leeming + + * 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 * Makefile.am: remove mention of the forks dialog. diff --git a/src/frontends/gtk/GMenubar.C b/src/frontends/gtk/GMenubar.C index 91c7c90022..85bcae0b51 100644 --- a/src/frontends/gtk/GMenubar.C +++ b/src/frontends/gtk/GMenubar.C @@ -140,7 +140,7 @@ bool GMenubar::submenuDisabled(MenuItem const * item) { FuncStatus const flag = view_->getLyXFunc().getStatus(i->func()); - if (!flag.disabled()) + if (flag.enabled()) return false; break; } @@ -206,7 +206,7 @@ void GMenubar::onSubMenuActivate(MenuItem const * item, item.signal_activate().connect( SigC::bind(SigC::slot(*this, &GMenubar::onCommandActivate), &(*i), &item)); - if (flag.disabled()) + if (!flag.enabled()) item.set_sensitive(false); break; } diff --git a/src/frontends/gtk/GToolbar.C b/src/frontends/gtk/GToolbar.C index 71949c4def..85559b7ff1 100644 --- a/src/frontends/gtk/GToolbar.C +++ b/src/frontends/gtk/GToolbar.C @@ -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; diff --git a/src/frontends/gtk/lyx_gui.C b/src/frontends/gtk/lyx_gui.C index 05a988d467..53bad5f327 100644 --- a/src/frontends/gtk/lyx_gui.C +++ b/src/frontends/gtk/lyx_gui.C @@ -325,8 +325,6 @@ void lyx_gui::start(string const & batch, std::vector const & files) 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 const & files) std::vector::const_iterator cit = files.begin(); std::vector::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()) { -- 2.39.2