Change the semantics of 'none' and 'auto' viewers/editors: 'none' means now

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

diff --git a/src/frontends/xforms/XFormsView.h b/src/frontends/xforms/XFormsView.h
index ed08ddb24a770a0799a4e32dd410d1bc550efd34..45e58ff870d738c9bfbc83f22508aeaa5068b01d 100644 (file)
--- a/src/frontends/xforms/XFormsView.h
+++ b/src/frontends/xforms/XFormsView.h
@@ -48,7 +48,7 @@ public:
        ~XFormsView();
 
        /// Accessor to the appropriate layout Box.
-       Box & getBox(Position pos) const;
+       boost::shared_ptr<Box> getBox(Position pos) const;
 
        /**
         * show - display the top-level window
@@ -66,7 +66,7 @@ public:
        virtual void busy(bool) const;
 
        /// callback for close event from window manager
-       static int atCloseMainFormCB(FL_FORM *, void *);
+       int atCloseMainFormCB();
 
        /// display a status message
        virtual void message(std::string const & str);
@@ -79,6 +79,9 @@ public:
        ///
        boost::signal<void()> metricsUpdated;
 
+       // returns true if this view has the focus.
+       virtual bool hasFocus() const;
+
 private:
        /**
         * setWindowTitle - set title of window
@@ -93,8 +96,10 @@ private:
        /// The top-most box of the layout engine containing all other boxes.
        Box window_;
 
+       typedef std::map<Position, boost::shared_ptr<Box> > BoxMap;
+
        // Accessors to the various Boxes.
-       std::map<Position, Box *> box_map_;
+       BoxMap box_map_;
 
        /// the minibuffer
        boost::scoped_ptr<XMiniBuffer> minibuffer_;