insetcharstyle drawing cosmetics

[lyx.git] / src / insets / insetcaption.C

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index bd71feb8a73d243f3f8786f74e766eef53cb712a..cf1d9965b0698419c9c14bb9e5bb695fb07d894e 100644 (file)
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -29,7 +29,7 @@
 
 #include "support/lstrings.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 
 using lyx::support::bformat;
@@ -44,7 +44,7 @@ InsetCaption::InsetCaption(BufferParams const & bp)
        : InsetText(bp)
 {
        setAutoBreakRows(true);
-       setDrawFrame(InsetText::LOCKED);
+       setDrawFrame(true);
        setFrameColor(LColor::captionframe);
 }
 
@@ -92,7 +92,9 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
        InsetOld * i2 = i1 ? i1->owner() : 0;
        string type;
        if (i2->lyxCode() == FLOAT_CODE)
+#ifdef WITH_WARNINGS
 #warning Now, what happens for i2 == 0?
+#endif
                type = static_cast<InsetFloat *>(i2)->params().type;
        else if (i2->lyxCode() == WRAP_CODE)
                type = static_cast<InsetWrap *>(i2)->params().type;