mirror of
https://github.com/fltk/fltk.git
synced 2026-06-01 23:06:54 +08:00
Fix typos and trailing whitespace
Also replace 'MSWindows' with 'Windows' where appropriate, leaving only old documents like README files from 1.3 and older as-is.
This commit is contained in:
+1
-1
@@ -199,7 +199,7 @@ Changes in FLTK 1.4.0 RC1 Released: Oct 20 2024
|
|||||||
"wide character" commandline arguments to UTF-8.
|
"wide character" commandline arguments to UTF-8.
|
||||||
- X11 and Wayland platforms: Added support of HiDPI displays. FLTK apps
|
- X11 and Wayland platforms: Added support of HiDPI displays. FLTK apps
|
||||||
detect the current display scaling factor and use it to scale all windows.
|
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
|
automatically scale their GUI accordingly. This effectively renders WIN32
|
||||||
FLTK apps "per-monitor DPI-aware" whereas they were "DPI-unaware" before.
|
FLTK apps "per-monitor DPI-aware" whereas they were "DPI-unaware" before.
|
||||||
- Dynamical GUI rescaling: it is possible on all platforms to rescale all
|
- Dynamical GUI rescaling: it is possible on all platforms to rescale all
|
||||||
|
|||||||
+13
-15
@@ -33,7 +33,7 @@ Line Endings
|
|||||||
------------
|
------------
|
||||||
|
|
||||||
Although FLUID writes all line endings as '\n', readers should tolerate '\r\n'
|
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'.
|
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),
|
FLUID does not handle UTF-8 characters in any special manner (unescaped),
|
||||||
but stores and reads them verbatim, making UTF-8 character sequences perfectly
|
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.
|
source code files.
|
||||||
|
|
||||||
|
|
||||||
@@ -63,7 +63,7 @@ case-sensitive.
|
|||||||
Simple Words that are composed of 'a'-'z', 'A'-'Z', '0'-'9', and '_' only are
|
Simple Words that are composed of 'a'-'z', 'A'-'Z', '0'-'9', and '_' only are
|
||||||
written verbatim, followed by a space or newline.
|
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
|
padding spaces. For example, an empty word with no characters is written
|
||||||
as '{}', and ".hello" is written as '{.hello}'.
|
as '{}', and ".hello" is written as '{.hello}'.
|
||||||
|
|
||||||
@@ -117,7 +117,7 @@ followed by a newline, followed by
|
|||||||
|
|
||||||
version <float v>
|
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
|
+ 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
|
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
|
||||||
-------
|
-------
|
||||||
|
|
||||||
Options are usually comprised of a Word, two Words, or a Word and a String. If
|
Options are usually comprised of a Word, two Words, or a Word and a String.
|
||||||
an Option is missing, a default value is assumed.
|
If an Option is missing, a default value is assumed.
|
||||||
|
|
||||||
"Magic:" : used by fdesign, not written by FLUID
|
"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
|
"i18n_conditional" <word> : string
|
||||||
|
|
||||||
"header_name" <word> : can be the full filename, or just the
|
"header_name" <word> : can be the full filename or just the extension,
|
||||||
extension e.g. “.h” in which case FLUID will use the same filename
|
e.g. “.h” in which case FLUID will use the same filename as the .fl file.
|
||||||
as the .fl file.
|
|
||||||
|
|
||||||
"code_name" <word> : can be the full filename, or just the
|
"code_name" <word> : can be the full filename or just the extension,
|
||||||
extension e.g. “.cxx”
|
e.g. “.cxx”.
|
||||||
|
|
||||||
"snap" <word> : starting in V1.4 from May 2023, the 'snap' keyword can be
|
"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
|
used to store the selected layout and preset and include more suites
|
||||||
@@ -212,9 +211,8 @@ an Option is missing, a default value is assumed.
|
|||||||
"gridy" <word> : ignored
|
"gridy" <word> : ignored
|
||||||
|
|
||||||
"shell_commands" <word> : starting in V1.4 from Sep 2023, the 'shell_commands'
|
"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
|
keyword can be used to store user configurable shell commands in a project
|
||||||
project file. The following block can be skipped by reading it as a
|
file. The following block can be skipped by reading it as a single word.
|
||||||
single word.
|
|
||||||
|
|
||||||
shell_commands {
|
shell_commands {
|
||||||
command {
|
command {
|
||||||
@@ -516,7 +514,7 @@ Type "Fl_Window" <word> : C++ variable name
|
|||||||
min_w, min_h, max_w, max_h
|
min_w, min_h, max_w, max_h
|
||||||
"xywh" <word> : this Word is written with printf as "{%d %d %d %d}",
|
"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
|
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)
|
... : inherits more from Fl_Widget (not Fl_Group)
|
||||||
|
|
||||||
Type "Fl_Grid" <word> : C++ variable name
|
Type "Fl_Grid" <word> : C++ variable name
|
||||||
|
|||||||
+1
-1
@@ -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--; }
|
while (n>0 && *s>0 && isspace(*s)) { s++; n--; }
|
||||||
if (*s) line_start = false;
|
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=='\r') { s++; n--; }
|
||||||
if (n>0 && *s=='\n') line_start = true;
|
if (n>0 && *s=='\n') line_start = true;
|
||||||
if (n>0) {
|
if (n>0) {
|
||||||
|
|||||||
+1
-1
@@ -2192,7 +2192,7 @@ static void sigint(SIGARG) {
|
|||||||
\param[in] argv pointer to an array of arguments
|
\param[in] argv pointer to an array of arguments
|
||||||
\return in batch mode, an error code will be returned via \c exit() . This
|
\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.
|
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'
|
in batch mode. Is that intentional? Does it circumvent issues with Windows'
|
||||||
stderr and stdout?
|
stderr and stdout?
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -41,8 +41,8 @@
|
|||||||
/** \fn int Fl_Help_Dialog::load(const char *f)
|
/** \fn int Fl_Help_Dialog::load(const char *f)
|
||||||
\brief Loads the specified HTML file into the Fl_Help_View widget.
|
\brief Loads the specified HTML file into the Fl_Help_View widget.
|
||||||
The filename can also contain a target name ("filename.html#target"). Always
|
The filename can also contain a target name ("filename.html#target"). Always
|
||||||
use forward slashes as path deliminators, MSWindows-style backslashes are not
|
use forward slashes as path delimiters, Windows-style backslashes are not
|
||||||
supported here
|
supported here.
|
||||||
\param[in] f the name and path of an HTML file
|
\param[in] f the name and path of an HTML file
|
||||||
\return 0 on success, -1 on error
|
\return 0 on success, -1 on error
|
||||||
\see Fl_Help_View::load(), fl_load_uri()
|
\see Fl_Help_View::load(), fl_load_uri()
|
||||||
|
|||||||
@@ -3326,7 +3326,7 @@ Fl_Help_View::~Fl_Help_View()
|
|||||||
requested page in an external browser.
|
requested page in an external browser.
|
||||||
|
|
||||||
In all other cases, the URL is interpreted as a filename. The file is read and
|
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.
|
supported in the file name.
|
||||||
|
|
||||||
\param[in] f filename or URL
|
\param[in] f filename or URL
|
||||||
|
|||||||
@@ -132,7 +132,7 @@ static struct {
|
|||||||
{ FL_Page_Down, FL_CTRL|FL_SHIFT, Fl_Text_Editor::kf_c_s_move },
|
{ FL_Page_Down, FL_CTRL|FL_SHIFT, Fl_Text_Editor::kf_c_s_move },
|
||||||
//{ FL_Clear, 0, Fl_Text_Editor::delete_to_eol },
|
//{ FL_Clear, 0, Fl_Text_Editor::delete_to_eol },
|
||||||
{ 'z', FL_CTRL, Fl_Text_Editor::kf_undo },
|
{ '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_undo }, // Emacs
|
||||||
{ '?', FL_CTRL, Fl_Text_Editor::kf_redo }, // Emacs
|
{ '?', FL_CTRL, Fl_Text_Editor::kf_redo }, // Emacs
|
||||||
{ 'x', FL_CTRL, Fl_Text_Editor::kf_cut },
|
{ 'x', FL_CTRL, Fl_Text_Editor::kf_cut },
|
||||||
|
|||||||
Reference in New Issue
Block a user