summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2023-02-10 13:13:36 +0100
committerAlbrecht Schlosser <albrechts.fltk@online.de>2023-02-10 13:13:36 +0100
commit2239ecc4a18452521f079b697cbc0305536a7f81 (patch)
tree4f2fab0e89444d34fe25121d38e89e91f4268a38
parenta3251b3208744f77e2589eb36cbf2df2a15bee4f (diff)
Fix typos in documentation and comments
(no code changes)
-rw-r--r--FL/Fl_Text_Display.H4
-rw-r--r--documentation/src/coordinates.dox4
-rw-r--r--documentation/src/subclassing.dox2
-rw-r--r--src/Fl_Menu_add.cxx4
-rw-r--r--src/Fl_Pack.cxx15
-rw-r--r--src/Fl_win32.cxx8
6 files changed, 17 insertions, 20 deletions
diff --git a/FL/Fl_Text_Display.H b/FL/Fl_Text_Display.H
index 1b8647f92..6e687a60b 100644
--- a/FL/Fl_Text_Display.H
+++ b/FL/Fl_Text_Display.H
@@ -1,7 +1,7 @@
//
// Header file for Fl_Text_Display class.
//
-// Copyright 2001-2020 by Bill Spitzak and others.
+// Copyright 2001-2023 by Bill Spitzak and others.
// Original code Copyright Mark Edel. Permission to distribute under
// the LGPL for the FLTK library granted by Mark Edel.
//
@@ -47,7 +47,7 @@
\b Example \b Use
\code
- #include <FL/FL_Text_Display.H>
+ #include <FL/Fl_Text_Display.H>
..
int main() {
..
diff --git a/documentation/src/coordinates.dox b/documentation/src/coordinates.dox
index cd393ca40..5dff210e4 100644
--- a/documentation/src/coordinates.dox
+++ b/documentation/src/coordinates.dox
@@ -141,8 +141,8 @@ to show the appropriate panel.
For example, the user might be able to click on "Next" and "Prev"
navigation buttons or keys, as shown below.
-\image html wizard.png "FL_Wizard container widget"
-\image latex wizard.png "FL_Wizard container widget" width=4cm
+\image html wizard.png "Fl_Wizard container widget"
+\image latex wizard.png "Fl_Wizard container widget" width=4cm
\htmlonly
diff --git a/documentation/src/subclassing.dox b/documentation/src/subclassing.dox
index 1fa8da9f3..7dfe2909b 100644
--- a/documentation/src/subclassing.dox
+++ b/documentation/src/subclassing.dox
@@ -138,7 +138,7 @@ MyClass::draw() {
\endcode
\todo Clarify Fl_Window::damage(uchar) handling - seems confused/wrong?
- ORing value doesn't match setting behaviour in FL_Widget.H!
+ ORing value doesn't match setting behavior in Fl_Widget.H!
\anchor subclassing_draw_box
void Fl_Widget::draw_box() const <br>
diff --git a/src/Fl_Menu_add.cxx b/src/Fl_Menu_add.cxx
index 803e40f49..c5fdc502d 100644
--- a/src/Fl_Menu_add.cxx
+++ b/src/Fl_Menu_add.cxx
@@ -1,7 +1,7 @@
//
// Menu utilities for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2022 by Bill Spitzak and others.
+// 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
@@ -128,7 +128,7 @@ int Fl_Menu_Item::add(
\param[in] sc keyboard shortcut for new item
\param[in] cb callback function for new item
\param[in] data user data for new item
- \param[in] myflags menu flags as described in FL_Menu_Item
+ \param[in] myflags menu flags as described in Fl_Menu_Item
\returns the index into the menu() array, where the entry was added
*/
diff --git a/src/Fl_Pack.cxx b/src/Fl_Pack.cxx
index 5750c2255..dc6a4758b 100644
--- a/src/Fl_Pack.cxx
+++ b/src/Fl_Pack.cxx
@@ -1,7 +1,7 @@
//
// Packing widget for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2020 by Bill Spitzak and others.
+// 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
@@ -41,7 +41,6 @@
\param[in] X,Y X and Y coordinates (position)
\param[in] W,H width and height, respectively
\param[in] L label (optional)
-
*/
Fl_Pack::Fl_Pack(int X, int Y, int W, int H, const char *L)
: Fl_Group(X, Y, W, H, L) {
@@ -153,16 +152,14 @@ void Fl_Pack::draw() {
}
}
-/** Override Fl_Group resize behaviour.
+/** Override Fl_Group resize behavior.
- Resizing a Pack will not resize any of its children, but trigger a redraw,
- which in turn recalculates the dimensions of all children.
+ Resizing an Fl_Pack will not resize any of its children, but trigger a
+ redraw, which in turn recalculates the dimensions of all children.
- \param[in] X, Y, W, H new posistion and size of Pack
- */
+ \param[in] X, Y, W, H new position and size of the Fl_Pack widget
+*/
void Fl_Pack::resize(int X, int Y, int W, int H) {
Fl_Widget::resize(X, Y, W, H);
redraw();
}
-
-
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index c3e2838bf..74ce41b85 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1,7 +1,7 @@
//
// Windows-specific code for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2022 by Bill Spitzak and others.
+// 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
@@ -34,7 +34,7 @@
# define _WIN32_WINNT 0x0500
# endif
-// recent versions of MinGW warn: "Please include winsock2.h before windows.h",
+// recent versions of MinGW warn: "Please include winsock2.h before windows.h"
#if !defined(__CYGWIN__)
# include <winsock2.h>
#endif
@@ -2227,14 +2227,14 @@ void Fl_WinAPI_Window_Driver::makeWindow() {
w->redraw(); // force draw to happen
}
- // Needs to be done before ShowWindow() to get the correct behaviour
+ // Needs to be done before ShowWindow() to get the correct behavior
// when we get WM_SETFOCUS.
if (w->modal()) {
Fl::modal_ = w;
fl_fix_focus();
}
- // If we've captured the mouse, we dont want to activate any
+ // If we've captured the mouse, we don't want to activate any
// other windows from the code, or we lose the capture.
ShowWindow((HWND)x->xid, !showit ? SW_SHOWMINNOACTIVE :
(Fl::grab() || (styleEx & WS_EX_TOOLWINDOW)) ? SW_SHOWNOACTIVATE : SW_SHOWNORMAL);