From d03f2aab759c14f70b7e91529ab9d06d7bb5c52a Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 27 Feb 2002 11:34:20 +0000 Subject: [PATCH] compilation fix; small menubar tweak git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3592 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 5 +++++ src/frontends/xforms/Menubar_pimpl.C | 5 +++-- src/support/ChangeLog | 5 +++++ src/support/Makefile.am | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 00d070ea89..13ec480911 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ +2002-02-26 Jean-Marc Lasgouttes + + * Menubar_pimpl.C (makeMenubar): ignore entries which are not + submenus in menubar. + 2002-02-20 Angus Leeming * FormForks.[Ch]: diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C index aa36561095..06ada66362 100644 --- a/src/frontends/xforms/Menubar_pimpl.C +++ b/src/frontends/xforms/Menubar_pimpl.C @@ -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(); diff --git a/src/support/ChangeLog b/src/support/ChangeLog index 4045531aed..79caa3932c 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,8 @@ +2002-02-27 Jean-Marc Lasgouttes + + * Makefile.am (SIGC_INCLUDES): add a -I directive for when + building outside of source tree. + 2002-02-19 Angus Leeming * forkedcall.[Ch]: diff --git a/src/support/Makefile.am b/src/support/Makefile.am index 3462a57536..8580cbaf58 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -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 \