fix crash with "save as"

[lyx.git] / src / frontends / xforms / DropDown.C

diff --git a/src/frontends/xforms/DropDown.C b/src/frontends/xforms/DropDown.C
index 49d412141bb48dfb123f91c71dd2a72faf962cfe..8fc54eb6773677852d27a1e1465b9cf43e670660 100644 (file)
--- a/src/frontends/xforms/DropDown.C
+++ b/src/frontends/xforms/DropDown.C
@@ -1,9 +1,11 @@
 /**
  * \file DropDown.C
- * Copyright 2001 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author John Levon, moz@compsoc.man.ac.uk
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
@@ -15,59 +17,63 @@
 #include "DropDown.h"
 #include "xforms_helpers.h"
 
+#include FORMS_H_LOCATION
+
 #include <iostream>
 #include <cctype>
 
+#ifndef CXX_GLOBAL_CSTD
+using std::isprint;
+#endif
 
 using std::vector;
 
 
 namespace {
-       
+
 extern "C" void C_CompletedCB(FL_OBJECT * ob, long)
 {
        DropDown * d = static_cast<DropDown*>(ob->u_vdata);
        d->completed();
 }
 
- 
+
 extern "C" int C_PeekCB(FL_FORM * form, void *xev)
 {
        DropDown * d = static_cast<DropDown*>(form->u_vdata);
        return d->peek(static_cast<XEvent*>(xev));
 }
- 
+
 } // namespace anon
 
- 
-DropDown::DropDown(LyXView * lv, FL_OBJECT * ob)
-       : lv_(lv)
+
+DropDown::DropDown(FL_OBJECT * ob)
 {
        form_ = fl_bgn_form(FL_NO_BOX, ob->w, 100);
        fl_add_box(FL_UP_BOX, 0, 0, ob->w, 100, "");
        browser_ = fl_add_browser(FL_SELECT_BROWSER, 0, 0, ob->w, 100, "");
        form_->u_vdata = this;
-        browser_->u_vdata = this;
+       browser_->u_vdata = this;
        fl_set_object_callback(browser_, C_CompletedCB, 0);
        fl_register_raw_callback(form_, KeyPressMask|ButtonPressMask, C_PeekCB);
        fl_end_form();
 }
 
- 
+
 DropDown::~DropDown()
 {
-       if (form_->visible) 
+       if (form_->visible)
                fl_hide_form(form_);
        fl_free_form(form_);
 }
- 
+
 
 void DropDown::select(vector<string> const & choices, int x, int y, int w)
 {
        if (choices.empty())
                return;
 
-       fl_set_form_geometry(form_, x, y-100, w, 100);
+       fl_set_form_geometry(form_, x, y - 100, w, 100);
        fl_clear_browser(browser_);
 
        vector<string>::const_iterator cit = choices.begin();
@@ -108,7 +114,7 @@ void DropDown::line_down()
        if (fl_get_browser(browser_) < fl_get_browser_topline(browser_))
                fl_set_browser_topline(browser_, fl_get_browser(browser_));
 }
- 
+
 
 int DropDown::peek(XEvent * xev)
 {
@@ -116,7 +122,7 @@ int DropDown::peek(XEvent * xev)
        unsigned int keymask;
 
        fl_get_mouse(&x, &y, &keymask);
- 
+
        if (xev->type == ButtonPress) {
                if (!(x >= form_->x && x <= (form_->x + form_->w) &&
                      y >= form_->y && y << (form_->y + form_->h))) {
@@ -130,13 +136,22 @@ int DropDown::peek(XEvent * xev)
                XLookupString(&xev->xkey, s_r, 10, &keysym_return, 0);
                switch (keysym_return) {
                case XK_Down:
+#ifdef XK_KP_Down
+               case XK_KP_Down:
+#endif
                        line_down();
                        return 1;
                case XK_Up:
+#ifdef XK_KP_Up
+               case XK_KP_Up:
+#endif
                        line_up();
                        return 1;
                case XK_Return:
-                       completed(); 
+#ifdef XK_KP_Enter
+               case XK_KP_Enter:
+#endif
+                       completed();
                        return 1;
                case XK_Escape:
                        fl_deselect_browser(browser_);
@@ -146,7 +161,7 @@ int DropDown::peek(XEvent * xev)
                        // FIXME: if someone has a got a way to
                        // convince the event to fall back to the
                        // minibuffer, I'm glad to hear it.
-                       // fl_XPutBackEvent() doesn't work. 
+                       // fl_XPutBackEvent() doesn't work.
 
                        // This is a bit less elegant perhaps, but works
                        // well enough. Angus 11 Jan 2002
@@ -156,7 +171,7 @@ int DropDown::peek(XEvent * xev)
                        }
                }
        }
-       return 0; 
+       return 0;
 }
 
 
@@ -164,7 +179,7 @@ void DropDown::completed()
 {
        XUngrabPointer(fl_get_display(), CurrentTime);
        fl_hide_form(form_);
-       result.emit(getSelectedStringFromBrowser(browser_));
+       result(getString(browser_));
 }
 
 
@@ -172,5 +187,5 @@ void DropDown::key_pressed(char c)
 {
        XUngrabPointer(fl_get_display(), CurrentTime);
        fl_hide_form(form_);
-       keypress.emit(c);
+       keypress(c);
 }