From 0695e62ce811ba6b98c09de4d9e9fcd31cf40724 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Fri, 11 Nov 2022 00:43:37 +0100 Subject: [PATCH] Fix compilation error with Visual Studio 2022 This old code (unchanged since 1998) wouldn't compile with the current version of Visual Studio 2022. Fix backported from 1.4.0 (c4bb4e192ed4661f4a74e31b1f5ae8116c59cc9e). Original commit by Matthias Melcher. --- CHANGES | 5 ++++- test/resizebox.cxx | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 5068c159d..3fb89a82f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -CHANGES IN FLTK 1.3.9 RELEASED: ??? +CHANGES IN FLTK 1.3.9 RELEASED: Nov ?? 2022 FLTK 1.3.9 is a maintenance release with some fixes and enhancements. @@ -7,6 +7,8 @@ Details: Albrecht Schlosser: Backport X11 INCR protocol fixes from 1.4.0 (issue #451) 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 ManoloFLTK: macOS platform: fix for issue #325 Disabling IM disables Greek and Cyrillic layouts @@ -14,6 +16,7 @@ Details: 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(). + Issue #469: Fl_Sys_Menu_Bar menu item shortcuts using Escape or Tab do not work on Mac YX: Fix IME problem (issue #270) diff --git a/test/resizebox.cxx b/test/resizebox.cxx index 602612c10..62a47c1d4 100644 --- a/test/resizebox.cxx +++ b/test/resizebox.cxx @@ -16,10 +16,6 @@ // http://www.fltk.org/str.php // -#define W1 (big ? 60 : 40) -#define B 0 -#define W3 (5*W1+6*B) - #include #include #include @@ -27,6 +23,10 @@ #include #include +#define W1 (big ? 60 : 40) +#define B 0 +#define W3 (5*W1+6*B) + Fl_Double_Window *window; Fl_Box *box;