get rid of broken_header.h and some unneeded tests

[lyx.git] / src / factory.C

diff --git a/src/factory.C b/src/factory.C
index 3d478132f0dbefe6b7101ae5d6f9c6ddd5d68a30..03a285a3c3e0e007b6eea7644f1f28878602148c 100644 (file)
--- a/src/factory.C
+++ b/src/factory.C
@@ -60,10 +60,11 @@
 #include "frontends/LyXView.h"
 
 #include "support/lstrings.h"
-#include "support/std_sstream.h"
 
 #include <boost/assert.hpp>
 
+#include <sstream>
+
 using lyx::support::compare_ascii_no_case;
 
 using std::auto_ptr;
@@ -186,7 +187,7 @@ InsetBase * createInset(BufferView * bv, FuncRequest const & cmd)
                if (!up) {
                        auto_ptr<InsetCaption> inset(new InsetCaption(params));
                        inset->setAutoBreakRows(true);
-                       inset->setDrawFrame(InsetText::LOCKED);
+                       inset->setDrawFrame(true);
                        inset->setFrameColor(LColor::captionframe);
                        return inset.release();
                }
@@ -469,8 +470,10 @@ InsetBase * readInset(LyXLex & lex, Buffer const & buf)
                }
 
                inset->read(buf, lex);
-       
-#warning hack..        
+
+#ifdef WITH_WARNINGS
+#warning hack..
+#endif
                if (inset->lyxCode() == InsetBase::MATHMACRO_CODE) {
                        MathMacroTemplate const * tmpl =
                                static_cast<MathMacroTemplate*>(inset.get());