Skip to content

Commit 4c51a66

Browse files
committed
Fixed various typos.
Applied patch by snowleopard2 fixing a bunch of typos such as misspellings and double words in the documentation. Combined the patch with some local queued typos waiting to be committed as well as adding new typo fixes inspired by the patch. Function names with American spelling were not changed nor was third-party code touched. The only code changes involve some changes in strings that are translated ("Can not" -> "Cannot"). Closes wxWidgets#13063 (again). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1 parent 57ab6f2 commit 4c51a66

File tree

265 files changed

+817
-807
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

265 files changed

+817
-807
lines changed

acinclude.m4

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ac_ext=mm
2323
])
2424

2525
dnl ===========================================================================
26-
dnl macros to find the a file in the list of include/lib paths
26+
dnl macros to find a file in the list of include/lib paths
2727
dnl ===========================================================================
2828

2929
dnl ---------------------------------------------------------------------------
@@ -101,7 +101,7 @@ dnl after calling this function
101101
dnl ---------------------------------------------------------------------------
102102
AC_DEFUN([WX_LINK_PATH_EXIST],
103103
[
104-
dnl never add -L/usr/libXXX explicitely to libpath
104+
dnl never add -L/usr/libXXX explicitly to libpath
105105
if test "$1" = "default location"; then
106106
ac_path_to_link=""
107107
else
@@ -287,7 +287,7 @@ AC_TRY_RUN([main () {
287287
}], [ac_cv_c_bigendian=no], [ac_cv_c_bigendian=yes], [ac_cv_c_bigendian=unknown])
288288
fi])
289289
if test $ac_cv_c_bigendian = unknown; then
290-
AC_MSG_WARN([Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file])
290+
AC_MSG_WARN([Assuming little-endian target machine - this may be overridden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file])
291291
fi
292292
if test $ac_cv_c_bigendian = yes; then
293293
AC_DEFINE(WORDS_BIGENDIAN)

build/bakefiles/common.bkl

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(WXDLLFLAG)$(CFG)
188188
</set>
189189

190-
<!-- NB: this is make_var so that it can be overriden on command line
190+
<!-- NB: this is make_var so that it can be overridden on command line
191191
like this: nmake -f makefile.vc COMPILER_PREFIX=vc6 -->
192192
<set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
193193

build/bakefiles/config.bkl

+2-2
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ to run the tests, include CppUnit library here.
388388

389389
<set var="TOP_SRCDIR">$(top_srcdir)/</set>
390390
<set var="RUNTIME_LIBS">dynamic</set>
391-
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
391+
<set var="WXTOPDIR"/> <!-- to be overridden on bakefile cmd line -->
392392

393393
<option name="WITH_PLUGIN_SDL">
394394
<values>0,1</values>
@@ -413,7 +413,7 @@ it if SHARED=1 unless you know what you are doing.
413413
</description>
414414
</option>
415415

416-
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
416+
<set var="WXTOPDIR"/> <!-- to be overridden on bakefile cmd line -->
417417

418418
<set var="TOOLKIT" overwrite="0">
419419
<if cond="FORMAT=='msevc4prj'">WINCE</if>

build/bakefiles/wxpresets/presets/wx.bkl

+2-2
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@
391391

392392
<!-- Sets as output folder for the current target a directory
393393
called "$(value)/$(COMPILER_PREFIX)_lib|dll", just like wxWidgets does.
394-
This makes it possible to keep separed the libraries/exes compiled with
394+
This makes it possible to keep separated the libraries/exes compiled with
395395
different compilers and with a different value for WX_SHARED.
396396
-->
397397
<define-tag name="wxlike-dirname" rules="lib,dll,exe,module">
@@ -472,7 +472,7 @@
472472
<!-- -->
473473

474474
<!-- Sets the BUILDDIR variable using the same rules used by wxWidgets itself.
475-
This makes it possible to keep separed the object files compiled with
475+
This makes it possible to keep separated the object files compiled with
476476
different configuration settings.
477477
-->
478478
<define-global-tag name="set-wxlike-builddir">

configure

+4-4
Original file line numberDiff line numberDiff line change
@@ -1494,7 +1494,7 @@ do
14941494
{ (exit 1); exit 1; }; }
14951495
done
14961496

1497-
# There might be people who depend on the old broken behavior: `$host'
1497+
# There might be people who depend on the old broken behaviour: `$host'
14981498
# used to hold the argument of --host etc.
14991499
# FIXME: To remove some day.
15001500
build=$build_alias
@@ -18719,7 +18719,7 @@ fi
1871918719
if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
1872018720
if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
1872118721
# Implicitly turn on the new --with-macosx-sdk using the default
18722-
# SDK which provides the behavior this option has always had.
18722+
# SDK which provides the behaviour this option has always had.
1872318723
if test "x$wxUSE_MACOSX_SDK" = "x"; then
1872418724
{ echo "$as_me:$LINENO: WARNING: Enabling default SDK due to --enable-universal_binary." >&5
1872518725
echo "$as_me: WARNING: Enabling default SDK due to --enable-universal_binary." >&2;}
@@ -24842,8 +24842,8 @@ fi
2484224842
{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
2484324843
echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
2484424844
if test $ac_cv_c_bigendian = unknown; then
24845-
{ echo "$as_me:$LINENO: WARNING: Assuming little-endian target machine - this may be overriden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&5
24846-
echo "$as_me: WARNING: Assuming little-endian target machine - this may be overriden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&2;}
24845+
{ echo "$as_me:$LINENO: WARNING: Assuming little-endian target machine - this may be overridden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&5
24846+
echo "$as_me: WARNING: Assuming little-endian target machine - this may be overridden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&2;}
2484724847
fi
2484824848
if test $ac_cv_c_bigendian = yes; then
2484924849
cat >>confdefs.h <<\_ACEOF

configure.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@ dnl Support the old --enable-universal_binary in case anyone was using it.
11381138
dnl --enable-universal_binary=SDK names a path to an SDK
11391139
if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
11401140
# Implicitly turn on the new --with-macosx-sdk using the default
1141-
# SDK which provides the behavior this option has always had.
1141+
# SDK which provides the behaviour this option has always had.
11421142
if test "x$wxUSE_MACOSX_SDK" = "x"; then
11431143
AC_MSG_WARN([Enabling default SDK due to --enable-universal_binary.])
11441144
AC_MSG_WARN([If you don't want this, specify --without-macosx-sdk])
@@ -1448,7 +1448,7 @@ if test "$wxUSE_WINE" = "yes"; then
14481448
LDFLAGS_GUI="-mwindows"
14491449
fi
14501450

1451-
dnl NB: The two tests bellow are *NOT* mutually exclusive! They should only
1451+
dnl NB: The two tests below are *NOT* mutually exclusive! They should only
14521452
dnl take effect on Cygwin/Mingw and not other platforms.
14531453
if test "$wants_win32" = 1 ; then
14541454
USE_UNIX=0

docs/changes.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ Changes in behaviour which may result in compilation errors
266266

267267
- Virtual wxHtmlParser::AddText() takes wxString, not wxChar*, argument now.
268268

269-
- Functions that took wxChar* arguments that could by NULL in wxWidgets 2.8
269+
- Functions that took wxChar* arguments that could be NULL in wxWidgets 2.8
270270
are deprecated and passing NULL to them won't compile anymore, wxEmptyString
271271
must be used instead.
272272

@@ -321,7 +321,7 @@ Changes in behaviour which may result in compilation errors
321321
without enclosing parentheses results in warnings from g++ with -Wparentheses,
322322
add parentheses around the if statement body to work around it.
323323

324-
- wxList::Member() now returns book and not a pointer/iterator. This shouldn't
324+
- wxList::Member() now returns bool and not a pointer/iterator. This shouldn't
325325
require any changes as it was always meant to be used for checking for the
326326
presence of an element in the list only. If you used it as Find(), simple do
327327
use Find() instead.
@@ -614,7 +614,7 @@ All (GUI):
614614
dismissed immediately as text control grabbed the focus).
615615
- wxPropertyGrid: added wxPG_EX_MULTIPLE_SELECTION.
616616
- wxPropertyGrid: added functions for editing property labels.
617-
- wxPropertyGrid: many fixes to property validation failure behavior. Added
617+
- wxPropertyGrid: many fixes to property validation failure behaviour. Added
618618
new flags: wxPG_VFB_SHOW_MESSAGEBOX and wxPG_VFB_SHOW_MESSAGE_ON_STATUSBAR.
619619
- wxPropertyGrid: Added wxPropertyGrid::DedicateKey().
620620
- wxPropertyGrid: wxArrayStringProperty now uses wxEditableListBox.
@@ -2245,7 +2245,7 @@ All:
22452245
- Unicode support in wxODBC is now fully implemented
22462246
- A new data type specific to wxWidgets called SQL_C_WXCHAR has been introduced.
22472247
SQL_C_WXCHAR should be used rather than SQL_C_CHAR to ensure transparent
2248-
behavior between Unicode and non-unicode builds
2248+
behaviour between Unicode and non-unicode builds
22492249
- BLOB example added to samples/db (thanks to Casey O'Donnell)
22502250
- use wxStream::GetLength() instead of deprecated GetSize()
22512251
- wxGetOsDescription() is now more precise (Olly Betts)
@@ -2392,7 +2392,7 @@ All:
23922392
- sped up wxHTTP and wxFTP
23932393
- added wxStringInput/OutputStreams
23942394
- added wxFileConfig::Save(wxOutputStream)
2395-
- fixed wxString's behavior with inserted null characters
2395+
- fixed wxString's behaviour with inserted null characters
23962396

23972397
All (GUI):
23982398

docs/cocoa/coding_patterns.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ methods in a different manner.
7575
Because the Cocoa view hierarchy isn't a perfect match with the wxWidgets hierarchy, there are some conventions
7676
used to resolve this conflict. The first is that m_cocoaNSView is defined to be the view which most-closely
7777
represents the wxWidgets view. For instance, a wxButton has an NSButton instance and a wxStaticBox has an NSBox
78-
instance. Unfortunately, wxWidgets defines some behavior that Cocoa cannot directly implement. This is primarily
78+
instance. Unfortunately, wxWidgets defines some behaviour that Cocoa cannot directly implement. This is primarily
7979
window scrolling (e.g. without using a wxScrolledWindow) and window hiding.
8080

8181
Scrolling is implemented in a separate class known as wxWindowCocoaScrollView. This class does not fit into
@@ -89,7 +89,7 @@ This is an artifact of the pre-Panther days of Cocoa where there was no method f
8989

9090
What these classes do is provide a Cocoa view that sits between the wxWidget's parent window's view and the
9191
m_cocoaNSView provided by the window. The wxWindow class has a GetNSViewForSuperview() method that returns either
92-
the m_cocoaNSView (if the window does not need scrolling behavior and is not hidden) or returns the scroll view
92+
the m_cocoaNSView (if the window does not need scrolling behaviour and is not hidden) or returns the scroll view
9393
for the case of scrolling or the dummy view in the case of hiding. As the name suggests, the method is used
9494
from the parent wxWindow (the superview) when it sends something like an addSubview: message. The method is under
9595
no circumstances intended to be used as the receiver of an addSubview message. In fact, not even the GetNSView()

docs/doxygen/mainpages/utilities.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
1313
In addition to the wxWidgets libraries (see @ref page_libs), some utilities
1414
are available to the users in the @c utils hierarchy (even if some of them are
15-
explicitely coinceived for wxWidgets maintainance and will probably be of
15+
explicitly conceived for wxWidgets maintainance and will probably be of
1616
little use to others).
1717
1818
Please note that these utilities do represent only the utilities developed
@@ -71,7 +71,7 @@ can even correct them automatically. It uses the XML outputs of the gccxml utili
7171
(see http://www.gccxml.org) and of the Doxygen utility (see http://www.doxygen.org)
7272
to do the comparisons.
7373
74-
It's explicitely designed for wxWidgets documentation needs and is probably of little
74+
It's explicitly designed for wxWidgets documentation needs and is probably of little
7575
use for anything else than wxWidgets docs reviewing.
7676
7777
You can find it in @c utils/ifacecheck.

docs/doxygen/overviews/archive.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ attempts to update it if it is still around.
361361
The documentation for each archive entry type gives the details of what
362362
meta-data becomes available and when. For generic programming, when the worst
363363
case must be assumed, you can rely on all the fields of wxArchiveEntry being
364-
fully populated when GetNextEntry() returns, with the the following exceptions:
364+
fully populated when GetNextEntry() returns, with the following exceptions:
365365
366366
@li wxArchiveEntry::GetSize(): Guaranteed to be available after the entry has
367367
been read to wxInputStream::Eof(), or wxArchiveInputStream::CloseEntry()

docs/doxygen/overviews/config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ information. They were especially designed for this usage and, although may
2323
probably be used for many other things as well, should be limited to it. It
2424
means that this information should be:
2525
26-
@li Typed, i.e. strings or numbers for the moment. You can not store binary
26+
@li Typed, i.e. strings or numbers for the moment. You cannot store binary
2727
data, for example.
2828
@li Small. For instance, it is not recommended to use the Windows registry for
2929
amounts of data more than a couple of kilobytes.

docs/doxygen/overviews/customwidgets.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ and is obviously easier and faster.
2626
However there are situations where you need to show some particular kind of data
2727
which is not suited to any existing control.
2828
In these cases rather than hacking an existing control for something it has not
29-
been coinceived for, it's better to write a new widget.
29+
been conceived for, it's better to write a new widget.
3030
3131
3232
@section overview_customwidgets_how How to write the custom widget

docs/doxygen/overviews/propgrid.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ wxTextCtrl, they navigate between adjacent properties. As such:
794794
@section propgrid_customizing Customizing Properties (without sub-classing)
795795
796796
In this section are presented miscellaneous ways to have custom appearance
797-
and behavior for your properties without all the necessary hassle
797+
and behaviour for your properties without all the necessary hassle
798798
of sub-classing a property class etc.
799799
800800
@subsection propgrid_customimage Setting Value Image
@@ -957,7 +957,7 @@ wxPropertyGrid::CenterSplitter() method. <b>However, be sure to call it after
957957
the sizer setup and SetSize calls!</b> (ie. usually at the end of the
958958
frame/dialog constructor)
959959
960-
Splitter centering behavior can be customized using
960+
Splitter centering behaviour can be customized using
961961
wxPropertyGridInterface::SetColumnProportion(). Usually it is used to set
962962
non-equal column proportions, which in essence stops the splitter(s) from
963963
being 'centered' as such, and instead just auto-resized.
@@ -994,7 +994,7 @@ Version of wxPropertyGrid bundled with wxWidgets 2.9+ has various backward-
994994
incompatible changes from version 1.4, which had a stable API and will remain
995995
as the last separate branch.
996996
997-
Note that in general any behavior-breaking changes should not compile or run
997+
Note that in general any behaviour-breaking changes should not compile or run
998998
without warnings or errors.
999999
10001000
@subsection propgrid_compat_general General Changes
@@ -1005,14 +1005,14 @@ without warnings or errors.
10051005
with keyboard. This change allowed fixing broken tab traversal on wxGTK
10061006
(which is open issue in wxPropertyGrid 1.4).
10071007
1008-
- wxPG_EX_UNFOCUS_ON_ENTER style is removed and is now default behavior.
1008+
- wxPG_EX_UNFOCUS_ON_ENTER style is removed and is now default behaviour.
10091009
That is, when enter is pressed, editing is considered done and focus
10101010
moves back to the property grid from the editor control.
10111011
10121012
- A few member functions were removed from wxPropertyGridInterface.
10131013
Please use wxPGProperty's counterparts from now on.
10141014
1015-
- wxPGChoices now has proper Copy-On-Write behavior.
1015+
- wxPGChoices now has proper Copy-On-Write behaviour.
10161016
10171017
- wxPGChoices::SetExclusive() was renamed to AllocExclusive().
10181018
@@ -1026,15 +1026,15 @@ without warnings or errors.
10261026
now use wxPropertyGridInterface::GetEditableState() instead.
10271027
10281028
- wxPG_EX_DISABLE_TLP_TRACKING is now enabled by default. To get the old
1029-
behavior (recommended if you don't use a system that reparents the grid
1029+
behaviour (recommended if you don't use a system that reparents the grid
10301030
on its own), use the wxPG_EX_ENABLE_TLP_TRACKING extra style.
10311031
10321032
- Extended window style wxPG_EX_LEGACY_VALIDATORS was removed.
10331033
1034-
- Default property validation failure behavior has been changed to
1034+
- Default property validation failure behaviour has been changed to
10351035
(wxPG_VFB_MARK_CELL | wxPG_VFB_SHOW_MESSAGEBOX), which means that the
10361036
cell is marked red and wxMessageBox is shown. This is more user-friendly
1037-
than the old behavior, which simply beeped and prevented leaving the
1037+
than the old behaviour, which simply beeped and prevented leaving the
10381038
property editor until a valid value was entered.
10391039
10401040
- wxPropertyGridManager now has same Get/SetSelection() semantics as

docs/doxygen/overviews/refcount.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ will return @true if two objects are identical and not only if they share the
4747
same data.
4848
4949
Note that wxWidgets follows the <em>STL philosophy</em>: when a comparison
50-
operator can not be implemented efficiently (like for e.g. wxImage's ==
50+
operator cannot be implemented efficiently (like for e.g. wxImage's ==
5151
operator which would need to compare the entire image's data, pixel-by-pixel),
5252
it's not implemented at all. That's why not all reference counted classes
5353
provide comparison operators.

docs/doxygen/overviews/referencenotes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ that descriptions of inherited member functions are not duplicated in derived
1515
classes unless their behaviour is different. So in using a class such as
1616
wxScrolledWindow, be aware that wxWindow functions may be relevant.
1717
18-
Where not explicitely stated, size and position arguments may usually be given a
18+
Where not explicitly stated, size and position arguments may usually be given a
1919
value of ::wxDefaultSize and ::wxDefaultPosition, in which case wxWidgets will
2020
choose suitable values.
2121

docs/doxygen/overviews/thread.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/////////////////////////////////////////////////////////////////////////////
88

99
/*
10-
NOTE: we explicitely don't name wxMutexGUIEnter() and wxMutexGUILeave()
10+
NOTE: we explicitly don't name wxMutexGUIEnter() and wxMutexGUILeave()
1111
as they're not safe. See also ticket #10366.
1212
*/
1313

docs/doxygen/overviews/unicode.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ strings. Again, this mostly will be unnoticeable but can result in some
230230
- Using a cast to force the issue (listed only for completeness):
231231
@code printf("Hello, %s", (const char *)s.c_str()) @endcode
232232
233-
- The result of @c c_str() can not be cast to @c char* but only to @c const @c
233+
- The result of @c c_str() cannot be cast to @c char* but only to @c const @c
234234
@c char*. Of course, modifying the string via the pointer returned by this
235235
method has never been possible but unfortunately it was occasionally useful
236236
to use a @c const_cast here to pass the value to const-incorrect functions.

docs/doxygen/overviews/windowids.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ There are two ways to generate an ID. One way is to start at a negative
3636
number, and for each new ID, return the next smallest number. This is fine for
3737
systems that can use the full range of negative numbers for IDs, as this
3838
provides more than enough IDs and it would take a very very long time to run
39-
out and wrap around. However, some systems can not use the full range of the
39+
out and wrap around. However, some systems cannot use the full range of the
4040
ID value. Windows, for example, can only use 16 bit IDs, and only has about
4141
32000 possible automatic IDs that can be generated by wxWindow::NewControlId.
4242
If the program runs long enough, depending on the program itself, using this

docs/doxygen/overviews/windowsizing.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ some simple explanations of things.
4343
the minimal size.
4444
4545
@li @b "Maximum Size": just like for the minimal size, the maximum size is normally
46-
explicitely set by the programmer with the wxWindow::SetMaxSize() method or
46+
explicitly set by the programmer with the wxWindow::SetMaxSize() method or
4747
with wxWindow::SetSizeHints().
4848
Top-level windows such as wxFrame will not allow the user to resize the frame above
4949
the maximum size.

docs/doxygen/overviews/xrc_format.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1792,7 +1792,7 @@ wxWizardPageSimple classes. They both support the following properties
17921792
@endTable
17931793
17941794
wxWizardPageSimple pages are automatically chained together; wxWizardPage pages
1795-
transitions must be handled programatically.
1795+
transitions must be handled programmatically.
17961796
17971797
17981798
@section overview_xrcformat_sizers Sizers

0 commit comments

Comments
 (0)