X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FXFormsView.h;h=45e58ff870d738c9bfbc83f22508aeaa5068b01d;hb=d5443737342903de489d527802cd2cdd38987d74;hp=f74b4ff28831334b4727c8bb428e21a36f0ed620;hpb=2a31934f38d624bef25c0b177852233eee9768f0;p=lyx.git

diff --git a/src/frontends/xforms/XFormsView.h b/src/frontends/xforms/XFormsView.h
index f74b4ff288..45e58ff870 100644
--- a/src/frontends/xforms/XFormsView.h
+++ b/src/frontends/xforms/XFormsView.h
@@ -18,7 +18,7 @@
 #include "frontends/LyXView.h"
 #include <X11/Xlib.h> // for Pixmap
 
-#include <boost/signals/signal0.hpp>
+#include <boost/signal.hpp>
 
 #include <map>
 
@@ -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);
@@ -77,7 +77,10 @@ public:
 	///
 	void updateMetrics(bool resize_form = false);
 	///
-	boost::signal0<void> metricsUpdated;
+	boost::signal<void()> metricsUpdated;
+
+	// returns true if this view has the focus.
+	virtual bool hasFocus() const;
 
 private:
 	/**
@@ -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_;