mathed31.diff

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 600702e32e7326adb49a4834ac1985de84bdf079..8a3e757772b4d97e2dfb78401ea28609e17b7204 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -100,9 +100,6 @@ extern bool selection_possible;
 
 extern kb_keymap * toplevel_keymap;
 
-#if 0
-extern void MenuFax(Buffer *);
-#endif
 extern void show_symbols_form(LyXFunc *);
 
 extern LyXAction lyxaction;
@@ -359,17 +356,10 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
                disable = !Exporter::IsExportable(buf, "dvi")
                        || lyxrc.print_command == "none";
                break;
-#if 0
-       case LFUN_FAX:
-               disable = !Exporter::IsExportable(buf, "ps")
-                       || lyxrc.fax_command == "none";
-               break;
-#else
        case LFUN_EXPORT:
                disable = argument == "fax" &&
                        !Exporter::IsExportable(buf, argument);
                break;
-#endif
        case LFUN_UNDO:
                disable = buf->undostack.empty();
                break;
@@ -835,12 +825,6 @@ string const LyXFunc::Dispatch(int ac,
                owner->getDialogs()->showPrint();
                break;
 
-#if 0
-       case LFUN_FAX:
-               MenuFax(owner->buffer());
-               break;
-#endif
-               
        case LFUN_EXPORT:
                Exporter::Export(owner->buffer(), argument, false);
                break;
@@ -1590,12 +1574,7 @@ string const LyXFunc::Dispatch(int ac,
                owner->view()->update(owner->view()->text, BufferView::UPDATE);
                owner->view()->cursorPrevious(text);
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, false);
-               else
-#endif
-                   moveCursorUpdate(text, false);
+               moveCursorUpdate(text, false);
                owner->showState();
                break;
                
@@ -1605,12 +1584,7 @@ string const LyXFunc::Dispatch(int ac,
                owner->view()->update(owner->view()->text, BufferView::UPDATE);
                owner->view()->cursorNext(text);
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, false);
-               else
-#endif
-                   moveCursorUpdate(text, false);
+               moveCursorUpdate(text, false);
                owner->showState();
                break;
                
@@ -1656,10 +1630,6 @@ string const LyXFunc::Dispatch(int ac,
                else
                        text->CursorRightOneWord(owner->view());
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-#endif
                moveCursorUpdate(text, false);
                owner->showState();
                break;
@@ -1673,10 +1643,6 @@ string const LyXFunc::Dispatch(int ac,
                else
                        text->CursorLeftOneWord(owner->view());
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-#endif
                moveCursorUpdate(text, false);
                owner->showState();
                break;
@@ -1769,13 +1735,7 @@ string const LyXFunc::Dispatch(int ac,
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                owner->view()->cursorPrevious(text);
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner) {
-                   text->SetSelection(owner->view());
-                   owner->view()->updateInset(text->inset_owner, false);
-               } else
-#endif
-                   moveCursorUpdate(text, true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
@@ -1783,12 +1743,7 @@ string const LyXFunc::Dispatch(int ac,
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                owner->view()->cursorNext(text);
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, false);
-               else
-#endif
-                   moveCursorUpdate(text, true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
@@ -1796,13 +1751,7 @@ string const LyXFunc::Dispatch(int ac,
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->CursorHome(owner->view());
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner) {
-                   text->SetSelection(owner->view());
-                   owner->view()->updateInset(text->inset_owner, false);
-               } else
-#endif
-                   moveCursorUpdate(text, true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
@@ -1810,13 +1759,7 @@ string const LyXFunc::Dispatch(int ac,
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->CursorEnd(owner->view());
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner) {
-                   text->SetSelection(owner->view());
-                   owner->view()->updateInset(text->inset_owner, false);
-               } else
-#endif
-                   moveCursorUpdate(text, true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
@@ -1827,13 +1770,7 @@ string const LyXFunc::Dispatch(int ac,
                else
                        text->CursorRightOneWord(owner->view());
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner) {
-                   text->SetSelection(owner->view());
-                   owner->view()->updateInset(text->inset_owner, false);
-               } else
-#endif
-                   moveCursorUpdate(text, true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
@@ -1844,13 +1781,7 @@ string const LyXFunc::Dispatch(int ac,
                else
                        text->CursorLeftOneWord(owner->view());
                owner->view()->text->FinishUndo();
-#if 0
-               if (text->inset_owner) {
-                   text->SetSelection(owner->view());
-                   owner->view()->updateInset(text->inset_owner, false);
-               } else
-#endif
-                   moveCursorUpdate(text, true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
@@ -1912,10 +1843,6 @@ string const LyXFunc::Dispatch(int ac,
                        setMessage(N_("Mark set"));
                }
                text->sel_cursor = text->cursor;
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-#endif
                break;
                
        case LFUN_DELETE:
@@ -1987,10 +1914,6 @@ string const LyXFunc::Dispatch(int ac,
        case LFUN_DELETE_WORD_FORWARD:
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->DeleteWordForward(owner->view());
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-#endif
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                moveCursorUpdate(text, false);
                owner->showState();
@@ -2000,10 +1923,6 @@ string const LyXFunc::Dispatch(int ac,
        case LFUN_DELETE_WORD_BACKWARD:
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->DeleteWordBackward(owner->view());
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-#endif
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                moveCursorUpdate(text, false);
                owner->showState();
@@ -2013,10 +1932,6 @@ string const LyXFunc::Dispatch(int ac,
        case LFUN_DELETE_LINE_FORWARD:
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->DeleteLineForward(owner->view());
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-#endif
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                moveCursorUpdate(text, false);
                break;
@@ -2027,10 +1942,6 @@ string const LyXFunc::Dispatch(int ac,
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->sel_cursor = text->cursor;
                setMessage(N_("Mark off"));
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-#endif
                break;
 
                /* -------> Set mark on. */
@@ -2039,10 +1950,6 @@ string const LyXFunc::Dispatch(int ac,
                text->mark_set = 1;
                owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->sel_cursor = text->cursor;
-#if 0
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-#endif
                setMessage(N_("Mark on"));
                break;
                
@@ -3064,17 +2971,9 @@ string const LyXFunc::Dispatch(int ac,
                                if (greek_kb_flag) {
                                        if (!math_insert_greek(owner->view(),
                                                               argument[i]))
-#if 0
-                                               owner->getIntl()->getTrans()->TranslateAndInsert(argument[i], owner->view()->text);
-#else
                                                owner->getIntl()->getTrans().TranslateAndInsert(argument[i], owner->view()->text);
-#endif
                                } else
-#if 0
-                                       owner->getIntl()->getTrans()->TranslateAndInsert(argument[i], owner->view()->text);
-#else
                                        owner->getIntl()->getTrans().TranslateAndInsert(argument[i], owner->view()->text);
-#endif
                        }
 
                        owner->view()->update(owner->view()->text,