diff --git a/CHANGES.txt b/CHANGES.txt
index 627fdf392b5dd6a2b8013e1a8e4862fdb65712c2..5d59e298e6895dc28156bf06483ee6fea0ae5bbd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,7 +3,7 @@ Changes in FLTK 1.4.2 Released: ??? ?? 2025
Technical Details and Build Procedure Improvements
- Use "Microsoft Sans Serif" instead of "Arial" for the FL_HELVETICA font
- family under Windows.
+ family under Windows.
Changes in FLTK 1.4.1 Released: Dec 12 2024
@@ -199,7 +199,7 @@ Changes in FLTK 1.4.0 RC1 Released: Oct 20 2024
"wide character" commandline arguments to UTF-8.
- X11 and Wayland platforms: Added support of HiDPI displays. FLTK apps
detect the current display scaling factor and use it to scale all windows.
- - MSWindows platform: FLTK applications detect the display scaling factor and
+ - Windows platform: FLTK applications detect the display scaling factor and
automatically scale their GUI accordingly. This effectively renders WIN32
FLTK apps "per-monitor DPI-aware" whereas they were "DPI-unaware" before.
- Dynamical GUI rescaling: it is possible on all platforms to rescale all
diff --git a/fluid/README_fl.txt b/fluid/README_fl.txt
index c52b4d091c470b3edc399311ecf31f13eedbe775..2e69d4cfa70c83765080f45eae4a78327527dcc4 100644
--- a/fluid/README_fl.txt
+++ b/fluid/README_fl.txt
@@ -33,7 +33,7 @@ Line Endings
------------
Although FLUID writes all line endings as '\n', readers should tolerate '\r\n'
-MSWindows line endings as well. Except for the Header, the FLUID reader does not
+Windows line endings as well. Except for the Header, the FLUID reader does not
differentiate between a line ending and a space character outside of a 'word'.
@@ -42,7 +42,7 @@ Unicode
FLUID does not handle UTF-8 characters in any special manner (unescaped),
but stores and reads them verbatim, making UTF-8 character sequences perfectly
-legal in .fl files. FLUID can translate UTF-8 into escape sequence when writing
+legal in .fl files. FLUID can translate UTF-8 into escape sequences when writing
source code files.
@@ -63,7 +63,7 @@ case-sensitive.
Simple Words that are composed of 'a'-'z', 'A'-'Z', '0'-'9', and '_' only are
written verbatim, followed by a space or newline.
-All other character sequences are bracketed between between ‘{‘ and ‘}’ without
+All other character sequences are bracketed between ‘{‘ and ‘}’ without
padding spaces. For example, an empty word with no characters is written
as '{}', and ".hello" is written as '{.hello}'.
@@ -117,7 +117,7 @@ followed by a newline, followed by
version <float v>
-wehere 'v' is the version number as in FL_VERSION (major*1.0 + minor * 0.01
+where 'v' is the version number as in FL_VERSION (major*1.0 + minor * 0.01
+ patch * 0.0001). So for FLTK 1.3.4, 'v' would be 1.0304
Note: the version number corresponds not so much to the version of FLUID, but
@@ -137,8 +137,8 @@ Note: fdesign files (.fd) start with the text "Magic:". FLUID can read these
Options
-------
-Options are usually comprised of a Word, two Words, or a Word and a String. If
-an Option is missing, a default value is assumed.
+Options are usually comprised of a Word, two Words, or a Word and a String.
+If an Option is missing, a default value is assumed.
"Magic:" : used by fdesign, not written by FLUID
@@ -181,12 +181,11 @@ an Option is missing, a default value is assumed.
"i18n_conditional" <word> : string
- "header_name" <word> : can be the full filename, or just the
- extension e.g. “.h” in which case FLUID will use the same filename
- as the .fl file.
+ "header_name" <word> : can be the full filename or just the extension,
+ e.g. “.h” in which case FLUID will use the same filename as the .fl file.
- "code_name" <word> : can be the full filename, or just the
- extension e.g. “.cxx”
+ "code_name" <word> : can be the full filename or just the extension,
+ e.g. “.cxx”.
"snap" <word> : starting in V1.4 from May 2023, the 'snap' keyword can be
used to store the selected layout and preset and include more suites
@@ -212,20 +211,19 @@ an Option is missing, a default value is assumed.
"gridy" <word> : ignored
"shell_commands" <word> : starting in V1.4 from Sep 2023, the 'shell_commands'
- keyword can be used to store user configurable shell commands in a
- project file. The following block can be skipped by reading it as a
- single word.
+ keyword can be used to store user configurable shell commands in a project
+ file. The following block can be skipped by reading it as a single word.
shell_commands {
command {
name <string>
label <string>
- shortcut <int> (optional if not 0)
+ shortcut <int> (optional if not 0)
condition <int> (optional if not 0, see Fd_Shell_Command enum)
- condition_data <string> (optional if not "")
- command <string> (optional, but usually there)
- flags <int> (optional if not 0, see Fd_Shell_Command 2nd enum)
- } ( repeat as needed)
+ condition_data <string> (optional if not "")
+ command <string> (optional, but usually there)
+ flags <int> (optional if not 0, see Fd_Shell_Command 2nd enum)
+ } (repeat as needed)
}
Note: There is no keyword that marks the end of the Options section. The
@@ -516,7 +514,7 @@ Type "Fl_Window" <word> : C++ variable name
min_w, min_h, max_w, max_h
"xywh" <word> : this Word is written with printf as "{%d %d %d %d}",
x, y, w, h. This as actually read in the Fl_Widget Type, but here
- it ensures that window is not created as a subwindow.
+ it ensures that the window is not created as a subwindow.
... : inherits more from Fl_Widget (not Fl_Group)
Type "Fl_Grid" <word> : C++ variable name
diff --git a/fluid/code.cxx b/fluid/code.cxx
index f10777c3e177dc2e2d3e6d02e3a8f3998c7c3209..af8dba5048788f8b365f14f5f47ccadbbfc6d370 100644
--- a/fluid/code.cxx
+++ b/fluid/code.cxx
@@ -1023,7 +1023,7 @@ unsigned long Fd_Code_Writer::block_crc(const void *data, int n, unsigned long i
while (n>0 && *s>0 && isspace(*s)) { s++; n--; }
if (*s) line_start = false;
}
- // don't count '\r' that may be introduces by MSWindows
+ // don't count '\r' that may be introduced by Windows
if (n>0 && *s=='\r') { s++; n--; }
if (n>0 && *s=='\n') line_start = true;
if (n>0) {
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index 766721e65839870f935594f6d8a8903aa2c236af..b63ebe67260f00ee9faa58b8a893ee20d4c510f6 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -2192,9 +2192,9 @@ static void sigint(SIGARG) {
\param[in] argv pointer to an array of arguments
\return in batch mode, an error code will be returned via \c exit() . This
function return 1, if there was an error in the parameters list.
- \todo On MSWindows, Fluid can under certain conditions open a dialog box, even
+ \todo On Windows, Fluid can under certain conditions open a dialog box, even
in batch mode. Is that intentional? Does it circumvent issues with Windows'
- stderr and stdout?
+ stderr and stdout?
*/
int main(int argc,char **argv) {
int i = 1;
diff --git a/src/Fl_Help_Dialog_Dox.cxx b/src/Fl_Help_Dialog_Dox.cxx
index 5be2a9fcc8b862c5ceae684fe490030da21aa508..49d17d37c456a760e022d208dfeeb02e3380f1c1 100644
--- a/src/Fl_Help_Dialog_Dox.cxx
+++ b/src/Fl_Help_Dialog_Dox.cxx
@@ -40,9 +40,9 @@
/** \fn int Fl_Help_Dialog::load(const char *f)
\brief Loads the specified HTML file into the Fl_Help_View widget.
- The filename can also contain a target name ("filename.html#target"). Always
- use forward slashes as path deliminators, MSWindows-style backslashes are not
- supported here
+ The filename can also contain a target name ("filename.html#target"). Always
+ use forward slashes as path delimiters, Windows-style backslashes are not
+ supported here.
\param[in] f the name and path of an HTML file
\return 0 on success, -1 on error
\see Fl_Help_View::load(), fl_load_uri()
diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx
index 2045dff1fa41ad9f38f8ecc88572208a2fb901d1..3c1081d9b72d5fdc4a95f391e140d8d9e14a1c74 100644
--- a/src/Fl_Help_View.cxx
+++ b/src/Fl_Help_View.cxx
@@ -3326,7 +3326,7 @@ Fl_Help_View::~Fl_Help_View()
requested page in an external browser.
In all other cases, the URL is interpreted as a filename. The file is read and
- displayed in this borwser. Note that MSWindows style backslashes are not
+ displayed in this browser. Note that Windows style backslashes are not
supported in the file name.
\param[in] f filename or URL
diff --git a/src/Fl_Text_Editor.cxx b/src/Fl_Text_Editor.cxx
index 9fe2b5b01a5d7467e893b24aeada4a1473b4c76c..205687c3696720dd966faca3c1f48bb53764c4d7 100644
--- a/src/Fl_Text_Editor.cxx
+++ b/src/Fl_Text_Editor.cxx
@@ -132,7 +132,7 @@ static struct {
{ FL_Page_Down, FL_CTRL|FL_SHIFT, Fl_Text_Editor::kf_c_s_move },
//{ FL_Clear, 0, Fl_Text_Editor::delete_to_eol },
{ 'z', FL_CTRL, Fl_Text_Editor::kf_undo },
- { 'z', FL_CTRL|FL_SHIFT, Fl_Text_Editor::kf_redo }, // MSWindows screen driver also defines Ctrl-Y
+ { 'z', FL_CTRL|FL_SHIFT, Fl_Text_Editor::kf_redo }, // Windows screen driver also defines Ctrl-Y
{ '/', FL_CTRL, Fl_Text_Editor::kf_undo }, // Emacs
{ '?', FL_CTRL, Fl_Text_Editor::kf_redo }, // Emacs
{ 'x', FL_CTRL, Fl_Text_Editor::kf_cut },
diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
index 2e3a35cb07430b8e6150afdd90497d5bdb7abf49..442896bea76799c1c5664d48b5041388ac23f41d 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
@@ -1003,7 +1003,7 @@ const char *Fl_WinAPI_System_Driver::home_directory_name()
}
if (!home) {
const char *h = getenv("UserProfile");
- if (h)
+ if (h)
home = ::strdup(h);
}
if (!home) {