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

[lyx.git] / src / insets / insetindex.C

diff --git a/src/insets/insetindex.C b/src/insets/insetindex.C
index 5344ec2b3a739604fb310d4eab90d187711ecc21..035c3dd51169421205147b166d25d3000b203377 100644 (file)
--- a/src/insets/insetindex.C
+++ b/src/insets/insetindex.C
@@ -9,7 +9,7 @@
 #include FORMS_H_LOCATION  
 #include "insetindex.h"
 #include "buffer.h"
-#include "error.h"
+#include "debug.h"
 #include "LaTeXFeatures.h"
 #include "gettext.h"
 #include "LString.h"
@@ -20,8 +20,7 @@ extern void UpdateInset(Inset* inset, bool mark_dirty = true);
 
 FD_index_form *index_form = 0;
 
-static
-void index_cb(FL_OBJECT *, long data)
+extern "C" void index_cb(FL_OBJECT *, long data)
 {
        InsetIndex *inset = (InsetIndex*)index_form->vdata;
        
@@ -36,7 +35,7 @@ void index_cb(FL_OBJECT *, long data)
 // -       }
        case 1: // OK
                if(!current_view->currentBuffer()->isReadonly()) {
-                       LString tmp = fl_get_input(index_form->key);
+                       string tmp = fl_get_input(index_form->key);
                        if(tmp != inset->getContents()) {
                                inset->setContents(tmp);
                                fl_hide_form(index_form->index_form);
@@ -80,7 +79,7 @@ FD_index_form *create_form_index_form()
 /*---------------------------------------*/
 
 
-InsetIndex::InsetIndex(LString const & key)
+InsetIndex::InsetIndex(string const & key)
        : InsetCommand("index", key) 
 {
 }
@@ -115,7 +114,7 @@ void InsetIndex::Edit(int, int)
 }
 
 
-LString InsetIndex::getScreenLabel() const
+string InsetIndex::getScreenLabel() const
 {
        return _("Idx");
 }
@@ -128,7 +127,7 @@ LString InsetIndex::getScreenLabel() const
 InsetPrintIndex::InsetPrintIndex()
        : InsetCommand("printindex")
 {
-       owner = NULL;
+       owner = 0;
 }
 
 
@@ -143,7 +142,7 @@ InsetPrintIndex::~InsetPrintIndex()
 }
 
 
-LString InsetPrintIndex::getScreenLabel() const
+string InsetPrintIndex::getScreenLabel() const
 {
        return _("PrintIndex");
 }