Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/xforms/XFormsToolbar.h b/src/frontends/xforms/XFormsToolbar.h
index 95c91203bb8ca6e511cd1cf42463f55e702e2348..8e2c680e957a3a087fe5637fb37a26c8f3462ace 100644 (file)
--- a/src/frontends/xforms/XFormsToolbar.h
+++ b/src/frontends/xforms/XFormsToolbar.h
@@ -21,10 +21,12 @@
 #include <boost/scoped_ptr.hpp>
 #include <vector>
 
+namespace lyx {
+namespace frontend {
 
+class Tooltips;
 class XFormsToolbar;
 class XFormsView;
-class Tooltips;
 
 
 class XLayoutBox: public LayoutBox {
@@ -64,7 +66,7 @@ public:
        void add(FuncRequest const & func, std::string const & tooltip);
        void hide(bool);
        void show(bool);
-       void update();
+       void update();
        LayoutBox * layout() const { return layout_.get(); }
 
        /// an item on the toolbar
@@ -88,19 +90,18 @@ public:
                ///
                Pixmap unused_pixmap;
                Pixmap active_pixmap;
-               Pixmap active_mask;
                Pixmap inactive_pixmap;
-               Pixmap inactive_mask;
+               Pixmap mask;
        };
 
        ///
        XFormsView::Position position_;
        ///
-       lyx::frontend::Box * toolbar_;
+       boost::shared_ptr<Box> toolbar_;
        ///
-       lyx::frontend::BoxList * toolbar_buttons_;
+       BoxList * toolbar_buttons_;
        ///
-       lyx::frontend::WidgetMap widgets_;
+       WidgetMap widgets_;
 
        typedef std::vector<FuncRequest> Funcs;
 
@@ -118,4 +119,7 @@ public:
        boost::scoped_ptr<XLayoutBox> layout_;
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif