change LyXScreen names to begin with lower case

[lyx.git] / src / minibuffer.C

diff --git a/src/minibuffer.C b/src/minibuffer.C
index 659b12a5d06d1d7004c2db742a2f8266991b6657..70015b2c2ef0088445d802f8a3702cb1c06ebab5 100644 (file)
--- a/src/minibuffer.C
+++ b/src/minibuffer.C
@@ -5,7 +5,7 @@
  *                 information.
  * 
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.  
+ *           Copyright 1995-2001 The LyX Team.  
  * 
  * ###########################################################################
  */
@@ -23,12 +23,12 @@
 #include "support/lyxalgo.h"
 #include "support/filetools.h"
 #include "LyXView.h"
+#include "XFormsView.h"
 #include "gettext.h"
 #include "LyXAction.h"
 #include "BufferView.h"
 
 
-using std::endl;
 using SigC::slot;
 using std::vector;
 
@@ -175,6 +175,10 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                case 13:
                case XK_Return:
                {
+#if 0
+                       // This will go in again in a little while
+                       // we need to be able to declare what types
+                       // of argumetns LFUN's should have first. (Lgb)
                        // First check for match
                        vector<string>::const_iterator cit =
                                std::find(completion_.begin(),
@@ -186,12 +190,15 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                                string const tmp = input + _(" [no match]");
                                fl_set_input(ob, tmp.c_str());
                        } else {
+#endif
                                // Return the inputted string
                                deactivate();
                                owner_->view()->focus(true);
                                history_->push_back(input);
                                stringReady.emit(input);
+# if 0
                        }
+#endif
                        return 1;
                }
                case XK_space:
@@ -240,7 +247,8 @@ void MiniBuffer::prepare()
        text.erase();
        fl_set_input(the_buffer, "");
        activate();
-       fl_set_focus_object(owner_->getForm(), the_buffer);
+       fl_set_focus_object(static_cast<XFormsView *>(owner_)->getForm(),
+                           the_buffer);
 }