gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused variable, fix "type issue" (#445, part 2)

Browse Source 
This commit removes an unused variable as suggested in the discussion
of issue #445: "type issue in fluid/ExternalCodeEditor_WIN32.cxx"

Backported from 'master', b5b88d5f0d

Note: this "type issue" made the build fail on Windows with current
  MSYS2 (gcc 13.1.0).
This commit is contained in:
Albrecht Schlosser 2023-06-10 18:14:56 +02:00
parent 390f530abb
commit ea78943e86
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGES
View File

@ -1,4 +1,4 @@
CHANGES IN FLTK 1.3.9 RELEASED: Nov ?? 2022
CHANGES IN FLTK 1.3.9 RELEASED: ??? ?? 2023
FLTK 1.3.9 is a maintenance release with some fixes and enhancements.
@ -9,14 +9,21 @@ Details:
X11: Suppress compiler warnings when using gcc or clang
Fix crash if a program exits before it opens a window (STR 3484).
Fix compilation error with current Visual Studio 2022
Windows: #define WIN32 if not defined by user
Backport warning fixes from 1.4.0 in src/fl_draw.cxx (#693)
Fix compiler warning as pointed out in PR #693
Fix another compiler warning (#693)
Remove unused variable, fix "type issue" (#445, part 2)
ManoloFLTK:
macOS platform: fix for issue #325 Disabling IM disables Greek and Cyrillic layouts
Fix fullscreen window level corner cases on macOS - cont'd
Fix for issue #373 apparent with macOS platform and SDK ≤ 10.13
Fi xfor issue #452: Fl::get_font_name failure on OS-X.
Fix for issue #454 : crash in Fl::get_font_name().
Fix for issue #452: Fl::get_font_name failure on OS-X.
Fix for issue #454: crash in Fl::get_font_name().
Issue #469: Fl_Sys_Menu_Bar menu item shortcuts using Escape or Tab do not work on Mac
Add support of macOS Ventura 13.0
Fix "Focus is lost leaving full screen on macOS 13" (#608)
YX:
Fix IME problem (issue #270)

21
fluid/ExternalCodeEditor_WIN32.cxx
View File

@ -1,10 +1,22 @@
//
// "$Id$".
// External code editor management class for Windows
//
// External code editor management class for Windows
// Copyright 1998-2023 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
// file is missing or damaged, see the license at:
//
// https://www.fltk.org/COPYING.php
//
// Please see the following page on how to report bugs and issues:
//
// https://www.fltk.org/bugs.php
//
#ifdef WIN32 /* This entire file windows only */
// Note: This entire file Windows only.
#ifdef WIN32
#include <stdio.h> // snprintf()
@ -474,9 +486,8 @@ void ExternalCodeEditor::reap_cleanup() {
int ExternalCodeEditor::reap_editor(DWORD *pid_reaped) {
if ( pid_reaped ) *pid_reaped = 0;
if ( !is_editing() ) return -2;
int err;
DWORD msecs_wait = 50; // .05 sec
switch ( err = WaitForSingleObject(pinfo_.hProcess, msecs_wait) ) {
switch ( WaitForSingleObject(pinfo_.hProcess, msecs_wait) ) {
case WAIT_TIMEOUT: { // process didn't reap, still running
return 0;
}