Make InsetText store a Buffer.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23964 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index e4592b56f04300445c83e26822e9e4843cec490e..a502bf910abe8d108d9d56e0afd7638097ef8a6b 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -238,7 +238,7 @@ Buffer::Impl::Impl(Buffer & parent, FileName const & file, bool readonly_)
          read_only(readonly_), filename(file), file_fully_loaded(false),
          toc_backend(&parent), macro_lock(false),
          embedded_files(), timestamp_(0), checksum_(0), wa_(0), 
-         undo_(parent)
+         undo_(parent), inset(parent)
 {
        temppath = createBufferTmpDir();
        lyxvc.setBuffer(&parent);

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 9d5b97fe546112a4eeafa5525f77b6fa1cdc68db..093eabee0e2284ad0887b0cdc7b5f6d193ca0806 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -140,7 +140,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
        }
 
        // Make sure there is no class difference.
-       InsetText in;
+       InsetText in(cur.buffer());
        // This works without copying any paragraph data because we have
        // a specialized swap method for ParagraphList. This is important
        // since we store pointers to insets at some places and we don't
@@ -194,7 +194,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
        }
 
        // Prepare the paragraphs and insets for insertion.
-       // A couple of insets store buffer references so need updating.
+       // Insets store buffer references so need updating.
        insertion.swap(in.paragraphs());
 
        InsetIterator const i_end = inset_iterator_end(in);

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index e2b7f8a9f705165370cd80a060a3456396fa627c..7b2648ac2752fb3e562e77e46159cb3bada6f592 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -512,6 +512,10 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
                                // Nothing to do.
                                cur.undispatched();
                                return;
+                       case mouse_button::none:
+                       case mouse_button::button4:
+                       case mouse_button::button5:
+                               break;
                        }
                }
                if (geometry() == NoButton 

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 2a596c01388ab2f5b62a8f3b77aed8287a9a5a64..76caba8be239f504d8a852969b27b4ffcd5a8b8b 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -70,6 +70,7 @@ using graphics::PreviewLoader;
 InsetText::InsetText(Buffer const & buf)
        : drawFrame_(false), frame_color_(Color_insetframe)
 {
+       Inset::setBuffer(const_cast<Buffer &>(buf));
        initParagraphs(buf);
 }
 
@@ -85,10 +86,6 @@ InsetText::InsetText(InsetText const & in)
 }
 
 
-InsetText::InsetText()
-{}
-
-
 void InsetText::initParagraphs(Buffer const & buf)
 {
        BOOST_ASSERT(paragraphs().empty());

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index afb874a442cf3674ad1869b9b77a281cc6f2a781..644a7fede572e262a4c1f9d209c237e55be54741 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -37,8 +37,6 @@ public:
        ///
        explicit InsetText(Buffer const & buffer);
        ///
-       InsetText();
-       ///
        InsetText(InsetText const &);
        ///
        void initParagraphs(Buffer const & buffer);