From a810f13e94df591b9d0a0c576e7c77f63c10a6f7 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 16 Mar 2001 14:47:48 +0000
Subject: [PATCH] compilation fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1785 a592a061-630c-0410-9148-cb99ea01b6c8
---
 INSTALL                          | 2 +-
 src/frontends/xforms/ChangeLog   | 5 +++++
 src/frontends/xforms/FormMaths.C | 4 ++--
 src/mathed/ChangeLog             | 4 ++++
 src/mathed/math_rowst.C          | 1 +
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/INSTALL b/INSTALL
index 30c7c6cb84..13af00e815 100644
--- a/INSTALL
+++ b/INSTALL
@@ -297,7 +297,7 @@ notify us.
   o Configure will seemingly fail to find xpm.h and forms.h on linux
     if the kernel headers are not available. Two cases are possible: 
 
-      - you have not installed the kernel sources. The you should
+      - you have not installed the kernel sources. Then you should
         install them or at least the kernel-headers package (or
         whatever it is called in your distribution).
 
diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index c610bb4974..7b8734e5a6 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-16  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* FormMaths.C (C_FormMathsDelimCB): add usual .c_str() for lyxstring
+	compatibility. 
+
 2001-03-16  Angus Leeming  <a.leeming@ic.ac.uk>
 
 	* Form_various.h: cleaned up #includes and forward declarations.
diff --git a/src/frontends/xforms/FormMaths.C b/src/frontends/xforms/FormMaths.C
index d20d53db27..975bf6a5e7 100644
--- a/src/frontends/xforms/FormMaths.C
+++ b/src/frontends/xforms/FormMaths.C
@@ -149,13 +149,13 @@ extern "C" void C_FormMathsDelimCB(FL_OBJECT * ob, long data)
  
 	switch (val) {
 		case MM_OK:
-	      		form->insertDelim(ost.str());
+	      		form->insertDelim(ost.str().c_str());
 		case MM_CLOSE:
 			fl_hide_form(form->delim_->form);
 			break;
 
 		case MM_APPLY:
-			form->insertDelim(ost.str());
+			form->insertDelim(ost.str().c_str());
 			break;
 
 		/* the bmtable */
diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 1199d8883e..722696fbb4 100644
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-16  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* math_rowst.C: add missing #include <config.h>.
+
 2001-03-16  André Pönitz  <poenitz@htwm.de>
 
 	* math_matrixinset.h:
diff --git a/src/mathed/math_rowst.C b/src/mathed/math_rowst.C
index 13aab03ab3..94a94c4da9 100644
--- a/src/mathed/math_rowst.C
+++ b/src/mathed/math_rowst.C
@@ -1,3 +1,4 @@
+#include <config.h>
 
 #include "math_rowst.h"
 #include "support/LAssert.h"