get rid of broken_header.h and some unneeded tests

[lyx.git] / src / frontends / xforms / XFormsMenubar.h

diff --git a/src/frontends/xforms/XFormsMenubar.h b/src/frontends/xforms/XFormsMenubar.h
index ded13fb8622c3f6611bb8a358e19b202bfe3c286..07c945ef16481166d7e638d3d8c85aed9600985e 100644 (file)
--- a/src/frontends/xforms/XFormsMenubar.h
+++ b/src/frontends/xforms/XFormsMenubar.h
@@ -24,13 +24,16 @@
 
 #include <vector>
 
-
 class LyXView;
-class XFormsView;
 class Menu;
 class MenuItem;
 class MenuBackend;
 
+namespace lyx {
+namespace frontend {
+
+class XFormsView;
+
 class XFormsMenubar : public Menubar {
 public:
        ///
@@ -69,9 +72,9 @@ private:
        ///
        MenuBackend const * menubackend_;
        ///
-       lyx::frontend::Box * menubar_;
+       boost::shared_ptr<Box> menubar_;
        ///
-       lyx::frontend::WidgetMap widgets_;
+       WidgetMap widgets_;
        ///
        struct ItemInfo {
                ///
@@ -91,4 +94,8 @@ private:
        ///
        ButtonList buttonlist_;
 };
+
+} // namespace frontend
+} // namespace lyx
+
 #endif