From 58622fce263a6e5948b6f5f0cf9add461cfbd012 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 12 Oct 2000 14:55:53 +0000 Subject: [PATCH] Fix flags for gcc 2.96, definition of mkfifo for cygwin and clear minibuffer when clicking on it git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/lyx-1_1_5@1108 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 13 +++++++++++++ acinclude.m4 | 3 ++- config/lyxinclude.m4 | 3 ++- src/lyxserver.C | 2 +- src/minibuffer.C | 6 +++++- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19b152d55e..30929b469a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2000-10-11 Baruch Even + + * src/minibuffer.C (peek_event): Added action when mouse clicks to + clear the minibuffer. + +2000-10-12 Jean-Marc Lasgouttes + + * config/lyxinclude.m4 (LYX_PROG_CXX): fix the compile flags for + gcc 2.96, hopefully fixing problems with redhat 7.0. + + * src/lyxserver.C: change the parameters of the empty mkfifo + implementation. + 2000-10-10 Dekel Tsur * src/lyx_gui.C (create_forms): Fix crash with locales. diff --git a/acinclude.m4 b/acinclude.m4 index ac8165def8..b0526effdd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -185,7 +185,8 @@ dnl Check the version of g++ case $gxx_version in 2.95.1) CXXFLAGS="-g $lyx_opt -fpermissive -fno-rtti -fno-exceptions";; 2.95.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";; - 2.96*) CXXFLAGS="-g $lyx_opt -fhonor-std";; + 2.96*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";; + 2.97*) CXXFLAGS="-g $lyx_opt -fhonor-std -fvtable-thunks -ffunction-sections -fdata-sections";; *2.91.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";; *) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";; esac diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index d9cef22ef7..2f4d297318 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -185,7 +185,8 @@ dnl Check the version of g++ case $gxx_version in 2.95.1) CXXFLAGS="-g $lyx_opt -fpermissive -fno-rtti -fno-exceptions";; 2.95.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";; - 2.96*) CXXFLAGS="-g $lyx_opt -fhonor-std";; + 2.96*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";; + 2.97*) CXXFLAGS="-g $lyx_opt -fhonor-std -fvtable-thunks -ffunction-sections -fdata-sections";; *2.91.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";; *) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";; esac diff --git a/src/lyxserver.C b/src/lyxserver.C index d0ad5c7ce2..7284b3a989 100644 --- a/src/lyxserver.C +++ b/src/lyxserver.C @@ -71,7 +71,7 @@ using std::endl; // provide an empty mkfifo() if we do not have one. This disables the // lyxserver. #ifndef HAVE_MKFIFO -int mkfifo( char *__path, mode_t __mode ) { +int mkfifo(const char *__path, mode_t __mode ) { return 0; } #endif diff --git a/src/minibuffer.C b/src/minibuffer.C index 1b417b8130..3d63d95848 100644 --- a/src/minibuffer.C +++ b/src/minibuffer.C @@ -126,7 +126,11 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, FL_Coord, FL_Coord, default: return 0; } - } + } else if (event == FL_PUSH) { + // This actually clears the buffer. + mini->ExecCommand(); + } + return 0; }