Painter and scrollbar API patches

[lyx.git] / src / minibuffer.C

diff --git a/src/minibuffer.C b/src/minibuffer.C
index 92a307dfc73d5040f4d3a1ddfc9496d567efbf61..d4017874495a207339473dab098bf67392f06cfe 100644 (file)
--- a/src/minibuffer.C
+++ b/src/minibuffer.C
@@ -20,22 +20,27 @@
 
 // FIXME: temporary
 #include "frontends/xforms/DropDown.h"
+#include "frontends/xforms/XFormsView.h"
 
 #include "minibuffer.h"
 
 #include "support/lyxalgo.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "LyXView.h"
-#include "XFormsView.h"
+#include "frontends/LyXView.h"
 #include "gettext.h"
 #include "LyXAction.h"
 #include "BufferView.h"
 #include "frontends/Timeout.h"
 
+#include <boost/bind.hpp>
+
 #include <cctype>
 
-using SigC::slot;
+#ifndef CXX_GLOBAL_CSTD
+using std::isprint;
+#endif
+
 using std::vector;
 using std::back_inserter;
 using std::find;
@@ -64,10 +69,10 @@ MiniBuffer::MiniBuffer(LyXView * o, FL_Coord x, FL_Coord y,
        add(FL_NORMAL_INPUT, x, y, h, w);
 
        timer = new Timeout(6000);
-       timer->timeout.connect(slot(this, &MiniBuffer::init));
+       timer->timeout.connect(boost::bind(&MiniBuffer::init, this));
 
        stored_timer = new Timeout(1500);
-       stored_timer->timeout.connect(slot(this, &MiniBuffer::stored_slot));
+       stored_timer->timeout.connect(boost::bind(&MiniBuffer::stored_slot, this));
        deactivate();
 }
 
@@ -76,8 +81,8 @@ MiniBuffer::MiniBuffer(LyXView * o, FL_Coord x, FL_Coord y,
 void MiniBuffer::dd_init()
 {
        dropdown_ = new DropDown(owner_, the_buffer);
-       dropdown_->result.connect(slot(this, &MiniBuffer::set_complete_input));
-       dropdown_->keypress.connect(slot(this, &MiniBuffer::append_char));
+       dropdown_->result.connect(boost::bind(&MiniBuffer::set_complete_input, this, _1));
+       dropdown_->keypress.connect(boost::bind(&MiniBuffer::append_char, this, _1));
 }
 
 
@@ -234,7 +239,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                                if (!input.empty()) {
                                        history_->push_back(input);
                                }
-                               stringReady.emit(input);
+                               stringReady(input);
 # if 0
                        }
 #endif
@@ -370,7 +375,7 @@ void MiniBuffer::init()
        if (the_buffer->focus)
                return;
 
-       timeout.emit();
+       timeout();
        timer->stop();
 }