removed a warning from screen and added CFLAGS in lyx.spec.in.

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index a3b0734b34a998b8da9c3d862073707fe8f0bd4c..24a0a3406fdc1c701fa79d26ae19b236a6fa1249 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -303,12 +303,6 @@ int LyXFunc::processKeyEvent(XEvent *ev)
        Dispatch(action, argument.c_str());
        show_sc = tmp_sc;
        
-       // Need this for deadkeys (alkis)
-       //keyseq.length=0;
-       // ...but that breaks the minibuffer's display of "M-"...
-#ifdef WITH_WARNINGS
-#warning How does the deadkeys react to this?
-#endif
        return 0;
 } 
 
@@ -726,14 +720,14 @@ string LyXFunc::Dispatch(int ac,
                        int res = one.startscript(Systemcalls::System, tmp);
                        if (res == 0) {
                                setMessage(string(
-                                 N_("Document exported as HTML to file: ")) + result);
+                                 _("Document exported as HTML to file: ")) + result);
                        } else {
                                setErrorMessage(string(
-                                 N_("An unexpected error occured while converting document to HTML in file:")) + result);
+                                 _("An unexpected error occured while converting document to HTML in file:")) + result);
                        }
                }
                else {
-                       setErrorMessage(string(N_("Unknown export type: "))
+                       setErrorMessage(string(_("Unknown export type: "))
                                        + extyp);
                }
        }
@@ -772,10 +766,16 @@ string LyXFunc::Dispatch(int ac,
                if (fd_form_toc->form_toc->visible) {
                        fl_raise_form(fd_form_toc->form_toc);
                } else {
+                       static int ow = -1, oh;
                        fl_show_form(fd_form_toc->form_toc,
                                     FL_PLACE_MOUSE |
                                     FL_FREE_SIZE, FL_FULLBORDER,
                                     _("Table of Contents"));
+                       if (ow < 0) {
+                               ow = fd_form_toc->form_toc->w;
+                               oh = fd_form_toc->form_toc->h;
+                       }
+                       fl_set_form_minsize(fd_form_toc->form_toc, ow, oh);
                }
                break;