|
From: Bastian M. <bma...@we...> - 2014-12-08 06:08:07
|
Am 08.12.2014 um 07:03 schrieb sfeam:
> On Wednesday, 24 September 2014 03:54:10 PM Tatsuro MATSUOKA wrote:
>>>
>>> In command.c
>>>
>>>
>>> line around 455 => 1455
>>> #=====================================================================
>>>
>>> #if defined(_Windows)
>>> # ifdef WXWIDGETS
>>> if (!strcmp(term->name, "wxt")) {
>>> /* copy of the code below: !(_Windows || OS2) */
>>> if (term && term->waitforinput && paused_for_mouse){
>>> fprintf(stderr, "%s\n", buf);
>>> term->waitforinput(0);
>>> } else {
>>> # if defined(WGP_CONSOLE)
>>> fprintf(stderr, "%s\n", buf);
>>> if (term && term->waitforinput)
>>> while (term->waitforinput(0) != (int)'\r') {}; /* waiting for
>>> Enter*/
>>> # else /* !WGP_CONSOLE */
>>> if (!Pause(buf))
>>> bail_to_command_line();
>>> # endif
>>> }
>>> } else
>>> # endif /* _Windows && WXWIDGETS */
>>>
>>> #=====================================================================
>>>
>>>
>>> For qt, are similar treatments required?
>
> Sorry, I lost track of this question.
> I think you are right that qt needs the same treatment.
> Please try this patch (in-line and also attached):
>
> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
> --- gnuplot/src/command.c 2014-09-14 11:21:12.000000000 -0700
> +++ gnuplot-cvs/src/command.c 2014-12-07 21:58:07.958118580 -0800
> @@ -1453,8 +1453,8 @@ pause_command()
>
> if (sleep_time < 0) {
> #if defined(_Windows)
> -# ifdef WXWIDGETS
> - if (!strcmp(term->name, "wxt")) {
> +# if defined(WXWIDGETS) || defined(QTTERM)
> + if (!strcmp(term->name, "wxt") || !strcmp(term->name, "qt")) {
> /* copy of the code below: !(_Windows || OS2) */
> if (term && term->waitforinput && paused_for_mouse){
> fprintf(stderr, "%s\n", buf);
> @@ -1470,7 +1470,7 @@ pause_command()
> # endif
> }
> } else
> -# endif /* _Windows && WXWIDGETS */
> +# endif /* _Windows && WXWIDGETS or QTTERM */
> {
> # ifdef USE_MOUSE
> if (paused_for_mouse && !GraphHasWindow(graphwin)) {
> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>
>
> Ethan
>
>
Please also set the tracker item
https://sourceforge.net/p/gnuplot/bugs/1502/
which includes a patch.
Bastian
|