compilation fix; small menubar tweak

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3592 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 00d070ea890dbbdeeb28a8167d543c0007d4495f..13ec4809112080861530d08e9bb4f7671f41a714 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -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]:

diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C
index aa36561095d3cc5ddc9a106b79ad2280fd3172a7..06ada66362fb2c07ac0054db7224f7bdc0ccb05d 100644 (file)
--- 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 4045531aed0c0f10ca414082323e2f029d34a408..79caa3932c8ea8cec1b74155b630d446879b7b98 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -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]:

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 3462a57536966fb0ff9d26d616f60da68c65dd7c..8580cbaf58c2a9820c707859e8f284c3589adbe4 100644 (file)
--- 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 \