MSVC does not define WIN32 but _WIN32.

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 59166bd73f5952d28a9c91daa8d55db8b8009026..6089756f9bbae041d28cc8322a1b4ff34712a579 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -729,7 +729,7 @@ bool BufferView::moveToPosition(pit_type bottom_pit, pos_type bottom_pos,
                        // insets.
                        size_t const n = dit.depth();
                        for (size_t i = 0; i < n; ++i)
-                               if (dit[i].inset().editable() != Inset::HIGHLY_EDITABLE) {
+                               if (!dit[i].inset().editable()) {
                                        dit.resize(i);
                                        break;
                                }
@@ -1017,36 +1017,6 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
                flag.setEnabled(cur.inset().allowParagraphCustomization(cur.idx()));
                break;
 
-       case LFUN_INSET_SETTINGS: {
-               InsetCode code = cur.inset().lyxCode();
-               if (cmd.getArg(0) == insetName(code)) {
-                       flag.setEnabled(true);
-                       break;
-               }
-               bool enable = false;
-               InsetCode next_code = cur.nextInset()
-                       ? cur.nextInset()->lyxCode() : NO_CODE;
-               //FIXME: remove these special cases:
-               switch (next_code) {
-                       case TABULAR_CODE:
-                       case ERT_CODE:
-                       case FLOAT_CODE:
-                       case WRAP_CODE:
-                       case NOTE_CODE:
-                       case BRANCH_CODE:
-                       case PHANTOM_CODE:
-                       case BOX_CODE:
-                       case LISTINGS_CODE:
-                               enable = (cmd.argument().empty() ||
-                                         cmd.getArg(0) == insetName(next_code));
-                               break;
-                       default:
-                               break;
-               }
-               flag.setEnabled(enable);
-               break;
-       }
-
        case LFUN_DIALOG_SHOW_NEW_INSET:
                if (cur.inset().lyxCode() == CAPTION_CODE)
                        return cur.inset().getStatus(cur, cmd, flag);
@@ -1309,6 +1279,7 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                        cur.setMark(true);
                        cur.message(from_utf8(N_("Mark set")));
                }
+               cur.resetAnchor();
                break;
 
        case LFUN_SCREEN_SHOW_CURSOR: