compilation fix; small menubar tweak

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3592 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-02-27 11:34:20 +00:00
parent 607ad8d3a7
commit d03f2aab75
4 changed files with 14 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2002-02-26 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* Menubar_pimpl.C (makeMenubar): ignore entries which are not
submenus in menubar.
2002-02-20 Angus Leeming <a.leeming@ic.ac.uk>
* FormForks.[Ch]:

View File

@ -122,8 +122,9 @@ void Menubar::Pimpl::makeMenubar(Menu const & menu)
FL_OBJECT * obj;
if (i->kind() != MenuItem::Submenu) {
lyxerr << "ERROR: Menubar::Pimpl::createMenubar:"
" only submenus can appear in a menubar";
break;
" only submenus can appear in a menubar"
<< endl;
continue;
}
string const label = i->label();
string const shortcut = "#" + i->shortcut();

View File

@ -1,3 +1,8 @@
2002-02-27 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* Makefile.am (SIGC_INCLUDES): add a -I directive for when
building outside of source tree.
2002-02-19 Angus Leeming <a.leeming@ic.ac.uk>
* forkedcall.[Ch]:

View File

@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libsupport.la
LIBS =
ETAGS_ARGS = --lang=c++
BOOST_INCLUDES = -I$(top_srcdir)/boost
SIGC_INCLUDES = -I$(top_srcdir)
SIGC_INCLUDES = -I$(top_srcdir) -I$(top_builddir)
INCLUDES = -I${srcdir}/../ $(SIGC_INCLUDES) $(BOOST_INCLUDES)
EXTRA_DIST = lyxstring.C lyxstring.h regex.c lyxregex.h \