From: John Levon <levon@movementarian.org>
Date: Fri, 30 Aug 2002 16:36:02 +0000 (+0000)
Subject: build fix
X-Git-Tag: 1.6.10~18382
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ebfa493a4130cd590405efecdd426f0fb0daea69;p=features.git

build fix


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

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 1369e0a493..2fa73b20f9 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-30  John Levon  <levon@movementarian.org>
+
+	* MathsCallbacks.h:
+	* forms/fdfix.sh: fix build from last change
+ 
 2002-08-30  John Levon  <levon@movementarian.org>
 
 	* MathsSymbols.h:
diff --git a/src/frontends/xforms/FormMathsPanel.h b/src/frontends/xforms/FormMathsPanel.h
index 2da2bfb08c..382f630de2 100644
--- a/src/frontends/xforms/FormMathsPanel.h
+++ b/src/frontends/xforms/FormMathsPanel.h
@@ -18,34 +18,7 @@
 #pragma interface
 #endif
 
-/// values used by the xforms callbacks
-enum MathsCallbackValues {
-	MM_GREEK,
-	MM_ARROW,
-	MM_BOP,
-	MM_BRELATS,
-	MM_VARSIZE,
-	MM_MISC,
-	MM_FRAC,
-	MM_SQRT,
-	MM_DELIM,
-	MM_SUPER,
-	MM_SUB,
-	MM_SUBSUPER,
-	MM_MATRIX,
-	MM_EQU,
-	MM_DECO,
-	MM_SPACE,
-	MM_STYLE,
-	MM_DOTS,
-	MM_AMS_MISC,
-	MM_AMS_ARROWS,
-	MM_AMS_BREL,
-	MM_AMS_NREL,
-	MM_AMS_OPS,
-	MM_FUNC
-};
-
+#include "MathsCallbacks.h"
 #include "FormBaseDeprecated.h"
 
 #include <boost/scoped_ptr.hpp>
@@ -68,10 +41,10 @@ public:
 	FormMathsPanel(LyXView &, Dialogs &);
 	///
 	void setActive(FormMathsSub *) const;
-	/// dispatch a symbol insert
-	void insertSymbol(string const & sym, bool bs = true) const;
 	/// dispatch an LFUN:
 	void dispatchFunc(kb_action action) const;
+	/// dispatch a symbol insert
+	void insertSymbol(string const & sym, bool bs = true) const;
 private:
 	/// Pointer to the actual instantiation of the ButtonController.
 	virtual xformsBC & bc();
diff --git a/src/frontends/xforms/Makefile.am b/src/frontends/xforms/Makefile.am
index edc9780b01..93dbf037ae 100644
--- a/src/frontends/xforms/Makefile.am
+++ b/src/frontends/xforms/Makefile.am
@@ -147,6 +147,7 @@ libxforms_la_SOURCES = \
 	FormVCLog.h \
 	LyXKeySymFactory.C \
 	LyXScreenFactory.C \
+	MathsCallbacks.h \
 	Menubar_pimpl.C \
 	Menubar_pimpl.h \
 	RadioButtonGroup.C \
diff --git a/src/frontends/xforms/MathsCallbacks.h b/src/frontends/xforms/MathsCallbacks.h
new file mode 100644
index 0000000000..04275a9020
--- /dev/null
+++ b/src/frontends/xforms/MathsCallbacks.h
@@ -0,0 +1,40 @@
+/**
+ * \file MathsCallbacks.h
+ * Copyright 2002 the LyX Team
+ * Read the file COPYING
+ *
+ * \author John Levon <levon@movementarian.org>
+ */
+
+#ifndef MATHSCALLBACKS_H
+#define MATHSCALLBACKS_H
+ 
+/// values used by the xforms callbacks
+enum MathsCallbackValues {
+	MM_GREEK,
+	MM_ARROW,
+	MM_BOP,
+	MM_BRELATS,
+	MM_VARSIZE,
+	MM_MISC,
+	MM_FRAC,
+	MM_SQRT,
+	MM_DELIM,
+	MM_SUPER,
+	MM_SUB,
+	MM_SUBSUPER,
+	MM_MATRIX,
+	MM_EQU,
+	MM_DECO,
+	MM_SPACE,
+	MM_STYLE,
+	MM_DOTS,
+	MM_AMS_MISC,
+	MM_AMS_ARROWS,
+	MM_AMS_BREL,
+	MM_AMS_NREL,
+	MM_AMS_OPS,
+	MM_FUNC
+};
+
+#endif // MATHSCALLBACKS_H
diff --git a/src/frontends/xforms/forms/fdfix.sh b/src/frontends/xforms/forms/fdfix.sh
index 0fd3bcb16c..b3a30c0121 100644
--- a/src/frontends/xforms/forms/fdfix.sh
+++ b/src/frontends/xforms/forms/fdfix.sh
@@ -123,7 +123,7 @@ fi
 # Angus 12 June, 2002.
 grep MM_ ${CIN} > /dev/null
 if [ $? -eq 0 ]; then
-    echo "#include \"MathsSymbols.h\"" >> ${COUT}
+    echo "#include \"MathsCallbacks.h\"" >> ${COUT}
 fi
 
 echo >> ${COUT}