anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 19:14:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GTK compile fixes.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8524 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2004-03-24 17:03:02 +00:00
parent af6712f963
commit aa3ddafe96
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/frontends/gtk/ChangeLog
View File

@ -1,3 +1,13 @@
2004-03-24 Angus Leeming <leeming@lyx.org>
* 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 <leeming@lyx.org> 2004-03-17 Angus Leeming <leeming@lyx.org>
* Makefile.am: remove mention of the forks dialog. * Makefile.am: remove mention of the forks dialog.

4
src/frontends/gtk/GMenubar.C
View File

@ -140,7 +140,7 @@ bool GMenubar::submenuDisabled(MenuItem const * item)
{ {
FuncStatus const flag = FuncStatus const flag =
view_->getLyXFunc().getStatus(i->func()); view_->getLyXFunc().getStatus(i->func());
if (!flag.disabled()) if (flag.enabled())
return false; return false;
break; break;
} }
@ -206,7 +206,7 @@ void GMenubar::onSubMenuActivate(MenuItem const * item,
item.signal_activate().connect( item.signal_activate().connect(
SigC::bind(SigC::slot(*this, &GMenubar::onCommandActivate), SigC::bind(SigC::slot(*this, &GMenubar::onCommandActivate),
&(*i), &item)); &(*i), &item));
if (flag.disabled()) if (!flag.enabled())
item.set_sensitive(false); item.set_sensitive(false);
break; break;
} }

4
src/frontends/gtk/GToolbar.C
View File

@ -211,13 +211,13 @@ void GToolbar::update()
if (item->first.action == ToolbarBackend::LAYOUTS) { if (item->first.action == ToolbarBackend::LAYOUTS) {
LyXFunc const & lf = view_->getLyXFunc(); LyXFunc const & lf = view_->getLyXFunc();
bool const sensitive = bool const sensitive =
!lf.getStatus(FuncRequest(LFUN_LAYOUT)).disabled(); lf.getStatus(FuncRequest(LFUN_LAYOUT)).enabled();
widget->set_sensitive(sensitive); widget->set_sensitive(sensitive);
continue; continue;
} }
FuncStatus const status = view_-> FuncStatus const status = view_->
getLyXFunc().getStatus(item->first); getLyXFunc().getStatus(item->first);
bool sensitive = !status.disabled(); bool sensitive = status.enabled();
widget->set_sensitive(sensitive); widget->set_sensitive(sensitive);
if (it->get_type() != Gtk::TOOLBAR_CHILD_BUTTON) if (it->get_type() != Gtk::TOOLBAR_CHILD_BUTTON)
return; return;

14
src/frontends/gtk/lyx_gui.C
View File

@ -325,8 +325,6 @@ void lyx_gui::start(string const & batch, std::vector<string> const & files)
view.show(); view.show();
view.init(); view.init();
Buffer * last = 0;
// FIXME: some code below needs moving // FIXME: some code below needs moving
lyxserver = new LyXServer(&view.getLyXFunc(), lyxrc.lyxpipes); lyxserver = new LyXServer(&view.getLyXFunc(), lyxrc.lyxpipes);
@ -335,16 +333,8 @@ void lyx_gui::start(string const & batch, std::vector<string> const & files)
std::vector<string>::const_iterator cit = files.begin(); std::vector<string>::const_iterator cit = files.begin();
std::vector<string>::const_iterator end = files.end(); std::vector<string>::const_iterator end = files.end();
for (; cit != end; ++cit) { for (; cit != end; ++cit)
Buffer * b = bufferlist.newBuffer(*cit); view.view()->loadLyXFile(*cit, true);
if (loadLyXFile(b, *cit))
last = b;
}
// switch to the last buffer successfully loaded
if (last) {
view.view()->buffer(last);
}
// handle the batch commands the user asked for // handle the batch commands the user asked for
if (!batch.empty()) { if (!batch.empty()) {