Fix crash when running lyx -dbg insets -e ...

[lyx.git] / src / minibuffer.C

diff --git a/src/minibuffer.C b/src/minibuffer.C
index 5e1f324423498ae8cfe5147d3245c247aee8bae3..a347acec8e23893e275cfded86bd2d4c6a34c7dc 100644 (file)
--- a/src/minibuffer.C
+++ b/src/minibuffer.C
@@ -5,13 +5,15 @@
  *                 information.
  * 
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.  
+ *           Copyright 1995-2001 The LyX Team.  
  * 
  * ###########################################################################
  */
 
 #include <config.h>
 
+#include <iostream>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -21,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;
 
@@ -101,7 +103,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                                stored_set(input);
                                fl_set_input(ob, _("[End of history]"));
                        } else {
-                               fl_set_input(ob, (*hist_iter).c_str());
+                               fl_set_input(ob, hist_iter->c_str());
                        }
                        return 1; 
                case XK_Up:
@@ -111,7 +113,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                                fl_set_input(ob, _("[Beginning of history]"));
                        } else {
                                --hist_iter;
-                               fl_set_input(ob, (*hist_iter).c_str());
+                               fl_set_input(ob, hist_iter->c_str());
                        }
                        return 1; 
                case 9:
@@ -173,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(),
@@ -184,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:
@@ -238,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);
 }