removed a warning from screen and added CFLAGS in lyx.spec.in.

[lyx.git] / src / lyx_cb.h

diff --git a/src/lyx_cb.h b/src/lyx_cb.h
index 5e6c26ce894979dd2624356c9ed35a0df5385815..503733ff2baa57574a4015f68174d6f59167ae1e 100644 (file)
--- a/src/lyx_cb.h
+++ b/src/lyx_cb.h
@@ -1,10 +1,11 @@
 // -*- C++ -*-
-#ifndef _LYX_CB_H
-#define _LYX_CB_H
+#ifndef LYX_CB_H
+#define LYX_CB_H
 
 #include FORMS_H_LOCATION
 
-class LString;
+#include "LString.h"
+
 class Inset;
 
 ///
@@ -15,7 +16,7 @@ extern bool quitting;
 extern bool BindFileSet;
 
 ///
-extern void FootCB(FL_OBJECT *, long);
+extern "C" void FootCB(FL_OBJECT *, long);
 ///
 extern void EmphCB();
 ///
@@ -23,17 +24,17 @@ extern void BoldCB();
 ///
 extern void NounCB();
 ///
-extern void MarginCB(FL_OBJECT *, long);
+extern "C" void MarginCB(FL_OBJECT *, long);
 ///
-extern void FigureCB(FL_OBJECT *, long);
+extern "C" void FigureCB(FL_OBJECT *, long);
 ///
-extern void TableCB(FL_OBJECT *, long);
+extern "C" void TableCB(FL_OBJECT *, long);
 ///
-extern void MeltCB(FL_OBJECT *, long);
+extern "C" void MeltCB(FL_OBJECT *, long);
 ///
 extern void TexCB();
 ///
-extern void DepthCB(FL_OBJECT *, long);
+extern "C" void DepthCB(FL_OBJECT *, long);
 ///
 extern void FreeCB();
 ///
@@ -61,9 +62,9 @@ extern void StyleResetCB();
 ///
 extern void UnderlineCB();
 ///
-extern void FontSizeCB(LString const &);
+extern void FontSizeCB(string const &);
 ///
-extern LString CurrentState();
+extern string CurrentState();
 ///
 extern void AllowInput();