Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/xforms/XMiniBuffer.h b/src/frontends/xforms/XMiniBuffer.h
index d81472ef7d74464bfebe269c5dce8ae3c1ae7306..42f8744f68a803354ee70d85d26d2a6fcdcbaab5 100644 (file)
--- a/src/frontends/xforms/XMiniBuffer.h
+++ b/src/frontends/xforms/XMiniBuffer.h
@@ -5,18 +5,19 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Lars
- * \author Asger and Juergen
+ * \author Asger and Jürgen
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef XMINIBUFFER_H
 #define XMINIBUFFER_H
 
-#include FORMS_H_LOCATION
+#include "lyx_forms.h"
+
+#include "LayoutEngine.h"
 
-#include "LString.h"
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals/connection.hpp>
@@ -24,15 +25,19 @@
 struct fl_freebrowser_;
 typedef fl_freebrowser_ FL_FREEBROWSER;
 
-class ControlCommandBuffer;
 class Timeout;
 
+namespace lyx {
+namespace frontend {
+
+class XFormsView;
+class ControlCommandBuffer;
+
 /// in xforms, the minibuffer is both a status bar and a command buffer
 class XMiniBuffer {
 public:
        ///
-       XMiniBuffer(ControlCommandBuffer & control,
-                   FL_Coord x, FL_Coord y, FL_Coord h, FL_Coord w);
+       XMiniBuffer(XFormsView & owner, ControlCommandBuffer & control);
 
        ///
        ~XMiniBuffer();
@@ -44,7 +49,7 @@ public:
        int peek_event(FL_OBJECT *, int, int, XEvent * xev);
 
        /// show a message
-       void message(string const & str);
+       void message(std::string const & str);
 
        /// focus the buffer for editing mode
        void focus() { messageMode(false); }
@@ -66,13 +71,13 @@ private:
        void idle_timeout();
 
        /// set the minibuffer content in editing mode
-       void set_input(string const &);
+       void set_input(std::string const &);
 
        /// go into message mode
        void messageMode(bool on = true);
 
        /// show a temporary message whilst in edit mode
-       void show_info(string const & info, string const & input, bool append = true);
+       void show_info(std::string const & info, std::string const & input, bool append = true);
 
        /// the dropdown menu
        boost::shared_ptr<FL_FREEBROWSER> freebrowser_;
@@ -99,10 +104,17 @@ private:
        ControlCommandBuffer & controller_;
 
        /// stored input when showing info
-       string stored_input_;
+       std::string stored_input_;
 
        /// are we showing an informational temporary message ?
        bool info_shown_;
+       ///
+       boost::shared_ptr<Box> minibuffer_;
+       ///
+       WidgetMap widgets_;
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif // XMINIBUFFER_H