Remove unused font variable which caused a warning.

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 2d706ca101659a6dd497426450fd3f5aa0a3d67f..bc964a50ca9572da5eb52a67a2a7e902ad4020ec 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -12,8 +12,14 @@
 
 #include "Lsstream.h"
 
+#if 0
 #include <time.h>
 #include <locale.h>
+#else
+#include <ctime>
+#include <clocale>
+#endif
+
 #include <utility> 
 #include <algorithm> 
 
@@ -53,9 +59,11 @@
 #include "insets/insetmarginal.h"
 #include "insets/insetminipage.h"
 #include "insets/insetfloat.h"
+#if 0
 #include "insets/insetlist.h"
-#include "insets/insettabular.h"
 #include "insets/insettheorem.h"
+#endif
+#include "insets/insettabular.h"
 #include "insets/insetcaption.h"
 #include "mathed/formulamacro.h"
 #include "mathed/math_cursor.h"
@@ -572,6 +580,7 @@ func_status::value_type LyXFunc::getStatus(int ac,
 
        // we just need to be in math mode to enable that
        case LFUN_MATH_SIZE: 
+       case LFUN_MATH_SPACE:
        case LFUN_MATH_LIMITS: 
        case LFUN_MATH_NONUMBER: 
        case LFUN_MATH_NUMBER:
@@ -600,12 +609,14 @@ func_status::value_type LyXFunc::getStatus(int ac,
        case LFUN_INSET_ERT:
                code = Inset::ERT_CODE;         
                break;
+       case LFUN_FIGURE:
        case LFUN_INSET_GRAPHICS:
                code = Inset::GRAPHICS_CODE;
                break;
        case LFUN_INSET_FOOTNOTE:
                code = Inset::FOOT_CODE;
                break;
+       case LFUN_DIALOG_TABULAR_INSERT:
        case LFUN_INSET_TABULAR:
                code = Inset::TABULAR_CODE;
                break;
@@ -622,14 +633,17 @@ func_status::value_type LyXFunc::getStatus(int ac,
        case LFUN_INSET_WIDE_FLOAT:
                code = Inset::FLOAT_CODE;
                break;
+       case LFUN_FLOAT_LIST:
+               code = Inset::FLOAT_LIST_CODE;
+               break;
 #if 0
        case LFUN_INSET_LIST:
                code = Inset::LIST_CODE;
                break;
-#endif
        case LFUN_INSET_THEOREM:
                code = Inset::THEOREM_CODE;
                break;
+#endif
        case LFUN_INSET_CAPTION:
                code = Inset::CAPTION_CODE;
                break;
@@ -642,6 +656,7 @@ func_status::value_type LyXFunc::getStatus(int ac,
        case LFUN_REF_INSERT:
                code = Inset::REF_CODE;
                break;
+       case LFUN_CITATION_CREATE:
        case LFUN_CITATION_INSERT:
                code = Inset::CITE_CODE;
                break;
@@ -650,22 +665,39 @@ func_status::value_type LyXFunc::getStatus(int ac,
                break;
        case LFUN_INDEX_INSERT:
        case LFUN_INDEX_INSERT_LAST:
+       case LFUN_INDEX_CREATE:
                code = Inset::INDEX_CODE;
                break;
-#if 0
+       case LFUN_INDEX_PRINT:
+               code = Inset::INDEX_PRINT_CODE;
+               break;
        case LFUN_CHILD_INSERT:
-               code = Inset::CHILD_CODE;
+               code = Inset::INCLUDE_CODE;
                break;
-#endif
        case LFUN_TOC_INSERT:
                code = Inset::TOC_CODE;
                break;
        case LFUN_PARENTINSERT:
                code = Inset::PARENT_CODE;
                break;
+       case LFUN_HTMLURL:
+       case LFUN_URL:
        case LFUN_INSERT_URL:
                code = Inset::URL_CODE;
                break;
+       case LFUN_QUOTE:
+               // always allow this, since we will inset a raw quote
+               // if an inset is not allowed.
+               break;
+       case LFUN_HYPHENATION:
+       case LFUN_LIGATURE_BREAK:
+       case LFUN_HFILL:
+       case LFUN_MENU_SEPARATOR:
+       case LFUN_LDOTS:
+       case LFUN_END_OF_SENTENCE:
+       case LFUN_PROTECTEDSPACE:
+               code = Inset::SPECIALCHAR_CODE;
+               break;
        default:
                break;
        }
@@ -774,9 +806,13 @@ string const LyXFunc::dispatch(int ac,
                owner->view()->hideCursor();
 
        // We cannot use this function here
-       if (getStatus(ac, do_not_use_this_arg) & func_status::Disabled)
+       if (getStatus(ac, do_not_use_this_arg) & func_status::Disabled) {
+               lyxerr << "LyXFunc::Dispatch: "
+                      << lyxaction.getActionName(ac)
+                      << " [" << ac << "] is disabled ad this location"
+                      << endl;
                goto exit_with_message;
-
+       }
 
        if (owner->view()->available() && owner->view()->theLockingInset()) {
                UpdatableInset::RESULT result;