r37258 - lyx-devel/trunk/src/insets

[spitz]

Author: spitz
Date: Wed Jan 19 12:18:52 2011
New Revision: 37258
URL: http://www.lyx.org/trac/changeset/37258

Log:
* InsetBox.cpp: framed boxes can have paragraph breaks and environments.

Modified:
   lyx-devel/trunk/src/insets/InsetBox.cpp

Modified: lyx-devel/trunk/src/insets/InsetBox.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetBox.cpp     Wed Jan 19 10:03:41 2011        
(r37257)
+++ lyx-devel/trunk/src/insets/InsetBox.cpp     Wed Jan 19 12:18:52 2011        
(r37258)
@@ -182,7 +182,8 @@
 
 bool InsetBox::forcePlainLayout(idx_type) const
 {
-       return (!params_.inner_box || params_.use_makebox) && params_.type != 
"Shaded";
+       return (!params_.inner_box || params_.use_makebox)
+               && params_.type != "Shaded" && params_.type != "Framed";
 }
 
 
@@ -224,7 +225,8 @@
                return true;
 
        case LFUN_BREAK_PARAGRAPH:
-               if ((params_.inner_box && !params_.use_makebox) || params_.type 
== "Shaded")
+               if ((params_.inner_box && !params_.use_makebox)
+                    || params_.type == "Shaded" || params_.type == "Framed")
                        return InsetCollapsable::getStatus(cur, cmd, flag);
                flag.setEnabled(false);
                return true;