summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2020-07-08 20:36:06 (GMT)
committerfvogel <fvogelnew1@free.fr>2020-07-08 20:36:06 (GMT)
commit3018d78340026597655745f383e8f4c2e4e9505d (patch)
treeef95c293ecfc06d3227776df90f2aa1d8838292c
parentdb1b8a5882c70d2016d8f24c02bc8f70fa5eb155 (diff)
downloadtk-3018d78340026597655745f383e8f4c2e4e9505d.zip
tk-3018d78340026597655745f383e8f4c2e4e9505d.tar.gz
tk-3018d78340026597655745f383e8f4c2e4e9505d.tar.bz2
Fix [34214bbdae]: typographical fixes in comments. Thanks to Christopher Chavez.
-rw-r--r--generic/tkBind.c2
-rw-r--r--generic/tkCanvPs.c2
-rw-r--r--generic/tkEntry.c4
-rw-r--r--generic/tkInt.h2
-rw-r--r--generic/tkTextDisp.c4
-rw-r--r--generic/tkTextTag.c2
-rw-r--r--generic/ttk/ttkEntry.c2
-rw-r--r--macosx/tkMacOSXColor.c2
-rw-r--r--macosx/tkMacOSXDialog.c2
-rw-r--r--macosx/tkMacOSXKeyEvent.c2
-rw-r--r--macosx/tkMacOSXKeysyms.h2
-rw-r--r--macosx/tkMacOSXMenubutton.c2
-rw-r--r--macosx/tkMacOSXMouseEvent.c6
-rw-r--r--macosx/tkMacOSXNotify.c2
-rw-r--r--macosx/tkMacOSXSend.c2
-rw-r--r--macosx/tkMacOSXSubwindows.c8
-rw-r--r--macosx/tkMacOSXWindowEvent.c18
-rw-r--r--macosx/tkMacOSXWm.c2
-rw-r--r--win/makefile.vc4
-rw-r--r--win/tkWinKey.c2
-rw-r--r--win/tkWinWm.c2
-rw-r--r--win/tkWinX.c2
-rw-r--r--win/ttkWinTheme.c2
-rw-r--r--xlib/X11/Xlib.h8
-rw-r--r--xlib/X11/keysymdef.h2
25 files changed, 44 insertions, 44 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c
index eacdf56..b3bddc9 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -3506,7 +3506,7 @@ DeleteVirtualEventTable(
* already defined, the new definition augments those that already exist.
*
* Results:
- * The return value is TCL_ERROR if an error occured while creating the
+ * The return value is TCL_ERROR if an error occurred while creating the
* virtual binding. In this case, an error message will be left in the
* interp's result. If all went well then the return value is TCL_OK.
*
diff --git a/generic/tkCanvPs.c b/generic/tkCanvPs.c
index bcd1d13..1a8b3d3 100644
--- a/generic/tkCanvPs.c
+++ b/generic/tkCanvPs.c
@@ -1601,7 +1601,7 @@ Tk_PostscriptPhoto(
/*
* Generate data for image in monochrome mode. No attempt at
* dithering is made--instead, just set a threshold. To handle
- * transparecies we need to output two lines: one for the black
+ * transparencies we need to output two lines: one for the black
* pixels, one for the white ones.
*/
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index 5fbff40..8141daf 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -3268,7 +3268,7 @@ EntryValidate(
*
* Results:
* TCL_OK if the validatecommand accepts the new string, TCL_ERROR if any
- * problems occured with validatecommand.
+ * problems occurred with validatecommand.
*
* Side effects:
* The insertion/deletion may be aborted, and the validatecommand might
@@ -3329,7 +3329,7 @@ EntryValidateChange(
/*
* If e->validate has become VALIDATE_NONE during the validation, or we
* now have VALIDATE_VAR set (from EntrySetValue) and didn't before, it
- * means that a loop condition almost occured. Do not allow this
+ * means that a loop condition almost occurred. Do not allow this
* validation result to finish.
*/
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 3a8328f..22460fb 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -692,7 +692,7 @@ typedef struct TkWindow {
Visual *visual; /* Visual to use for window. If not default,
* MUST be set before X window is created. */
int depth; /* Number of bits/pixel. */
- Window window; /* X's id for window. NULL means window hasn't
+ Window window; /* X's id for window. None means window hasn't
* actually been created yet, or it's been
* deleted. */
struct TkWindow *childList; /* First in list of child windows, or NULL if
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 93b56aa..6d680f6 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -1367,7 +1367,7 @@ LayoutDLine(
* expectations in the rest of the code, but we are able to skip
* elided portions of the line quickly.
*
- * If current chunk is elided and last chunk was too, coalese.
+ * If current chunk is elided and last chunk was too, coalesce.
*
* This also means that each logical line which is entirely elided
* still gets laid out into a DLine, but with zero height. This isn't
@@ -5275,7 +5275,7 @@ TkTextRelayoutWindow(
/*
* Invalidate cached scrollbar positions, so that scrollbars sliders will
- * be udpated.
+ * be updated.
*/
dInfoPtr->xScrollFirst = dInfoPtr->xScrollLast = -1;
diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c
index 0d223fe..f7e4294 100644
--- a/generic/tkTextTag.c
+++ b/generic/tkTextTag.c
@@ -1440,7 +1440,7 @@ ChangeTagPriority(
void
TkTextBindProc(
- ClientData clientData, /* Pointer to canvas structure. */
+ ClientData clientData, /* Pointer to text widget structure. */
XEvent *eventPtr) /* Pointer to X event that just happened. */
{
TkText *textPtr = clientData;
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index 29f69a1..770d8ff 100644
--- a/generic/ttk/ttkEntry.c
+++ b/generic/ttk/ttkEntry.c
@@ -557,7 +557,7 @@ static int EntryNeedsValidation(VMODE vmode, VREASON reason)
* Returns:
* TCL_OK if the change is accepted
* TCL_BREAK if the change is rejected
- * TCL_ERROR if any errors occured
+ * TCL_ERROR if any errors occurred
*
* The change will be rejected if -validatecommand returns 0,
* or if -validatecommand or -invalidcommand modifies the value.
diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 5b59b58..a0eaa84 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -506,7 +506,7 @@ TkSetMacColor(
* Results:
* None resp. retained CGColorRef for CopyCachedColor()
*
- * Side effects:M
+ * Side effects:
* None.
*
*----------------------------------------------------------------------
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index ceaa2ac..026439f 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -1680,7 +1680,7 @@ enum FontchooserOption {
* None.
*
* Side effects:
- * Additional events may be place on the Tk event queue.
+ * Additional events may be placed on the Tk event queue.
*
*----------------------------------------------------------------------
*/
diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index e0b0094..b0d91ad 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -771,7 +771,7 @@ TkMacOSXGetModalSession(void)
* This enables correct placement of the popups used for character
* selection by the NSTextInputClient. It gets called by text entry
* widgets whenever the cursor is drawn. It does nothing if the widget's
- * NSWindow is not the current KeyWindow. Otherwise it udpates the
+ * NSWindow is not the current KeyWindow. Otherwise it updates the
* display's caret structure and records the caret geometry in static
* variables for use by the NSTextInputClient implementation. Any
* widget passed to this function will be marked as being able to input
diff --git a/macosx/tkMacOSXKeysyms.h b/macosx/tkMacOSXKeysyms.h
index d84d1b9..da364ea 100644
--- a/macosx/tkMacOSXKeysyms.h
+++ b/macosx/tkMacOSXKeysyms.h
@@ -91,7 +91,7 @@ static const KeyInfo keyArray[] = {
{114, XK_Help, NSHelpFunctionKey},
{115, XK_Home, NSHomeFunctionKey}, /* Fn Left */
{116, XK_Page_Up, NSPageUpFunctionKey}, /* Fn Up */
- {117, XK_Delete, NSDeleteFunctionKey}, /* Fn Deleete */
+ {117, XK_Delete, NSDeleteFunctionKey}, /* Fn Delete */
{118, XK_F4, NSF4FunctionKey},
{119, XK_End, NSEndFunctionKey}, /* Fn Right */
{120, XK_F2, NSF2FunctionKey},
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c
index b6603b2..d1f429e 100644
--- a/macosx/tkMacOSXMenubutton.c
+++ b/macosx/tkMacOSXMenubutton.c
@@ -362,7 +362,7 @@ TkpComputeMenuButtonGeometry(butPtr)
*
* DrawMenuButtonImageAndText --
*
- * Draws the image and text associated witha button or label.
+ * Draws the image and text associated with a button or label.
*
* Results:
* None.
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 4e0b644..f274a07 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -502,7 +502,7 @@ XQueryPointer(
* True if event(s) are generated - false otherwise.
*
* Side effects:
- * Additional events may be place on the Tk event queue. Grab state may
+ * Additional events may be placed on the Tk event queue. Grab state may
* also change.
*
*----------------------------------------------------------------------
@@ -540,7 +540,7 @@ TkGenerateButtonEventForXPointer(
* True if event(s) are generated, false otherwise.
*
* Side effects:
- * Additional events may be place on the Tk event queue. Grab state may
+ * Additional events may be placed on the Tk event queue. Grab state may
* also change.
*
*----------------------------------------------------------------------
@@ -592,7 +592,7 @@ TkGenerateButtonEvent(
* True if event(s) are generated - false otherwise.
*
* Side effects:
- * Additional events may be place on the Tk event queue. Grab state may
+ * Additional events may be placed on the Tk event queue. Grab state may
* also change.
*
*----------------------------------------------------------------------
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index 96c9a7a..6120ae5 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -302,7 +302,7 @@ TkMacOSXNotifyExitHandler(
* TkMacOSXEventsSetupProc --
*
* This procedure implements the setup part of the MacOSX event source. It
- * is invoked by Tcl_DoOneEvent before calling TkMacOSXEventsProc to
+ * is invoked by Tcl_DoOneEvent before calling TkMacOSXEventsCheckProc to
* process all queued NSEvents. In our case, all we need to do is to set
* the Tcl MaxBlockTime to 0 before starting the loop to process all
* queued NSEvents.
diff --git a/macosx/tkMacOSXSend.c b/macosx/tkMacOSXSend.c
index 8b65532..a651bcd 100644
--- a/macosx/tkMacOSXSend.c
+++ b/macosx/tkMacOSXSend.c
@@ -3,7 +3,7 @@
*
* This file provides procedures that implement the "send" command,
* allowing commands to be passed from interpreter to interpreter. This
- * current implementation for the Mac has most functionality stubed out.
+ * current implementation for the Mac has most functionality stubbed out.
*
* The current plan, which we have not had time to implement, is for the
* first Wish app to create a gestalt of type 'WIsH'. This gestalt will
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 6602564..b085ba4 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -38,7 +38,7 @@ static void NotifyVisibility(TkWindow *winPtr, XEvent *eventPtr);
*
* XDestroyWindow --
*
- * Dealocates the given X Window.
+ * Deallocates the given X Window.
*
* Results:
* The window id is returned.
@@ -820,7 +820,7 @@ TkMacOSXUpdateClipRgn(
/*
* Clip away the area of any windows that may obscure this window.
- * For a non-toplevel window, first, clip to the parents visible
+ * For a non-toplevel window, first, clip to the parent's visible
* clip region. Second, clip away any siblings that are higher in
* the stacking order. For an embedded toplevel, just clip to the
* container's visible clip region. Remember, we only allow one
@@ -1275,7 +1275,7 @@ TkMacOSXInvalClipRgns(
*
* TkMacOSXWinBounds --
*
- * Given a Tk window this function determines the windows bounds in
+ * Given a Tk window this function determines the window's bounds in
* relation to the Macintosh window's coordinate system. This is also the
* same coordinate system as the Tk toplevel window in which this window
* is contained.
@@ -1307,7 +1307,7 @@ TkMacOSXWinBounds(
*
* TkMacOSXWinCGBounds --
*
- * Given a Tk window this function determines the windows bounds in
+ * Given a Tk window this function determines the window's bounds in
* relation to the Macintosh window's coordinate system. This is also the
* same coordinate system as the Tk toplevel window in which this window
* is contained.
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 61b647e..17f8585 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -424,16 +424,16 @@ TkpWillDrawWidget(Tk_Window tkwin) {
*
* GenerateUpdates --
*
- * Given a Macintosh update region and a Tk window this function geneates
+ * Given a Macintosh update region and a Tk window this function generates
* an X Expose event for the window if it meets the update region. The
- * function will then recursivly have each damaged window generate Expose
+ * function will then recursively have each damaged window generate Expose
* events for its child windows.
*
* Results:
* True if event(s) are generated - false otherwise.
*
* Side effects:
- * Additional events may be place on the Tk event queue.
+ * Additional events may be placed on the Tk event queue.
*
*----------------------------------------------------------------------
*/
@@ -458,7 +458,7 @@ GenerateUpdates(
}
/*
- * Compute the bounding box of the area that the damage occured in.
+ * Compute the bounding box of the area that the damage occurred in.
*/
boundsRgn = HIShapeCreateWithRect(&bounds);
@@ -532,7 +532,7 @@ GenerateUpdates(
* True if event(s) are generated - false otherwise.
*
* Side effects:
- * Additional events may be place on the Tk event queue.
+ * Additional events may be placed on the Tk event queue.
*
*----------------------------------------------------------------------
*/
@@ -560,7 +560,7 @@ GenerateActivateEvents(
* None.
*
* Side effects:
- * Additional events may be place on the Tk event queue.
+ * Additional events may be placed on the Tk event queue.
*
*----------------------------------------------------------------------
*/
@@ -584,7 +584,7 @@ DoWindowActivate(
* True if event(s) are generated - false otherwise.
*
* Side effects:
- * Additional events may be place on the Tk event queue.
+ * Additional events may be placed on the Tk event queue.
*
*----------------------------------------------------------------------
*/
@@ -742,7 +742,7 @@ TkGenWMConfigureEvent(
/*
* Now set up the changes structure. Under X we wait for the
- * ConfigureNotify to set these values. On the Mac we know imediatly that
+ * ConfigureNotify to set these values. On the Mac we know immediately that
* this is what we want - so we just set them. However, we need to make
* sure the windows clipping region is marked invalid so the change is
* visible to the subwindow.
@@ -934,7 +934,7 @@ RedisplayView(
NSView *view = (NSView *) clientdata;
/*
- * Make sure that we are not trying to displaying a view that no longer
+ * Make sure that we are not trying to display a view that no longer
* exists. Must call [NSApp windows] because [NSApp orderedWindows] excludes
* floating/utility windows and other window panels.
*/
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index d7df594..8e52278 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -4052,7 +4052,7 @@ TopLevelEventProc(
TkMacOSXDbgMsg("TopLevelEventProc: %s deleted", winPtr->pathName);
}
} else if (eventPtr->type == ReparentNotify) {
- Tcl_Panic("recieved unwanted reparent event");
+ Tcl_Panic("received unwanted reparent event");
}
}
diff --git a/win/makefile.vc b/win/makefile.vc
index fda0ff2..84c4e81 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -58,7 +58,7 @@
# 64-bit compiler, if your SDK has it.
#
# Examples:
-# Assumign Tcl sources lie in ../../tcl
+# Assuming Tcl sources lie in ../../tcl
# c:\tcl_src\win\>nmake -f makefile.vc release
# If Tcl sources are not in ../../tcl, use the TCLDIR macro to specify dir
# c:\tcl_src\win\>nmake -f makefile.vc release TCLDIR=c:\src\tcl
@@ -66,7 +66,7 @@
# c:\tcl_src\win\>nmake -f makefile.vc test
# Install Tk in location specified by INSTALLDIR macro
# c:\tcl_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl
-# Build release with PDF files
+# Build release with PDB files
# c:\tcl_src\win\>nmake -f makefile.vc release OPTS=pdbs
# Build debug version
# c:\tcl_src\win\>nmake -f makefile.vc release OPTS=symbols
diff --git a/win/tkWinKey.c b/win/tkWinKey.c
index 4451296..0cd086c 100644
--- a/win/tkWinKey.c
+++ b/win/tkWinKey.c
@@ -110,7 +110,7 @@ TkpGetString(
} else if (keyEv->send_event == -3) {
/*
- * Special case for WM_UNICHAR and win2000 multi-lingal IME input
+ * Special case for WM_UNICHAR and win2000 multilingual IME input
*/
len = TkUniCharToUtf(keyEv->keycode, buf);
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 9307503..f7ba611 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -2037,7 +2037,7 @@ UpdateWrapper(
* Pick the decorative frame style. Override redirect windows get
* created as undecorated popups if they have no transient parent,
* otherwise they are children. This allows splash screens to operate
- * as an independent window, while having dropdows (like for a
+ * as an independent window, while having dropdowns (like for a
* combobox) not grab focus away from their parent. Transient windows
* get a modal dialog frame. Neither override, nor transient windows
* appear in the Windows taskbar. Note that a transient window does
diff --git a/win/tkWinX.c b/win/tkWinX.c
index f445fce..8616369 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -1354,7 +1354,7 @@ GenerateXEvent(
* GetState --
*
* This function constructs a state mask for the mouse buttons and
- * modifier keys as they were before the event occured.
+ * modifier keys as they were before the event occurred.
*
* Results:
* Returns a composite value of all the modifier and button state flags
diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c
index 63e9704..b0468fd 100644
--- a/win/ttkWinTheme.c
+++ b/win/ttkWinTheme.c
@@ -7,7 +7,7 @@
#include <tkWinInt.h>
-#ifndef DFCS_HOT /* Windows 98/Me, Windows 200/XP only */
+#ifndef DFCS_HOT /* Windows 98/Me, Windows 2000/XP only */
#define DFCS_HOT 0
#endif
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h
index 7969ff5..91aab57 100644
--- a/xlib/X11/Xlib.h
+++ b/xlib/X11/Xlib.h
@@ -541,7 +541,7 @@ typedef struct {
Bool send_event; /* true if this came from a SendEvent request */
Display *display; /* Display the event was read from */
Window window; /* "event" window it is reported relative to */
- Window root; /* root window that the event occured on */
+ Window root; /* root window that the event occurred on */
Window subwindow; /* child window */
Time time; /* milliseconds */
int x, y; /* pointer x, y coordinates in event window */
@@ -559,7 +559,7 @@ typedef struct {
Bool send_event; /* true if this came from a SendEvent request */
Display *display; /* Display the event was read from */
Window window; /* "event" window it is reported relative to */
- Window root; /* root window that the event occured on */
+ Window root; /* root window that the event occurred on */
Window subwindow; /* child window */
Time time; /* milliseconds */
int x, y; /* pointer x, y coordinates in event window */
@@ -577,7 +577,7 @@ typedef struct {
Bool send_event; /* true if this came from a SendEvent request */
Display *display; /* Display the event was read from */
Window window; /* "event" window reported relative to */
- Window root; /* root window that the event occured on */
+ Window root; /* root window that the event occurred on */
Window subwindow; /* child window */
Time time; /* milliseconds */
int x, y; /* pointer x, y coordinates in event window */
@@ -594,7 +594,7 @@ typedef struct {
Bool send_event; /* true if this came from a SendEvent request */
Display *display; /* Display the event was read from */
Window window; /* "event" window reported relative to */
- Window root; /* root window that the event occured on */
+ Window root; /* root window that the event occurred on */
Window subwindow; /* child window */
Time time; /* milliseconds */
int x, y; /* pointer x, y coordinates in event window */
diff --git a/xlib/X11/keysymdef.h b/xlib/X11/keysymdef.h
index 460c72d..d334cf2 100644
--- a/xlib/X11/keysymdef.h
+++ b/xlib/X11/keysymdef.h
@@ -30,7 +30,7 @@ SOFTWARE.
/*
* TTY Functions, cleverly chosen to map to ascii, for convenience of
* programming, but could have been arbitrary (at the cost of lookup
- * tables in client code.
+ * tables in client code).
*/
#define XK_BackSpace 0xFF08 /* back space, back char */