In r30560, the setLayout function was removed from InsetCollapsable. This function also set the buttonLabel for the inset. After removing the setLayout calls in this place, the button label is not initialized for Notes, Boxes and Phantoms.

This commit restores the behaviour as it was, such that the labels are initialized again.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30677 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-07-18 19:35:27 +00:00
parent e847919f2c
commit 77d67595fd

View File

@ -233,6 +233,9 @@ static bool doInsertInset(Cursor & cur, Text * text,
if (!inset) if (!inset)
return false; return false;
if (InsetCollapsable * ci = inset->asInsetCollapsable())
ci->setButtonLabel();
cur.recordUndo(); cur.recordUndo();
if (cmd.action == LFUN_INDEX_INSERT) { if (cmd.action == LFUN_INDEX_INSERT) {
docstring ds = subst(text->getStringToIndex(cur), '\n', ' '); docstring ds = subst(text->getStringToIndex(cur), '\n', ' ');