From ea78943e86fd561cb0fc59bb7d78b9d3a0a7a8bf Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Sat, 10 Jun 2023 18:14:56 +0200
Subject: [PATCH] Remove unused variable, fix "type issue" (#445, part 2)

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

Backported from 'master', b5b88d5f0dcb682df1ad80ac8939fcfc1f6671da

Note: this "type issue" made the build fail on Windows with current
  MSYS2 (gcc 13.1.0).
---
 CHANGES                            | 13 ++++++++++---
 fluid/ExternalCodeEditor_WIN32.cxx | 21 ++++++++++++++++-----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3fb89a82f..e004ad660 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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)
diff --git a/fluid/ExternalCodeEditor_WIN32.cxx b/fluid/ExternalCodeEditor_WIN32.cxx
index 4646fe580..7dd1433b0 100644
--- a/fluid/ExternalCodeEditor_WIN32.cxx
+++ b/fluid/ExternalCodeEditor_WIN32.cxx
@@ -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;
     }