From 4c51a665c649f7579fb39e62070cef4f66b3210d Mon Sep 17 00:00:00 2001 From: Dimitri Schoolwerth Date: Tue, 22 Mar 2011 14:17:38 +0000 Subject: [PATCH] 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 #13063 (again). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- acinclude.m4 | 6 ++-- build/bakefiles/common.bkl | 2 +- build/bakefiles/config.bkl | 4 +-- build/bakefiles/wxpresets/presets/wx.bkl | 4 +-- configure | 8 +++--- configure.in | 4 +-- docs/changes.txt | 10 +++---- docs/cocoa/coding_patterns.txt | 4 +-- docs/doxygen/mainpages/utilities.h | 4 +-- docs/doxygen/overviews/archive.h | 2 +- docs/doxygen/overviews/config.h | 2 +- docs/doxygen/overviews/customwidgets.h | 2 +- docs/doxygen/overviews/propgrid.h | 16 +++++------ docs/doxygen/overviews/refcount.h | 2 +- docs/doxygen/overviews/referencenotes.h | 2 +- docs/doxygen/overviews/thread.h | 2 +- docs/doxygen/overviews/unicode.h | 2 +- docs/doxygen/overviews/windowids.h | 2 +- docs/doxygen/overviews/windowsizing.h | 2 +- docs/doxygen/overviews/xrc_format.h | 2 +- docs/os2/install.txt | 4 +-- docs/publicity/WoWoW30.html | 2 +- docs/tech/tn0003.txt | 2 +- include/wx/accel.h | 2 +- include/wx/caret.h | 2 +- include/wx/chkconf.h | 4 +-- include/wx/cocoa/NSApplication.h | 2 +- include/wx/cocoa/objc/objc_uniquifying.h | 4 +-- include/wx/cocoa/private/scrollview.h | 2 +- include/wx/cocoa/radiobox.h | 2 +- include/wx/combo.h | 4 +-- include/wx/datetime.h | 2 +- include/wx/debug.h | 2 +- include/wx/dfb/nonownedwnd.h | 4 +-- include/wx/docview.h | 4 +-- include/wx/gauge.h | 2 +- include/wx/gtk/gnome/gprint.h | 2 +- include/wx/gtk/print.h | 2 +- include/wx/gtk1/app.h | 2 +- include/wx/gtk1/notebook.h | 2 +- include/wx/gtk1/window.h | 2 +- include/wx/html/htmlpars.h | 6 ++-- include/wx/html/htmlwin.h | 4 +-- include/wx/mediactrl.h | 2 +- include/wx/msw/gauge.h | 2 +- include/wx/msw/registry.h | 2 +- include/wx/msw/statline.h | 2 +- include/wx/os2/statbmp.h | 2 +- include/wx/os2/statbox.h | 2 +- include/wx/os2/statline.h | 2 +- include/wx/os2/stattext.h | 2 +- include/wx/osx/carbon/statbmp.h | 2 +- include/wx/osx/core/cfdataref.h | 2 +- include/wx/osx/core/cfref.h | 6 ++-- include/wx/osx/core/dataview.h | 2 +- include/wx/osx/window.h | 2 +- include/wx/palmos/gauge.h | 2 +- include/wx/palmos/statbox.h | 2 +- include/wx/palmos/statline.h | 2 +- include/wx/propgrid/editors.h | 2 +- include/wx/propgrid/manager.h | 2 +- include/wx/propgrid/property.h | 26 ++++++++--------- include/wx/propgrid/propgrid.h | 26 ++++++++--------- include/wx/propgrid/propgriddefs.h | 2 +- include/wx/propgrid/propgridiface.h | 4 +-- include/wx/propgrid/propgridpagestate.h | 4 +-- include/wx/propgrid/props.h | 4 +-- include/wx/protocol/ftp.h | 2 +- include/wx/statbmp.h | 2 +- include/wx/statbox.h | 2 +- include/wx/statline.h | 2 +- include/wx/stattext.h | 2 +- include/wx/stc/stc.h | 10 +++---- include/wx/strvararg.h | 2 +- include/wx/weakref.h | 2 +- include/wx/window.h | 6 ++-- include/wx/xml/xml.h | 2 +- interface/wx/animate.h | 2 +- interface/wx/app.h | 2 +- interface/wx/archive.h | 2 +- interface/wx/aui/framemanager.h | 8 +++--- interface/wx/calctrl.h | 4 +-- interface/wx/config.h | 2 +- interface/wx/dc.h | 2 +- interface/wx/dir.h | 2 +- interface/wx/display.h | 2 +- interface/wx/dynarray.h | 4 +-- interface/wx/file.h | 4 +-- interface/wx/frame.h | 2 +- interface/wx/gauge.h | 2 +- interface/wx/html/htmlcell.h | 2 +- interface/wx/htmllbox.h | 2 +- interface/wx/image.h | 4 +-- interface/wx/list.h | 2 +- interface/wx/mimetype.h | 2 +- interface/wx/msw/registry.h | 2 +- interface/wx/print.h | 2 +- interface/wx/progdlg.h | 2 +- interface/wx/propgrid/editors.h | 2 +- interface/wx/propgrid/manager.h | 4 +-- interface/wx/propgrid/property.h | 28 ++++++++++++------ interface/wx/propgrid/propgrid.h | 18 ++++++------ interface/wx/propgrid/propgridiface.h | 4 +-- interface/wx/scrolwin.h | 2 +- interface/wx/sizer.h | 10 +++---- interface/wx/socket.h | 4 +-- interface/wx/textdlg.h | 2 +- interface/wx/thread.h | 6 ++-- interface/wx/toolbar.h | 2 +- interface/wx/treectrl.h | 8 +++--- interface/wx/weakref.h | 2 +- interface/wx/window.h | 2 +- interface/wx/wizard.h | 4 +-- locale/af.po | 22 +++++++-------- locale/ar.po | 22 +++++++-------- locale/ca.po | 22 +++++++-------- locale/ca@valencia.po | 22 +++++++-------- locale/cs.po | 22 +++++++-------- locale/da.po | 36 ++++++++++++------------ locale/de.po | 22 +++++++-------- locale/el.po | 22 +++++++-------- locale/es.po | 22 +++++++-------- locale/eu.po | 22 +++++++-------- locale/fi.po | 22 +++++++-------- locale/fr.po | 22 +++++++-------- locale/gl_ES.po | 22 +++++++-------- locale/hi.po | 22 +++++++-------- locale/hu.po | 22 +++++++-------- locale/id.po | 22 +++++++-------- locale/it.po | 22 +++++++-------- locale/ja.po | 22 +++++++-------- locale/ko_KR.po | 22 +++++++-------- locale/lv.po | 22 +++++++-------- locale/ms.po | 22 +++++++-------- locale/nb.po | 22 +++++++-------- locale/nl.po | 22 +++++++-------- locale/pl.po | 22 +++++++-------- locale/pt.po | 22 +++++++-------- locale/pt_BR.po | 22 +++++++-------- locale/ro.po | 22 +++++++-------- locale/ru.po | 22 +++++++-------- locale/sk.po | 22 +++++++-------- locale/sl.po | 22 +++++++-------- locale/sq.po | 24 ++++++++-------- locale/sv.po | 22 +++++++-------- locale/tr.po | 22 +++++++-------- locale/uk.po | 22 +++++++-------- locale/vi.po | 22 +++++++-------- locale/wxstd.pot | 22 +++++++-------- locale/zh_CN.po | 22 +++++++-------- locale/zh_TW.po | 22 +++++++-------- misc/theme_test/test.c | 2 +- samples/aui/auidemo.cpp | 2 +- samples/debugrpt/debugrpt.cpp | 2 +- samples/dnd/d_and_d.txt | 2 +- samples/internat/internat.cpp | 2 +- samples/mediaplayer/mediaplayer.cpp | 2 +- samples/menu/menu.cpp | 2 +- samples/opengl/isosurf/isosurf.cpp | 2 +- samples/printing/printing.cpp | 2 +- samples/propgrid/propgrid.cpp | 6 ++-- samples/propgrid/sampleprops.h | 2 +- samples/propgrid/tests.cpp | 4 +-- samples/widgets/bmpcombobox.cpp | 2 +- samples/xti/classlist.h | 2 +- src/aui/auibook.cpp | 2 +- src/aui/framemanager.cpp | 8 +++--- src/cocoa/app.mm | 2 +- src/cocoa/combobox.mm | 2 +- src/cocoa/font.mm | 4 +-- src/cocoa/radiobox.mm | 2 +- src/cocoa/sound.mm | 2 +- src/cocoa/taskbar.mm | 2 +- src/cocoa/window.mm | 4 +-- src/common/any.cpp | 2 +- src/common/combocmn.cpp | 4 +-- src/common/dcgraph.cpp | 2 +- src/common/docview.cpp | 2 +- src/common/event.cpp | 2 +- src/common/fileconf.cpp | 2 +- src/common/filefn.cpp | 2 +- src/common/fontcmn.cpp | 4 +-- src/common/ftp.cpp | 2 +- src/common/imagpng.cpp | 2 +- src/common/intl.cpp | 2 +- src/common/sizer.cpp | 2 +- src/common/string.cpp | 14 ++++----- src/common/sysopt.cpp | 2 +- src/common/translation.cpp | 2 +- src/common/zipstrm.cpp | 4 +-- src/expat/aclocal.m4 | 2 +- src/generic/animateg.cpp | 4 +-- src/generic/clrpickerg.cpp | 2 +- src/generic/collpaneg.cpp | 2 +- src/generic/fontpickerg.cpp | 2 +- src/generic/grid.cpp | 4 +-- src/generic/imaglist.cpp | 2 +- src/generic/listctrl.cpp | 2 +- src/generic/splitter.cpp | 2 +- src/generic/statusbr.cpp | 2 +- src/generic/timer.cpp | 2 +- src/generic/treectlg.cpp | 2 +- src/generic/vscroll.cpp | 4 +-- src/generic/wizard.cpp | 2 +- src/gtk/aboutdlg.cpp | 2 +- src/gtk/app.cpp | 6 ++-- src/gtk/collpane.cpp | 4 +-- src/gtk/print.cpp | 2 +- src/gtk/renderer.cpp | 2 +- src/gtk/window.cpp | 2 +- src/gtk1/app.cpp | 2 +- src/gtk1/notebook.cpp | 2 +- src/html/htmlcell.cpp | 4 +-- src/html/htmlwin.cpp | 2 +- src/mgl/app.cpp | 2 +- src/mgl/evtloop.cpp | 6 ++-- src/mgl/fontmgr.cpp | 2 +- src/motif/mdi/README | 2 +- src/motif/mdi/doc/canvas.html | 8 +++--- src/motif/mdi/doc/mdi.html | 2 +- src/motif/mdi/doc/mwindow.html | 2 +- src/motif/utils.cpp | 2 +- src/msw/checklst.cpp | 2 +- src/msw/choice.cpp | 2 +- src/msw/clipbrd.cpp | 2 +- src/msw/dir.cpp | 2 +- src/msw/display.cpp | 2 +- src/msw/fdrepdlg.cpp | 2 +- src/msw/filedlg.cpp | 2 +- src/msw/mdi.cpp | 2 +- src/msw/mediactrl_am.cpp | 4 +-- src/msw/mediactrl_qt.cpp | 2 +- src/msw/regconf.cpp | 8 +++--- src/msw/thread.cpp | 10 +++---- src/msw/toolbar.cpp | 4 +-- src/msw/treectrl.cpp | 4 +-- src/msw/utils.cpp | 2 +- src/msw/wince/tbarwce.cpp | 2 +- src/msw/wince/time.cpp | 2 +- src/os2/clipbrd.cpp | 2 +- src/os2/font.cpp | 2 +- src/os2/listctrl.cpp | 2 +- src/os2/thread.cpp | 6 ++-- src/osx/button_osx.cpp | 2 +- src/osx/carbon/dataview.cpp | 4 +-- src/osx/carbon/glcanvas.cpp | 2 +- src/osx/carbon/listbox.cpp | 2 +- src/osx/carbon/mediactrl.cpp | 2 +- src/osx/carbon/nonownedwnd.cpp | 4 +-- src/osx/core/hidjoystick.cpp | 2 +- src/osx/core/sockosx.cpp | 2 +- src/osx/imaglist.cpp | 2 +- src/propgrid/editors.cpp | 2 +- src/propgrid/propgrid.cpp | 2 +- src/propgrid/propgridpagestate.cpp | 4 +-- src/stc/stc.cpp | 6 ++-- src/stc/stc.h.in | 2 +- src/univ/combobox.cpp | 2 +- src/x11/utils.cpp | 2 +- tests/benchmarks/htmlparser/htmlpars.h | 6 ++-- tests/fswatcher/fswatchertest.cpp | 2 +- tests/streams/bstream.h | 2 +- utils/ifacecheck/README.txt | 2 +- utils/ifacecheck/src/xmlparser.cpp | 6 ++-- wx-config.in | 8 +++--- 265 files changed, 817 insertions(+), 807 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 9247f1d107..1b60107640 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -23,7 +23,7 @@ ac_ext=mm ]) dnl =========================================================================== -dnl macros to find the a file in the list of include/lib paths +dnl macros to find a file in the list of include/lib paths dnl =========================================================================== dnl --------------------------------------------------------------------------- @@ -101,7 +101,7 @@ dnl after calling this function dnl --------------------------------------------------------------------------- AC_DEFUN([WX_LINK_PATH_EXIST], [ - dnl never add -L/usr/libXXX explicitely to libpath + dnl never add -L/usr/libXXX explicitly to libpath if test "$1" = "default location"; then ac_path_to_link="" else @@ -287,7 +287,7 @@ AC_TRY_RUN([main () { }], [ac_cv_c_bigendian=no], [ac_cv_c_bigendian=yes], [ac_cv_c_bigendian=unknown]) fi]) if test $ac_cv_c_bigendian = unknown; then - 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]) + 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]) fi if test $ac_cv_c_bigendian = yes; then AC_DEFINE(WORDS_BIGENDIAN) diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index f42f02b977..8948042f2b 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -187,7 +187,7 @@ $(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(WXDLLFLAG)$(CFG) - $(COMPILER) diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl index 5a2b9c91a3..ee14b32871 100644 --- a/build/bakefiles/config.bkl +++ b/build/bakefiles/config.bkl @@ -388,7 +388,7 @@ to run the tests, include CppUnit library here. $(top_srcdir)/ dynamic - + - + WINCE diff --git a/build/bakefiles/wxpresets/presets/wx.bkl b/build/bakefiles/wxpresets/presets/wx.bkl index 9a22a95ce9..ec262c9e09 100644 --- a/build/bakefiles/wxpresets/presets/wx.bkl +++ b/build/bakefiles/wxpresets/presets/wx.bkl @@ -391,7 +391,7 @@ @@ -472,7 +472,7 @@ diff --git a/configure b/configure index fb401de5bd..fb29f08cb9 100755 --- a/configure +++ b/configure @@ -1494,7 +1494,7 @@ do { (exit 1); exit 1; }; } done -# There might be people who depend on the old broken behavior: `$host' +# There might be people who depend on the old broken behaviour: `$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -18719,7 +18719,7 @@ fi if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then # Implicitly turn on the new --with-macosx-sdk using the default - # SDK which provides the behavior this option has always had. + # SDK which provides the behaviour this option has always had. if test "x$wxUSE_MACOSX_SDK" = "x"; then { echo "$as_me:$LINENO: WARNING: Enabling default SDK due to --enable-universal_binary." >&5 echo "$as_me: WARNING: Enabling default SDK due to --enable-universal_binary." >&2;} @@ -24842,8 +24842,8 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } if test $ac_cv_c_bigendian = unknown; then - { 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 -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;} + { 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 +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;} fi if test $ac_cv_c_bigendian = yes; then cat >>confdefs.h <<\_ACEOF diff --git a/configure.in b/configure.in index 141d4e8305..2ab4a20ac2 100644 --- a/configure.in +++ b/configure.in @@ -1138,7 +1138,7 @@ dnl Support the old --enable-universal_binary in case anyone was using it. dnl --enable-universal_binary=SDK names a path to an SDK if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then # Implicitly turn on the new --with-macosx-sdk using the default - # SDK which provides the behavior this option has always had. + # SDK which provides the behaviour this option has always had. if test "x$wxUSE_MACOSX_SDK" = "x"; then AC_MSG_WARN([Enabling default SDK due to --enable-universal_binary.]) AC_MSG_WARN([If you don't want this, specify --without-macosx-sdk]) @@ -1448,7 +1448,7 @@ if test "$wxUSE_WINE" = "yes"; then LDFLAGS_GUI="-mwindows" fi -dnl NB: The two tests bellow are *NOT* mutually exclusive! They should only +dnl NB: The two tests below are *NOT* mutually exclusive! They should only dnl take effect on Cygwin/Mingw and not other platforms. if test "$wants_win32" = 1 ; then USE_UNIX=0 diff --git a/docs/changes.txt b/docs/changes.txt index 0bdb42ca08..cfaa93a461 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -266,7 +266,7 @@ Changes in behaviour which may result in compilation errors - Virtual wxHtmlParser::AddText() takes wxString, not wxChar*, argument now. -- Functions that took wxChar* arguments that could by NULL in wxWidgets 2.8 +- Functions that took wxChar* arguments that could be NULL in wxWidgets 2.8 are deprecated and passing NULL to them won't compile anymore, wxEmptyString must be used instead. @@ -321,7 +321,7 @@ Changes in behaviour which may result in compilation errors without enclosing parentheses results in warnings from g++ with -Wparentheses, add parentheses around the if statement body to work around it. -- wxList::Member() now returns book and not a pointer/iterator. This shouldn't +- wxList::Member() now returns bool and not a pointer/iterator. This shouldn't require any changes as it was always meant to be used for checking for the presence of an element in the list only. If you used it as Find(), simple do use Find() instead. @@ -614,7 +614,7 @@ All (GUI): dismissed immediately as text control grabbed the focus). - wxPropertyGrid: added wxPG_EX_MULTIPLE_SELECTION. - wxPropertyGrid: added functions for editing property labels. -- wxPropertyGrid: many fixes to property validation failure behavior. Added +- wxPropertyGrid: many fixes to property validation failure behaviour. Added new flags: wxPG_VFB_SHOW_MESSAGEBOX and wxPG_VFB_SHOW_MESSAGE_ON_STATUSBAR. - wxPropertyGrid: Added wxPropertyGrid::DedicateKey(). - wxPropertyGrid: wxArrayStringProperty now uses wxEditableListBox. @@ -2245,7 +2245,7 @@ All: - Unicode support in wxODBC is now fully implemented - A new data type specific to wxWidgets called SQL_C_WXCHAR has been introduced. SQL_C_WXCHAR should be used rather than SQL_C_CHAR to ensure transparent - behavior between Unicode and non-unicode builds + behaviour between Unicode and non-unicode builds - BLOB example added to samples/db (thanks to Casey O'Donnell) - use wxStream::GetLength() instead of deprecated GetSize() - wxGetOsDescription() is now more precise (Olly Betts) @@ -2392,7 +2392,7 @@ All: - sped up wxHTTP and wxFTP - added wxStringInput/OutputStreams - added wxFileConfig::Save(wxOutputStream) -- fixed wxString's behavior with inserted null characters +- fixed wxString's behaviour with inserted null characters All (GUI): diff --git a/docs/cocoa/coding_patterns.txt b/docs/cocoa/coding_patterns.txt index 4e2af89670..456c7b3532 100644 --- a/docs/cocoa/coding_patterns.txt +++ b/docs/cocoa/coding_patterns.txt @@ -75,7 +75,7 @@ methods in a different manner. Because the Cocoa view hierarchy isn't a perfect match with the wxWidgets hierarchy, there are some conventions used to resolve this conflict. The first is that m_cocoaNSView is defined to be the view which most-closely represents the wxWidgets view. For instance, a wxButton has an NSButton instance and a wxStaticBox has an NSBox -instance. Unfortunately, wxWidgets defines some behavior that Cocoa cannot directly implement. This is primarily +instance. Unfortunately, wxWidgets defines some behaviour that Cocoa cannot directly implement. This is primarily window scrolling (e.g. without using a wxScrolledWindow) and window hiding. 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 What these classes do is provide a Cocoa view that sits between the wxWidget's parent window's view and the m_cocoaNSView provided by the window. The wxWindow class has a GetNSViewForSuperview() method that returns either -the m_cocoaNSView (if the window does not need scrolling behavior and is not hidden) or returns the scroll view +the m_cocoaNSView (if the window does not need scrolling behaviour and is not hidden) or returns the scroll view for the case of scrolling or the dummy view in the case of hiding. As the name suggests, the method is used from the parent wxWindow (the superview) when it sends something like an addSubview: message. The method is under no circumstances intended to be used as the receiver of an addSubview message. In fact, not even the GetNSView() diff --git a/docs/doxygen/mainpages/utilities.h b/docs/doxygen/mainpages/utilities.h index 392cded651..a332e15577 100644 --- a/docs/doxygen/mainpages/utilities.h +++ b/docs/doxygen/mainpages/utilities.h @@ -12,7 +12,7 @@ In addition to the wxWidgets libraries (see @ref page_libs), some utilities are available to the users in the @c utils hierarchy (even if some of them are -explicitely coinceived for wxWidgets maintainance and will probably be of +explicitly conceived for wxWidgets maintainance and will probably be of little use to others). 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 (see http://www.gccxml.org) and of the Doxygen utility (see http://www.doxygen.org) to do the comparisons. -It's explicitely designed for wxWidgets documentation needs and is probably of little +It's explicitly designed for wxWidgets documentation needs and is probably of little use for anything else than wxWidgets docs reviewing. You can find it in @c utils/ifacecheck. diff --git a/docs/doxygen/overviews/archive.h b/docs/doxygen/overviews/archive.h index 5cc4f7a142..6be6b783c3 100644 --- a/docs/doxygen/overviews/archive.h +++ b/docs/doxygen/overviews/archive.h @@ -361,7 +361,7 @@ attempts to update it if it is still around. The documentation for each archive entry type gives the details of what meta-data becomes available and when. For generic programming, when the worst case must be assumed, you can rely on all the fields of wxArchiveEntry being -fully populated when GetNextEntry() returns, with the the following exceptions: +fully populated when GetNextEntry() returns, with the following exceptions: @li wxArchiveEntry::GetSize(): Guaranteed to be available after the entry has been read to wxInputStream::Eof(), or wxArchiveInputStream::CloseEntry() diff --git a/docs/doxygen/overviews/config.h b/docs/doxygen/overviews/config.h index d650b98002..d7f1d34cd6 100644 --- a/docs/doxygen/overviews/config.h +++ b/docs/doxygen/overviews/config.h @@ -23,7 +23,7 @@ information. They were especially designed for this usage and, although may probably be used for many other things as well, should be limited to it. It means that this information should be: -@li Typed, i.e. strings or numbers for the moment. You can not store binary +@li Typed, i.e. strings or numbers for the moment. You cannot store binary data, for example. @li Small. For instance, it is not recommended to use the Windows registry for amounts of data more than a couple of kilobytes. diff --git a/docs/doxygen/overviews/customwidgets.h b/docs/doxygen/overviews/customwidgets.h index ff85561126..8891e1bccf 100644 --- a/docs/doxygen/overviews/customwidgets.h +++ b/docs/doxygen/overviews/customwidgets.h @@ -26,7 +26,7 @@ and is obviously easier and faster. However there are situations where you need to show some particular kind of data which is not suited to any existing control. In these cases rather than hacking an existing control for something it has not -been coinceived for, it's better to write a new widget. +been conceived for, it's better to write a new widget. @section overview_customwidgets_how How to write the custom widget diff --git a/docs/doxygen/overviews/propgrid.h b/docs/doxygen/overviews/propgrid.h index 887a355d1f..e27fac15c5 100644 --- a/docs/doxygen/overviews/propgrid.h +++ b/docs/doxygen/overviews/propgrid.h @@ -794,7 +794,7 @@ wxTextCtrl, they navigate between adjacent properties. As such: @section propgrid_customizing Customizing Properties (without sub-classing) In this section are presented miscellaneous ways to have custom appearance -and behavior for your properties without all the necessary hassle +and behaviour for your properties without all the necessary hassle of sub-classing a property class etc. @subsection propgrid_customimage Setting Value Image @@ -957,7 +957,7 @@ wxPropertyGrid::CenterSplitter() method. However, be sure to call it after the sizer setup and SetSize calls! (ie. usually at the end of the frame/dialog constructor) - Splitter centering behavior can be customized using + Splitter centering behaviour can be customized using wxPropertyGridInterface::SetColumnProportion(). Usually it is used to set non-equal column proportions, which in essence stops the splitter(s) from being 'centered' as such, and instead just auto-resized. @@ -994,7 +994,7 @@ Version of wxPropertyGrid bundled with wxWidgets 2.9+ has various backward- incompatible changes from version 1.4, which had a stable API and will remain as the last separate branch. -Note that in general any behavior-breaking changes should not compile or run +Note that in general any behaviour-breaking changes should not compile or run without warnings or errors. @subsection propgrid_compat_general General Changes @@ -1005,14 +1005,14 @@ without warnings or errors. with keyboard. This change allowed fixing broken tab traversal on wxGTK (which is open issue in wxPropertyGrid 1.4). - - wxPG_EX_UNFOCUS_ON_ENTER style is removed and is now default behavior. + - wxPG_EX_UNFOCUS_ON_ENTER style is removed and is now default behaviour. That is, when enter is pressed, editing is considered done and focus moves back to the property grid from the editor control. - A few member functions were removed from wxPropertyGridInterface. Please use wxPGProperty's counterparts from now on. - - wxPGChoices now has proper Copy-On-Write behavior. + - wxPGChoices now has proper Copy-On-Write behaviour. - wxPGChoices::SetExclusive() was renamed to AllocExclusive(). @@ -1026,15 +1026,15 @@ without warnings or errors. now use wxPropertyGridInterface::GetEditableState() instead. - wxPG_EX_DISABLE_TLP_TRACKING is now enabled by default. To get the old - behavior (recommended if you don't use a system that reparents the grid + behaviour (recommended if you don't use a system that reparents the grid on its own), use the wxPG_EX_ENABLE_TLP_TRACKING extra style. - Extended window style wxPG_EX_LEGACY_VALIDATORS was removed. - - Default property validation failure behavior has been changed to + - Default property validation failure behaviour has been changed to (wxPG_VFB_MARK_CELL | wxPG_VFB_SHOW_MESSAGEBOX), which means that the cell is marked red and wxMessageBox is shown. This is more user-friendly - than the old behavior, which simply beeped and prevented leaving the + than the old behaviour, which simply beeped and prevented leaving the property editor until a valid value was entered. - wxPropertyGridManager now has same Get/SetSelection() semantics as diff --git a/docs/doxygen/overviews/refcount.h b/docs/doxygen/overviews/refcount.h index 081cad74eb..90f392ff3b 100644 --- a/docs/doxygen/overviews/refcount.h +++ b/docs/doxygen/overviews/refcount.h @@ -47,7 +47,7 @@ will return @true if two objects are identical and not only if they share the same data. Note that wxWidgets follows the STL philosophy: when a comparison -operator can not be implemented efficiently (like for e.g. wxImage's == +operator cannot be implemented efficiently (like for e.g. wxImage's == operator which would need to compare the entire image's data, pixel-by-pixel), it's not implemented at all. That's why not all reference counted classes provide comparison operators. diff --git a/docs/doxygen/overviews/referencenotes.h b/docs/doxygen/overviews/referencenotes.h index 3dfb38edfa..9c6c6a40c4 100644 --- a/docs/doxygen/overviews/referencenotes.h +++ b/docs/doxygen/overviews/referencenotes.h @@ -15,7 +15,7 @@ that descriptions of inherited member functions are not duplicated in derived classes unless their behaviour is different. So in using a class such as wxScrolledWindow, be aware that wxWindow functions may be relevant. -Where not explicitely stated, size and position arguments may usually be given a +Where not explicitly stated, size and position arguments may usually be given a value of ::wxDefaultSize and ::wxDefaultPosition, in which case wxWidgets will choose suitable values. diff --git a/docs/doxygen/overviews/thread.h b/docs/doxygen/overviews/thread.h index 8c64eb81f5..b77bab7f9b 100644 --- a/docs/doxygen/overviews/thread.h +++ b/docs/doxygen/overviews/thread.h @@ -7,7 +7,7 @@ ///////////////////////////////////////////////////////////////////////////// /* - NOTE: we explicitely don't name wxMutexGUIEnter() and wxMutexGUILeave() + NOTE: we explicitly don't name wxMutexGUIEnter() and wxMutexGUILeave() as they're not safe. See also ticket #10366. */ diff --git a/docs/doxygen/overviews/unicode.h b/docs/doxygen/overviews/unicode.h index 7dc81dc4b5..6b3119296d 100644 --- a/docs/doxygen/overviews/unicode.h +++ b/docs/doxygen/overviews/unicode.h @@ -230,7 +230,7 @@ problems: - Using a cast to force the issue (listed only for completeness): @code printf("Hello, %s", (const char *)s.c_str()) @endcode - - The result of @c c_str() can not be cast to @c char* but only to @c const @c + - The result of @c c_str() cannot be cast to @c char* but only to @c const @c @c char*. Of course, modifying the string via the pointer returned by this method has never been possible but unfortunately it was occasionally useful to use a @c const_cast here to pass the value to const-incorrect functions. diff --git a/docs/doxygen/overviews/windowids.h b/docs/doxygen/overviews/windowids.h index 59e90287e8..7bfc294d06 100644 --- a/docs/doxygen/overviews/windowids.h +++ b/docs/doxygen/overviews/windowids.h @@ -36,7 +36,7 @@ There are two ways to generate an ID. One way is to start at a negative number, and for each new ID, return the next smallest number. This is fine for systems that can use the full range of negative numbers for IDs, as this provides more than enough IDs and it would take a very very long time to run -out and wrap around. However, some systems can not use the full range of the +out and wrap around. However, some systems cannot use the full range of the ID value. Windows, for example, can only use 16 bit IDs, and only has about 32000 possible automatic IDs that can be generated by wxWindow::NewControlId. If the program runs long enough, depending on the program itself, using this diff --git a/docs/doxygen/overviews/windowsizing.h b/docs/doxygen/overviews/windowsizing.h index 11c0901569..5492c10e38 100644 --- a/docs/doxygen/overviews/windowsizing.h +++ b/docs/doxygen/overviews/windowsizing.h @@ -43,7 +43,7 @@ some simple explanations of things. the minimal size. @li @b "Maximum Size": just like for the minimal size, the maximum size is normally - explicitely set by the programmer with the wxWindow::SetMaxSize() method or + explicitly set by the programmer with the wxWindow::SetMaxSize() method or with wxWindow::SetSizeHints(). Top-level windows such as wxFrame will not allow the user to resize the frame above the maximum size. diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h index b21050130f..dfd1fed23d 100644 --- a/docs/doxygen/overviews/xrc_format.h +++ b/docs/doxygen/overviews/xrc_format.h @@ -1792,7 +1792,7 @@ wxWizardPageSimple classes. They both support the following properties @endTable wxWizardPageSimple pages are automatically chained together; wxWizardPage pages -transitions must be handled programatically. +transitions must be handled programmatically. @section overview_xrcformat_sizers Sizers diff --git a/docs/os2/install.txt b/docs/os2/install.txt index 3a6a7224df..8b6882207a 100644 --- a/docs/os2/install.txt +++ b/docs/os2/install.txt @@ -73,7 +73,7 @@ it, EMX is following the example of the unix ports. Compilation with VisualAge -------------------------- -In addition to VisualAge V3.0 Fixpack 8 you will need the following inorder +In addition to VisualAge V3.0 Fixpack 8 you will need the following in order to successfully build and use wxWidgets for OS/2: 1. IBM OS/2 Toolkit Version 4.5 or later @@ -130,7 +130,7 @@ the following three modules from your temp.def file, db.cpp, dbgrid.cpp and dbtable.cpp. save you changes to temp.def. Delete wx23.def and rename your temp.def to wx23.def and you are ready to go. -I hope to clean up the .dll builds at some point before the the library is +I hope to clean up the .dll builds at some point before the library is a full fledged production caliber product. Fortunately EMX and Watcom can use the import and export pragmas successfully negating the need for manual .def files. VA 3.0, unfortunately in C++ does not properly export the mangled diff --git a/docs/publicity/WoWoW30.html b/docs/publicity/WoWoW30.html index 2fd25df77a..c710283b0c 100644 --- a/docs/publicity/WoWoW30.html +++ b/docs/publicity/WoWoW30.html @@ -250,7 +250,7 @@ and may thus be the most important changes from a user's perspective

  • Added a new sizer which can wrap across multiple lines. See wxWrapSizer.

  • Added multi-sample and anti-aliasing support - the the OpenGL canvas and separated wxGLCanvas and wxGLContext. See + to the OpenGL canvas and separated wxGLCanvas and wxGLContext. See wxGLCanvas.

  • Added wxNativeContainerWindow in order to construct a wxTopLevelWindow from a native window handle (MSW and diff --git a/docs/tech/tn0003.txt b/docs/tech/tn0003.txt index 7feee05b54..f81beb4074 100644 --- a/docs/tech/tn0003.txt +++ b/docs/tech/tn0003.txt @@ -177,7 +177,7 @@ commands are optionals. Also note that if you use @section and @subsection in the class description (at the beginning), you should use as the section's anchor name "xxxx_yyyy" -where "xxxx" is the the class name without the initial "wx" in lowercase +where "xxxx" is the class name without the initial "wx" in lowercase and "yyyy" is a lowercase word which uniquely identifies that section. E.g.: diff --git a/include/wx/accel.h b/include/wx/accel.h index 65b9a182f6..6d0e2701ea 100644 --- a/include/wx/accel.h +++ b/include/wx/accel.h @@ -116,7 +116,7 @@ public: // returns a wxString for the this accelerator. // this function formats it using the - format - // where maybe a hyphen-separed list of "shift|alt|ctrl" + // where maybe a hyphen-separated list of "shift|alt|ctrl" wxString ToString() const; // returns true if the given string correctly initialized this object diff --git a/include/wx/caret.h b/include/wx/caret.h index c0a30bb893..1c28b6df2c 100644 --- a/include/wx/caret.h +++ b/include/wx/caret.h @@ -147,7 +147,7 @@ public: virtual void OnKillFocus() { } protected: - // these functions may be overriden in the derived classes, but they + // these functions may be overridden in the derived classes, but they // should call the base class version first virtual bool DoCreate(wxWindowBase *window, int width, int height) { diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index b5460626f8..65f6ce6702 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -21,10 +21,10 @@ If you get an error saying "wxUSE_FOO must be defined", it means that you are not using the correct up-to-date version of setup.h. This happens most often when using svn or daily snapshots and a new symbol was added to - setup0.h and you haven't updated your local setup.h to to reflect it. If + setup0.h and you haven't updated your local setup.h to reflect it. If this is the case, you need to propagate the changes from setup0.h to your setup.h and, if using makefiles under MSW, also remove setup.h under the - build directory (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that it + build directory (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that the new setup.h is copied there. If you get an error of the form "wxFoo requires wxBar", then the settings diff --git a/include/wx/cocoa/NSApplication.h b/include/wx/cocoa/NSApplication.h index d1fc4c6677..112b9ce75d 100644 --- a/include/wx/cocoa/NSApplication.h +++ b/include/wx/cocoa/NSApplication.h @@ -19,7 +19,7 @@ // ======================================================================== /*! @class wxNSApplicationDelegate - @discussion Implements an NSApplication delegate which can respond to messages sent by Cocoa to change Cocoa's behavior. + @discussion Implements an NSApplication delegate which can respond to messages sent by Cocoa to change Cocoa's behaviour. wxCocoa will set a singleton instance of this class as the NSApplication delegate upon startup unless wxWidgets is running in a "plugin" manner in which case it would not be appropriate to do this. diff --git a/include/wx/cocoa/objc/objc_uniquifying.h b/include/wx/cocoa/objc/objc_uniquifying.h index 667503c223..a8a10e7a55 100644 --- a/include/wx/cocoa/objc/objc_uniquifying.h +++ b/include/wx/cocoa/objc/objc_uniquifying.h @@ -205,7 +205,7 @@ struct objc_class* wx_GetObjcClass_ ## ObjcClass(); // _s_objc_class_ptr_ObjcClass: // .long L_OBJC_CLASS_ObjcClass // Once that static symbol is defined, the function implementation is easy for GCC to generate. -// Do note that return &s_objc_class_data_ObjcClass won't work. The code is wrong in the case. +// Do note that return &s_objc_class_data_ObjcClass won't work. The code is wrong in this case. #define WX_IMPLEMENT_OBJC_GET_COMPILED_CLASS(ObjcClass) \ extern "C" objc_class s_objc_class_data_ ## ObjcClass asm("L_OBJC_CLASS_" #ObjcClass); \ static objc_class * s_objc_class_ptr_ ## ObjcClass = &s_objc_class_data_ ## ObjcClass; \ @@ -278,7 +278,7 @@ inline objc_class * wxObjcCompilerInformation::GetCompiledClass() \ } // TODO: __x86_64__, __ppc64__ -#else // Can't wrie inline asm to bust into __OBJC segment +#else // Can't write inline asm to bust into __OBJC segment // This won't be used since the generic implementation takes precedence. #warning "Don't know how to implement wxObjcCompilerInformation::GetCompiledClass on this platform" diff --git a/include/wx/cocoa/private/scrollview.h b/include/wx/cocoa/private/scrollview.h index a1f3de30ed..da293574c7 100644 --- a/include/wx/cocoa/private/scrollview.h +++ b/include/wx/cocoa/private/scrollview.h @@ -48,7 +48,7 @@ protected: virtual void Cocoa_synthesizeMouseMoved(void) {} /*! Flag as to whether we're scrolling for a native view or a custom - wxWindow. This controls the scrolling behavior. When providing + wxWindow. This controls the scrolling behaviour. When providing scrolling for a native view we don't catch scroller action messages and thus don't send scroll events and we don't actually scroll the window when the application calls ScrollWindow. diff --git a/include/wx/cocoa/radiobox.h b/include/wx/cocoa/radiobox.h index 9e84110d2d..69600c8421 100644 --- a/include/wx/cocoa/radiobox.h +++ b/include/wx/cocoa/radiobox.h @@ -110,7 +110,7 @@ public: virtual void SetString(unsigned int n, const wxString& label); // change the individual radio button state protected: - // We don't want the typical wxCocoaNSBox behavior because our real + // We don't want the typical wxCocoaNSBox behaviour because our real // implementation is by using an NSMatrix as the NSBox's contentView. WX_NSMatrix GetNSMatrix() const; void AssociateNSBox(WX_NSBox theBox); diff --git a/include/wx/combo.h b/include/wx/combo.h index 622d33f8c9..cb13398fba 100644 --- a/include/wx/combo.h +++ b/include/wx/combo.h @@ -87,7 +87,7 @@ enum wxCC_IFLAG_CREATED = 0x0100, // Internal use: really put button outside wxCC_IFLAG_BUTTON_OUTSIDE = 0x0200, - // Internal use: SetMargins has been succesfully called + // Internal use: SetMargins has been successfully called wxCC_IFLAG_LEFT_MARGIN_SET = 0x0400, // Internal use: Set wxTAB_TRAVERSAL to parent when popup is dismissed wxCC_IFLAG_PARENT_TAB_TRAVERSAL = 0x0800, @@ -674,7 +674,7 @@ protected: wxRect m_tcArea; wxRect m_btnArea; - // Colour of the the text area, in case m_text is NULL + // Colour of the text area, in case m_text is NULL wxColour m_tcBgCol; // current button state (uses renderer flags) diff --git a/include/wx/datetime.h b/include/wx/datetime.h index 286155f29f..6b5b7f0412 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -173,7 +173,7 @@ public: // the time in the current time zone Local, - // zones from GMT (= Greenwhich Mean Time): they're guaranteed to be + // zones from GMT (= Greenwich Mean Time): they're guaranteed to be // consequent numbers, so writing something like `GMT0 + offset' is // safe if abs(offset) <= 12 diff --git a/include/wx/debug.h b/include/wx/debug.h index 3d49a9e523..af091bcc7f 100644 --- a/include/wx/debug.h +++ b/include/wx/debug.h @@ -312,7 +312,7 @@ extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file, wxCHECK_RET( p != NULL, "pointer can't be NULL" ) */ -// the generic macro: takes the condition to check, the statement to be execute +// the generic macro: takes the condition to check, the statement to be executed // in case the condition is false and the message to pass to the assert handler #define wxCHECK2_MSG(cond, op, msg) \ if ( cond ) \ diff --git a/include/wx/dfb/nonownedwnd.h b/include/wx/dfb/nonownedwnd.h index 86b7200aa1..66176215b0 100644 --- a/include/wx/dfb/nonownedwnd.h +++ b/include/wx/dfb/nonownedwnd.h @@ -80,7 +80,7 @@ protected: virtual wxIDirectFBSurfacePtr ObtainDfbSurface() const; - // overriden wxWindow methods + // overridden wxWindow methods virtual void DoGetPosition(int *x, int *y) const; virtual void DoGetSize(int *width, int *height) const; virtual void DoMoveWindow(int x, int y, int width, int height); @@ -92,7 +92,7 @@ protected: // wxWindows as in wx void SetDfbFocus(); - // overriden in wxTopLevelWindowDFB, there's no common handling for wxTLW + // overridden in wxTopLevelWindowDFB, there's no common handling for wxTLW // and wxPopupWindow to be done here virtual void HandleFocusEvent(const wxDFBWindowEvent& WXUNUSED(event_)) {} diff --git a/include/wx/docview.h b/include/wx/docview.h index 6cf9441ad4..90538ad638 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -184,8 +184,8 @@ protected: bool m_savedYet; // Called by OnSaveDocument and OnOpenDocument to implement standard - // Save/Load behavior. Re-implement in derived class for custom - // behavior. + // Save/Load behaviour. Re-implement in derived class for custom + // behaviour. virtual bool DoSaveDocument(const wxString& file); virtual bool DoOpenDocument(const wxString& file); diff --git a/include/wx/gauge.h b/include/wx/gauge.h index 65660db109..be03e7e8e7 100644 --- a/include/wx/gauge.h +++ b/include/wx/gauge.h @@ -84,7 +84,7 @@ public: virtual void SetBezelFace(int w); virtual int GetBezelFace() const; - // overriden base class virtuals + // overridden base class virtuals virtual bool AcceptsFocus() const { return false; } protected: diff --git a/include/wx/gtk/gnome/gprint.h b/include/wx/gtk/gnome/gprint.h index 82d8ad3ea6..1a44f084b9 100644 --- a/include/wx/gtk/gnome/gprint.h +++ b/include/wx/gtk/gnome/gprint.h @@ -290,7 +290,7 @@ protected: void SetPrintData(const wxPrintData& data); wxPrintData& GetPrintData() { return m_printData; } - // overriden for wxPrinterDC Impl + // overridden for wxPrinterDC Impl virtual wxRect GetPaperRect() const; virtual int GetResolution() const; diff --git a/include/wx/gtk/print.h b/include/wx/gtk/print.h index 26253b3b0e..0c918ee168 100644 --- a/include/wx/gtk/print.h +++ b/include/wx/gtk/print.h @@ -249,7 +249,7 @@ public: void SetPalette(const wxPalette& WXUNUSED(palette)) { } void SetResolution(int ppi); - // overriden for wxPrinterDC Impl + // overridden for wxPrinterDC Impl virtual int GetResolution() const; virtual wxRect GetPaperRect() const; diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h index ee059e1bee..c7c2f39e0e 100644 --- a/include/wx/gtk1/app.h +++ b/include/wx/gtk1/app.h @@ -58,7 +58,7 @@ public: unsigned char *m_colorCube; - // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual + // Used by the wxGLApp and wxGLCanvas class for GL-based X visual // selection. void *m_glVisualInfo; // this is actually an XVisualInfo* void *m_glFBCInfo; // this is actually an GLXFBConfig* diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h index f5ec7e3a7a..78c7ce5125 100644 --- a/include/wx/gtk1/notebook.h +++ b/include/wx/gtk1/notebook.h @@ -129,7 +129,7 @@ public: // flag set to true while we're inside "switch_page" callback bool m_inSwitchPage; - // flag set to true when the switch-page signal has been programatically generated + // flag set to true when the switch-page signal has been programmatically generated bool m_skipNextPageChangeEvent; protected: diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index 7bcd2f8350..2d3b634c64 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -112,7 +112,7 @@ public: // OnInternalIdle virtual void OnInternalIdle(); - // Internal represention of Update() + // Internal representation of Update() void GtkUpdate(); // For compatibility across platforms (not in event table) diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h index 58c56e5286..e654cb3f0a 100644 --- a/include/wx/html/htmlpars.h +++ b/include/wx/html/htmlpars.h @@ -156,14 +156,14 @@ protected: wxHtmlTagsCache *cache); // Adds text to the output. - // This is called from Parse() and must be overriden in derived classes. + // This is called from Parse() and must be overridden in derived classes. // txt is not guaranteed to be only one word. It is largest continuous part // of text (= not broken by tags) virtual void AddText(const wxString& txt) = 0; // Adds tag and proceeds it. Parse() may (and usually is) called from this method. - // This is called from Parse() and may be overriden. - // Default behavior is that it looks for proper handler in m_Handlers. The tag is + // This is called from Parse() and may be overridden. + // Default behaviour is that it looks for proper handler in m_Handlers. The tag is // ignored if no hander is found. // Derived class is *responsible* for filling in m_Handlers table. virtual void AddTag(const wxHtmlTag& tag); diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h index 298f19307e..f0fee49926 100644 --- a/include/wx/html/htmlwin.h +++ b/include/wx/html/htmlwin.h @@ -195,7 +195,7 @@ protected: /** Called by HandleMouseClick when the user clicks on a cell. - Default behavior is to call wxHtmlWindowInterface::OnLinkClicked() + Default behaviour is to call wxHtmlWindowInterface::OnLinkClicked() if this cell corresponds to a hypertext link. @param cell the cell the mouse is over @@ -358,7 +358,7 @@ public: // (depending on the information passed to SetRelatedFrame() method) virtual void OnSetTitle(const wxString& title); - // Called when user clicked on hypertext link. Default behavior is to + // Called when user clicked on hypertext link. Default behaviour is to // call LoadPage(loc) virtual void OnLinkClicked(const wxHtmlLinkInfo& link); diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h index 8dce9ad4ad..3af2526e16 100644 --- a/include/wx/mediactrl.h +++ b/include/wx/mediactrl.h @@ -58,7 +58,7 @@ enum wxMediaState enum wxMediaCtrlPlayerControls { wxMEDIACTRLPLAYERCONTROLS_NONE = 0, - //Step controls like fastfoward, step one frame etc. + //Step controls like fastforward, step one frame etc. wxMEDIACTRLPLAYERCONTROLS_STEP = 1 << 0, //Volume controls like the speaker icon, volume slider, etc. wxMEDIACTRLPLAYERCONTROLS_VOLUME = 1 << 1, diff --git a/include/wx/msw/gauge.h b/include/wx/msw/gauge.h index 69682c7afb..4ddbd3bd0e 100644 --- a/include/wx/msw/gauge.h +++ b/include/wx/msw/gauge.h @@ -47,7 +47,7 @@ public: virtual void SetRange(int range); virtual void SetValue(int pos); - // overriden base class virtuals + // overridden base class virtuals virtual bool SetForegroundColour(const wxColour& col); virtual bool SetBackgroundColour(const wxColour& col); diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h index 9b38eeec98..7969edba45 100644 --- a/include/wx/msw/registry.h +++ b/include/wx/msw/registry.h @@ -92,7 +92,7 @@ public: // get StdKey from root HKEY static StdKey GetStdKeyFromHkey(WXHKEY hkey); - // extacts the std key prefix from the string (return value) and + // extracts the std key prefix from the string (return value) and // leaves only the part after it (i.e. modifies the string passed!) static StdKey ExtractKeyName(wxString& str); diff --git a/include/wx/msw/statline.h b/include/wx/msw/statline.h index 5c684811bd..1efded8feb 100644 --- a/include/wx/msw/statline.h +++ b/include/wx/msw/statline.h @@ -38,7 +38,7 @@ public: long style = wxLI_HORIZONTAL, const wxString &name = wxStaticLineNameStr ); - // overriden base class virtuals + // overridden base class virtuals virtual bool AcceptsFocus() const { return false; } // usually overridden base class virtuals diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h index 724f23f859..2fd6032e55 100644 --- a/include/wx/os2/statbmp.h +++ b/include/wx/os2/statbmp.h @@ -52,7 +52,7 @@ class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase wxBitmap GetBitmap() const { wxASSERT( !m_bIsIcon ); return *(wxBitmap *)m_pImage; } - // overriden base class virtuals + // overridden base class virtuals virtual bool AcceptsFocus() const { return FALSE; } virtual MRESULT OS2WindowProc( WXUINT uMsg ,WXWPARAM wParam diff --git a/include/wx/os2/statbox.h b/include/wx/os2/statbox.h index 71fae0bf65..411d80da88 100644 --- a/include/wx/os2/statbox.h +++ b/include/wx/os2/statbox.h @@ -50,7 +50,7 @@ public: ); // - // overriden base class virtuals + // overridden base class virtuals // inline virtual bool AcceptsFocus(void) const { return FALSE; } diff --git a/include/wx/os2/statline.h b/include/wx/os2/statline.h index 1b0f6e99a6..5cddf0fc59 100644 --- a/include/wx/os2/statline.h +++ b/include/wx/os2/statline.h @@ -44,7 +44,7 @@ public: inline static int GetDefaultSize(void) { return 2; } // - // Overriden base class virtuals + // Overridden base class virtuals // inline virtual bool AcceptsFocus(void) const {return FALSE;} diff --git a/include/wx/os2/stattext.h b/include/wx/os2/stattext.h index c58cfe70c9..d730409fd3 100644 --- a/include/wx/os2/stattext.h +++ b/include/wx/os2/stattext.h @@ -46,7 +46,7 @@ public: virtual bool SetFont(const wxFont &rFont); // - // Overriden base class virtuals + // Overridden base class virtuals // virtual bool AcceptsFocus() const { return FALSE; } diff --git a/include/wx/osx/carbon/statbmp.h b/include/wx/osx/carbon/statbmp.h index 8666e780a1..f285535583 100644 --- a/include/wx/osx/carbon/statbmp.h +++ b/include/wx/osx/carbon/statbmp.h @@ -51,7 +51,7 @@ class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase } void SetIcon(const wxIcon& icon) { SetBitmap( (const wxBitmap &)icon ) ; } - // overriden base class virtuals + // overridden base class virtuals virtual bool AcceptsFocus() const { return false; } protected: diff --git a/include/wx/osx/core/cfdataref.h b/include/wx/osx/core/cfdataref.h index 28c2f8977b..b61902c3dc 100644 --- a/include/wx/osx/core/cfdataref.h +++ b/include/wx/osx/core/cfdataref.h @@ -40,7 +40,7 @@ public: @param p The raw pointer to assume ownership of. May be NULL. @discussion Like shared_ptr, it is assumed that the caller has a strong reference to p and intends to transfer ownership of that reference to this ref holder. If the object comes from - a Create or Copy method then this is the correct behavior. If the object comes from + a Create or Copy method then this is the correct behaviour. If the object comes from a Get method then you must CFRetain it yourself before passing it to this constructor. A handy way to do this is to use the non-member wxCFRefFromGet factory funcion. This method is templated and takes an otherType *p. This prevents implicit conversion diff --git a/include/wx/osx/core/cfref.h b/include/wx/osx/core/cfref.h index 90c7ae4158..404c099fa5 100644 --- a/include/wx/osx/core/cfref.h +++ b/include/wx/osx/core/cfref.h @@ -172,7 +172,7 @@ public: @param p The raw pointer to assume ownership of. May be NULL. @discussion Like shared_ptr, it is assumed that the caller has a strong reference to p and intends to transfer ownership of that reference to this ref holder. If the object comes from - a Create or Copy method then this is the correct behavior. If the object comes from + a Create or Copy method then this is the correct behaviour. If the object comes from a Get method then you must CFRetain it yourself before passing it to this constructor. A handy way to do this is to use the non-member wxCFRefFromGet factory funcion. This method is templated and takes an otherType *p. This prevents implicit conversion @@ -364,7 +364,7 @@ inline wxCFWeakRef static_cfref_cast(const wxCFRef &other } /*! @function CFRelease - @abstract Overloads CFRelease so that the user is warned of bad behavior. + @abstract Overloads CFRelease so that the user is warned of bad behaviour. @discussion It is rarely appropriate to retain or release a wxCFRef. If one absolutely must do it he can explicitly get() the raw pointer Normally, this function is unimplemented resulting in a linker error if used. @@ -373,7 +373,7 @@ template inline void CFRelease(const wxCFRef & cfref) DEPRECATED_ATTRIBUTE; /*! @function CFRetain - @abstract Overloads CFRetain so that the user is warned of bad behavior. + @abstract Overloads CFRetain so that the user is warned of bad behaviour. @discussion It is rarely appropriate to retain or release a wxCFRef. If one absolutely must do it he can explicitly get() the raw pointer Normally, this function is unimplemented resulting in a linker error if used. diff --git a/include/wx/osx/core/dataview.h b/include/wx/osx/core/dataview.h index a478d83d12..8a24aaefd3 100644 --- a/include/wx/osx/core/dataview.h +++ b/include/wx/osx/core/dataview.h @@ -34,7 +34,7 @@ wxString ConcatenateDataViewItemValues(wxDataViewCtrl const* dataViewCtrlPtr, wx // for the carbon and cocoa environment. // ATTENTION // All methods assume that the passed column pointers are -// valid (unless a NULL pointer is explicitely allowed +// valid (unless a NULL pointer is explicitly allowed // to be passed)! // ATTENTION // --------------------------------------------------------- diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h index 414bc6844c..86604ab7f2 100644 --- a/include/wx/osx/window.h +++ b/include/wx/osx/window.h @@ -164,7 +164,7 @@ public: wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const; virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; - // this should not be overriden in classes above wxWindowMac + // this should not be overridden in classes above wxWindowMac // because it is called from its destructor via DeleteChildren virtual void RemoveChild( wxWindowBase *child ); diff --git a/include/wx/palmos/gauge.h b/include/wx/palmos/gauge.h index 97c413b684..ff36707d29 100644 --- a/include/wx/palmos/gauge.h +++ b/include/wx/palmos/gauge.h @@ -47,7 +47,7 @@ public: virtual void SetRange(int range); virtual void SetValue(int pos); - // overriden base class virtuals + // overridden base class virtuals virtual bool SetForegroundColour(const wxColour& col); virtual bool SetBackgroundColour(const wxColour& col); diff --git a/include/wx/palmos/statbox.h b/include/wx/palmos/statbox.h index 27931fae5a..794d010fd9 100644 --- a/include/wx/palmos/statbox.h +++ b/include/wx/palmos/statbox.h @@ -40,7 +40,7 @@ public: virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - // overriden base class virtuals + // overridden base class virtuals virtual bool AcceptsFocus() const { return FALSE; } protected: diff --git a/include/wx/palmos/statline.h b/include/wx/palmos/statline.h index 88854ee9b2..8ffac3a76f 100644 --- a/include/wx/palmos/statline.h +++ b/include/wx/palmos/statline.h @@ -39,7 +39,7 @@ public: long style = wxLI_HORIZONTAL, const wxString &name = wxStaticLineNameStr ); - // overriden base class virtuals + // overridden base class virtuals virtual bool AcceptsFocus() const { return FALSE; } protected: diff --git a/include/wx/propgrid/editors.h b/include/wx/propgrid/editors.h index ebcc75808f..4432b37958 100644 --- a/include/wx/propgrid/editors.h +++ b/include/wx/propgrid/editors.h @@ -147,7 +147,7 @@ public: @remarks wxPropertyGrid will automatically unfocus the editor when wxEVT_COMMAND_TEXT_ENTER is received and when it results in property value being modified. This happens regardless of - editor type (ie. behavior is same for any wxTextCtrl and + editor type (ie. behaviour is same for any wxTextCtrl and wxComboBox based editor). */ virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property, diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h index 9a1c43f2b8..39752a1222 100644 --- a/include/wx/propgrid/manager.h +++ b/include/wx/propgrid/manager.h @@ -616,7 +616,7 @@ protected: /** Creates property grid for the manager. Reimplement in derived class to - use subclassed wxPropertyGrid. However, if you you do this then you + use subclassed wxPropertyGrid. However, if you do this then you must also use the two-step construction (ie. default constructor and Create() instead of constructor with arguments) when creating the manager. diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h index dea6f5c63a..106e6ee0f1 100644 --- a/include/wx/propgrid/property.h +++ b/include/wx/propgrid/property.h @@ -410,8 +410,8 @@ wxPG_PROP_COLLAPSED = 0x0020, If property is selected, then indicates that validation failed for pending value. - If property is not selected, then indicates that the the actual property - value has failed validation (NB: this behavior is not currently supported, + If property is not selected, that indicates that the actual property + value has failed validation (NB: this behaviour is not currently supported, but may be used in future). */ wxPG_PROP_INVALID_VALUE = 0x0040, @@ -656,7 +656,7 @@ wxPG_PROP_BEING_DELETED = 0x00200000 #define wxPG_DIR_DIALOG_MESSAGE wxS("DialogMessage") /** - wxArrayStringProperty's string delimiter character. If this is aquotation + wxArrayStringProperty's string delimiter character. If this is a quotation mark or hyphen, then strings will be quoted instead (with given character). @@ -674,7 +674,7 @@ wxPG_PROP_BEING_DELETED = 0x00200000 #define wxPG_DATE_PICKER_STYLE wxS("PickerStyle") /** SpinCtrl editor, int or double. How much number changes when button is - pressed (or up/down on keybard). + pressed (or up/down on keyboard). */ #define wxPG_ATTR_SPINCTRL_STEP wxS("Step") @@ -1189,7 +1189,7 @@ public: You might want to take into account that m_value is Null variant if property value is unspecified (which is usually only case if - you explicitly enabled that sort behavior). + you explicitly enabled that sort behaviour). */ virtual bool StringToValue( wxVariant& variant, const wxString& text, @@ -1221,7 +1221,7 @@ public: instead of OnEvent. - You might want to take into account that m_value is Null variant if property value is unspecified (which is usually only case if you - explicitly enabled that sort behavior). + explicitly enabled that sort behaviour). */ virtual bool IntToValue( wxVariant& value, int number, @@ -1247,7 +1247,7 @@ public: virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const; /** Converts string to a value, and if successful, calls SetValue() on it. - Default behavior is to do nothing. + Default behaviour is to do nothing. @param text String to get the value from. @return @@ -1255,8 +1255,8 @@ public: */ bool SetValueFromString( const wxString& text, int flags = wxPG_PROGRAMMATIC_VALUE ); - /** Converts integer to a value, and if succesful, calls SetValue() on it. - Default behavior is to do nothing. + /** Converts integer to a value, and if successful, calls SetValue() on it. + Default behaviour is to do nothing. @param value Int to get the value from. @param flags @@ -1275,7 +1275,7 @@ public: @param item Normally -1, but can be an index to the property's list of items. @remarks - - Default behavior is to return wxSize(0,0), which means no image. + - Default behaviour is to return wxSize(0,0), which means no image. - Default image width or height is indicated with dimension -1. - You can also return wxPG_DEFAULT_IMAGE_SIZE, i.e. wxSize(-1, -1). */ @@ -1309,7 +1309,7 @@ public: /** Called after value of a child property has been altered. Must return - new value of the whole property (after any alterations warrented by + new value of the whole property (after any alterations warranted by child's new value). Note that this function is usually called at the time that value of @@ -1707,7 +1707,7 @@ public: /** Returns true if property has editable wxTextCtrl when selected. @remarks - Altough disabled properties do not displayed editor, they still + Although disabled properties do not displayed editor, they still return True here as being disabled is considered a temporary condition (unlike being read-only or having limited editing enabled). */ @@ -1932,7 +1932,7 @@ public: wxIntProperty, wxUIntProperty, wxFloatProperty, wxEditEnumProperty. @param enable - Whether to enable or disable this behavior (it is disabled by + Whether to enable or disable this behaviour (it is disabled by default). */ void SetAutoUnspecified( bool enable = true ) diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h index cf6dd98c48..bf12c402b0 100644 --- a/include/wx/propgrid/propgrid.h +++ b/include/wx/propgrid/propgrid.h @@ -159,7 +159,7 @@ wxPG_ALPHABETIC_MODE = (wxPG_HIDE_CATEGORIES|wxPG_AUTO_SORT), wxPG_BOLD_MODIFIED = 0x00000040, /** Using this style, the column splitters move automatically based on column - proportions (default is equal proportion for every column). This behavior + proportions (default is equal proportion for every column). This behaviour stops once the user manually moves a splitter, and returns when a splitter is double-clicked. @@ -248,7 +248,7 @@ wxPG_EX_MODE_BUTTONS = 0x00008000, */ wxPG_EX_HELP_AS_TOOLTIPS = 0x00010000, -/** Prevent TAB from focusing to wxButtons. This behavior was default +/** Prevent TAB from focusing to wxButtons. This behaviour was default in version 1.2.0 and earlier. NOTE! Tabbing to button doesn't work yet. Problem seems to be that on wxMSW atleast the button doesn't properly propagate key events (yes, I'm using @@ -376,7 +376,7 @@ protected: // ----------------------------------------------------------------------- -/** @section propgrid_vfbflags wxPropertyGrid Validation Failure Behavior Flags +/** @section propgrid_vfbflags wxPropertyGrid Validation Failure behaviour Flags @{ */ @@ -384,7 +384,7 @@ enum wxPG_VALIDATION_FAILURE_BEHAVIOR_FLAGS { /** Prevents user from leaving property unless value is valid. If this - behavior flag is not used, then value change is instead cancelled. + behaviour flag is not used, then value change is instead cancelled. */ wxPG_VFB_STAY_IN_PROPERTY = 0x01, @@ -401,7 +401,7 @@ wxPG_VFB_MARK_CELL = 0x04, To customize the way the message is displayed, you need to reimplement wxPropertyGrid::DoShowPropertyError() in a - derived class. Default behavior is to display the text on + derived class. Default behaviour is to display the text on the top-level frame's status bar, if present, and otherwise using wxMessageBox. */ @@ -460,7 +460,7 @@ public: } /** - @return Returns failure behavior which is a combination of + @return Returns failure behaviour which is a combination of @ref propgrid_vfbflags. */ wxPGVFBFlags GetFailureBehavior() const @@ -481,7 +481,7 @@ public: return *m_pValue; } - /** Set validation failure behavior + /** Set validation failure behaviour @param failureBehavior Mixture of @ref propgrid_vfbflags. @@ -504,7 +504,7 @@ private: */ wxString m_failureMessage; - /** Validation failure behavior. Use wxPG_VFB_XXX flags. + /** Validation failure behaviour. Use wxPG_VFB_XXX flags. */ wxPGVFBFlags m_failureBehavior; @@ -1625,7 +1625,7 @@ public: Return true if user is allowed to change to another property even if current has invalid value. @remarks - To add your own validation failure behavior, override + To add your own validation failure behaviour, override wxPropertyGrid::DoOnValidationFailure(). */ bool OnValidationFailure( wxPGProperty* property, @@ -1669,13 +1669,13 @@ public: /** Return wxStatusBar that is used by this wxPropertyGrid. You can reimplement this member function in derived class to override - the default behavior of using the top-level wxFrame's status + the default behaviour of using the top-level wxFrame's status bar, if any. */ virtual wxStatusBar* GetStatusBar(); #endif - /** Override to customize property validation failure behavior. + /** Override to customize property validation failure behaviour. @param invalidValue Value which failed in validation. @return @@ -1743,7 +1743,7 @@ protected: /** Runs all validation functionality (includes sending wxEVT_PG_CHANGING). Returns true if all tests passed. Implement in derived class to - add additional validation behavior. + add additional validation behaviour. */ virtual bool PerformValidation( wxPGProperty* p, wxVariant& pendingValue, @@ -2489,7 +2489,7 @@ public: } /** - Set override validation failure behavior. + Set override validation failure behaviour. Only effective if Veto was also called, and only allowed if event type is wxEVT_PG_CHANGING. diff --git a/include/wx/propgrid/propgriddefs.h b/include/wx/propgrid/propgriddefs.h index dc6bfd56d5..faea41128d 100644 --- a/include/wx/propgrid/propgriddefs.h +++ b/include/wx/propgrid/propgriddefs.h @@ -392,7 +392,7 @@ enum wxPG_MISC_ARG_FLAGS // Used when dealing with fragments of composite string value wxPG_COMPOSITE_FRAGMENT = 0x00000010, - // Means property for which final string value is for can not really be + // Means property for which final string value is for cannot really be // edited. wxPG_UNEDITABLE_COMPOSITE_FRAGMENT = 0x00000020, diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h index 4c47b77512..8dd9472647 100644 --- a/include/wx/propgrid/propgridiface.h +++ b/include/wx/propgrid/propgridiface.h @@ -381,7 +381,7 @@ public: If there is no property with such name, @NULL pointer is returned. @remarks Properties which have non-category, non-root parent - can not be accessed globally by their name. Instead, use + cannot be accessed globally by their name. Instead, use "." instead of "". */ wxPGProperty* GetProperty( const wxString& name ) const @@ -879,7 +879,7 @@ public: wxString SaveEditableState( int includedStates = AllStates ) const; /** - Lets user to set the strings listed in the choice dropdown of a + Lets user set the strings listed in the choice dropdown of a wxBoolProperty. Defaults are "True" and "False", so changing them to, say, "Yes" and "No" may be useful in some less technical applications. */ diff --git a/include/wx/propgrid/propgridpagestate.h b/include/wx/propgrid/propgridpagestate.h index 88ca0eb7f4..c25b9e5bac 100644 --- a/include/wx/propgrid/propgridpagestate.h +++ b/include/wx/propgrid/propgridpagestate.h @@ -437,7 +437,7 @@ public: void CheckColumnWidths( int widthChange = 0 ); /** - Override this member function to add custom behavior on property + Override this member function to add custom behaviour on property deletion. */ virtual void DoDelete( wxPGProperty* item, bool doDelete = true ); @@ -447,7 +447,7 @@ public: wxPGProperty* DoGetItemAtY( int y ) const; /** - Override this member function to add custom behavior on property + Override this member function to add custom behaviour on property insertion. */ virtual wxPGProperty* DoInsert( wxPGProperty* parent, diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h index 77470cda2c..66d625a24d 100644 --- a/include/wx/propgrid/props.h +++ b/include/wx/propgrid/props.h @@ -94,7 +94,7 @@ private: Basic property with string value. Supported special attributes: - - "Password": set to 1 inorder to enable wxTE_PASSWORD on the editor. + - "Password": set to 1 in order to enable wxTE_PASSWORD on the editor. @remarks - If value "" is set, then actual value is formed (or composed) @@ -517,7 +517,7 @@ protected: @ingroup classes Represents a bit set that fits in a long integer. wxBoolProperty sub-properties are created for editing individual bits. Textctrl is created - to manually edit the flags as a text; a continous sequence of spaces, + to manually edit the flags as a text; a continuous sequence of spaces, commas and semicolons is considered as a flag id separator. Note: When changing "choices" (ie. flag labels) of wxFlagsProperty, you will need to use SetPropertyChoices - otherwise they will not get diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h index 67cebe1430..fd8326ab4a 100644 --- a/include/wx/protocol/ftp.h +++ b/include/wx/protocol/ftp.h @@ -81,7 +81,7 @@ public: // this function tries its best to deliver the size in bytes using BINARY // (the SIZE command reports different sizes depending on whether // type is set to ASCII or BINARY) - // returns -1 if file is non-existant or size could not be found + // returns -1 if file is non-existent or size could not be found int GetFileSize(const wxString& fileName); // Check to see if a file exists in the current dir diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index ec229a8329..b188edce7b 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -40,7 +40,7 @@ public: return wxIcon(); } - // overriden base class virtuals + // overridden base class virtuals virtual bool AcceptsFocus() const { return false; } virtual bool HasTransparentBackground() { return true; } diff --git a/include/wx/statbox.h b/include/wx/statbox.h index 8c4043b23c..cacae66198 100644 --- a/include/wx/statbox.h +++ b/include/wx/statbox.h @@ -29,7 +29,7 @@ class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxControl public: wxStaticBoxBase() { } - // overriden base class virtuals + // overridden base class virtuals virtual bool AcceptsFocus() const { return false; } virtual bool HasTransparentBackground() { return true; } diff --git a/include/wx/statline.h b/include/wx/statline.h index 3894169118..514a3d3075 100644 --- a/include/wx/statline.h +++ b/include/wx/statline.h @@ -46,7 +46,7 @@ public: // get the default size for the "lesser" dimension of the static line static int GetDefaultSize() { return 2; } - // overriden base class virtuals + // overridden base class virtuals virtual bool AcceptsFocus() const { return false; } protected: diff --git a/include/wx/stattext.h b/include/wx/stattext.h index 2af37abf8b..a7124c440d 100644 --- a/include/wx/stattext.h +++ b/include/wx/stattext.h @@ -39,7 +39,7 @@ public: // This function will modify the value returned by GetLabel()! void Wrap(int width); - // overriden base virtuals + // overridden base virtuals virtual bool AcceptsFocus() const { return false; } virtual bool HasTransparentBackground() { return true; } diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index 7e314a10f9..faa33fa65d 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -3056,19 +3056,19 @@ public: // Set the display mode of visual flags for wrapped lines. void SetWrapVisualFlags(int wrapVisualFlags); - // Retrive the display mode of visual flags for wrapped lines. + // Retrieve the display mode of visual flags for wrapped lines. int GetWrapVisualFlags() const; // Set the location of visual flags for wrapped lines. void SetWrapVisualFlagsLocation(int wrapVisualFlagsLocation); - // Retrive the location of visual flags for wrapped lines. + // Retrieve the location of visual flags for wrapped lines. int GetWrapVisualFlagsLocation() const; // Set the start indent for wrapped lines. void SetWrapStartIndent(int indent); - // Retrive the start indent for wrapped lines. + // Retrieve the start indent for wrapped lines. int GetWrapStartIndent() const; // Sets how wrapped sublines are placed. Default is fixed. @@ -3464,7 +3464,7 @@ public: // Delete forwards from the current position to the end of the line. void DelLineRight(); - // Get and Set the xOffset (ie, horizonal scroll position). + // Get and Set the xOffset (ie, horizontal scroll position). void SetXOffset(int newOffset); int GetXOffset() const; @@ -4042,7 +4042,7 @@ public: - // The following methods are nearly equivallent to their similarly named + // The following methods are nearly equivalent to their similarly named // cousins above. The difference is that these methods bypass wxString // and always use a char* even if used in a unicode build of wxWidgets. // In that case the character data will be utf-8 encoded since that is diff --git a/include/wx/strvararg.h b/include/wx/strvararg.h index 7dc6612171..eff6e627cb 100644 --- a/include/wx/strvararg.h +++ b/include/wx/strvararg.h @@ -207,7 +207,7 @@ public: { return const_cast(this)->AsChar(); } private: // InputAsChar() returns the value passed to ctor, only converted - // to char, while AsChar() takes the the string returned by InputAsChar() + // to char, while AsChar() takes the string returned by InputAsChar() // and does format string conversion on it as well (and similarly for // ..AsWChar() below) const char* InputAsChar(); diff --git a/include/wx/weakref.h b/include/wx/weakref.h index a59a7e4a0a..a17c36d91b 100644 --- a/include/wx/weakref.h +++ b/include/wx/weakref.h @@ -17,7 +17,7 @@ // Some compilers (VC6, Borland, g++ < 3.3) have problem with template specialization. // However, this is only used for optimization purposes (a smaller wxWeakRef pointer) // (and the corner case of wxWeakRef). So for those compilers, we can fall -// back to the non-optimal case, where we use a the same type of weak ref (static one) +// back to the non-optimal case, where we use the same type of weak ref (static one) // in all cases. See defs.h for various setting these defines depending on compiler. #if !defined(HAVE_PARTIAL_SPECIALIZATION) || \ diff --git a/include/wx/window.h b/include/wx/window.h index 0fd842426a..0891760ee3 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -408,7 +408,7 @@ public: void Centre(int dir = wxBOTH) { DoCentre(dir); } void Center(int dir = wxBOTH) { DoCentre(dir); } - // centre with respect to the the parent window + // centre with respect to the parent window void CentreOnParent(int dir = wxBOTH) { DoCentre(dir); } void CenterOnParent(int dir = wxBOTH) { CentreOnParent(dir); } @@ -446,7 +446,7 @@ public: // Call these to override what GetBestSize() returns. This - // method is only virtual because it is overriden in wxTLW + // method is only virtual because it is overridden in wxTLW // as a different API for SetSizeHints(). virtual void SetMinSize(const wxSize& minSize); virtual void SetMaxSize(const wxSize& maxSize); @@ -1658,7 +1658,7 @@ protected: // (GetBorderSize() will be used to add them) virtual wxSize DoGetBestClientSize() const { return wxDefaultSize; } - // this is the virtual function to be overriden in any derived class which + // this is the virtual function to be overridden in any derived class which // wants to change how SetSize() or Move() works - it is called by all // versions of these functions in the base class virtual void DoSetSize(int x, int y, diff --git a/include/wx/xml/xml.h b/include/wx/xml/xml.h index c23a9bcd97..4a40d32506 100644 --- a/include/wx/xml/xml.h +++ b/include/wx/xml/xml.h @@ -115,7 +115,7 @@ public: virtual ~wxXmlNode(); - // copy ctor & operator=. Note that this does NOT copy syblings + // copy ctor & operator=. Note that this does NOT copy siblings // and parent pointer, i.e. m_parent and m_next will be NULL // after using copy ctor and are never unmodified by operator=. // On the other hand, it DOES copy children and attributes. diff --git a/interface/wx/animate.h b/interface/wx/animate.h index 5a5803fcb7..5b4e5b5cde 100644 --- a/interface/wx/animate.h +++ b/interface/wx/animate.h @@ -70,7 +70,7 @@ public: /** Creates the control with the given @a anim animation. - After control creation you must explicitely call Play() to start to play + After control creation you must explicitly call Play() to start to play the animation. Until that function won't be called, the first frame of the animation is displayed. diff --git a/interface/wx/app.h b/interface/wx/app.h index 3b7d17bc9a..d058e9c0ca 100644 --- a/interface/wx/app.h +++ b/interface/wx/app.h @@ -391,7 +391,7 @@ public: You may use OnExit() to clean up anything initialized here, provided that the function returns @true. - Notice that if you want to to use the command line processing provided by + Notice that if you want to use the command line processing provided by wxWidgets you have to call the base class version in the derived class OnInit(). diff --git a/interface/wx/archive.h b/interface/wx/archive.h index 12f6fcf494..55b4d81996 100644 --- a/interface/wx/archive.h +++ b/interface/wx/archive.h @@ -170,7 +170,7 @@ public: For generic programming, when the worst case must be assumed, you can rely on all the fields of wxArchiveEntry being fully populated when - wxArchiveInputStream::GetNextEntry() returns, with the the following exceptions: + wxArchiveInputStream::GetNextEntry() returns, with the following exceptions: @li GetSize(): guaranteed to be available after the entry has been read to Eof(), or CloseEntry() has been called; diff --git a/interface/wx/aui/framemanager.h b/interface/wx/aui/framemanager.h index f67783ab48..25a0c73ddb 100644 --- a/interface/wx/aui/framemanager.h +++ b/interface/wx/aui/framemanager.h @@ -23,7 +23,7 @@ enum wxAuiManagerDock /** - @todo wxAuiManager behavior style flags. + @todo wxAuiManager behaviour style flags. */ enum wxAuiManagerOption { @@ -50,7 +50,7 @@ enum wxAuiManagerOption wxAuiManager manages the panes associated with it for a particular wxFrame, using a pane's wxAuiPaneInfo information to determine each pane's docking - and floating behavior. + and floating behaviour. wxAuiManager uses wxWidgets' sizer mechanism to plan the layout of each frame. It uses a replaceable dock art class to do all drawing, so all @@ -135,7 +135,7 @@ class wxAuiManager : public wxEvtHandler public: /** Constructor. @a managed_wnd specifies the wxFrame which should be managed. - @a flags specifies options which allow the frame management behavior + @a flags specifies options which allow the frame management behaviour to be modified. */ wxAuiManager(wxWindow* managed_wnd = NULL, @@ -299,7 +299,7 @@ public: /** This method is used to specify wxAuiManager's settings flags. @a flags - specifies options which allow the frame management behavior to be modified. + specifies options which allow the frame management behaviour to be modified. */ void SetFlags(unsigned int flags); diff --git a/interface/wx/calctrl.h b/interface/wx/calctrl.h index 5083fa8d10..799465bc89 100644 --- a/interface/wx/calctrl.h +++ b/interface/wx/calctrl.h @@ -306,8 +306,8 @@ public: /** This function should be used instead of changing @c wxCAL_NO_MONTH_CHANGE style bit. It allows or disallows the user to - change the month interactively. Note that if the month can not be - changed, the year can not be changed neither. + change the month interactively. Note that if the month cannot be + changed, the year cannot be changed neither. @return @true if the value of this option really changed or @false if it was already set to the requested value. diff --git a/interface/wx/config.h b/interface/wx/config.h index ba8bfff7ac..48f0095514 100644 --- a/interface/wx/config.h +++ b/interface/wx/config.h @@ -9,7 +9,7 @@ /** @class wxConfigBase - wxConfigBase defines the basic interface of all config classes. It can not + wxConfigBase defines the basic interface of all config classes. It cannot be used by itself (it is an abstract base class) and you will always use one of its derivations: wxFileConfig, wxRegConfig or any other. diff --git a/interface/wx/dc.h b/interface/wx/dc.h index 3c0b009072..d3e8875f60 100644 --- a/interface/wx/dc.h +++ b/interface/wx/dc.h @@ -143,7 +143,7 @@ struct wxFontMetrics a device unit is a @e pixel. For a printer, the device unit is defined by the resolution of the printer (usually given in @c DPI: dot-per-inch). - All wxDC functions use instead @b logical units, unless where explicitely + All wxDC functions use instead @b logical units, unless where explicitly stated. Logical units are arbitrary units mapped to device units using the current mapping mode (see wxDC::SetMapMode). diff --git a/interface/wx/dir.h b/interface/wx/dir.h index d1fb1d47a1..ecf8ffb724 100644 --- a/interface/wx/dir.h +++ b/interface/wx/dir.h @@ -233,7 +233,7 @@ public: Returns the size (in bytes) of all files recursively found in @c dir or @c wxInvalidSize in case of error. - In case it happens that while traversing folders a file's size can not + In case it happens that while traversing folders a file's size cannot be read, that file is added to the @a filesSkipped array, if not @NULL, and then skipped. This usually happens with some special folders which are locked by the operating system or by another process. Remember that diff --git a/interface/wx/display.h b/interface/wx/display.h index ab7c9920c0..a54f4a9fe3 100644 --- a/interface/wx/display.h +++ b/interface/wx/display.h @@ -40,7 +40,7 @@ public: If wxDefaultVideoMode is passed in as the mode parameter, the defined behaviour is that wxDisplay will reset the video mode to the default - mode used by the display. On Windows, the behavior is normal. However, + mode used by the display. On Windows, the behaviour is normal. However, there are differences on other platforms. On Unix variations using X11 extensions it should behave as defined, but some irregularities may occur. diff --git a/interface/wx/dynarray.h b/interface/wx/dynarray.h index 830e7ab60a..cdecd0f618 100644 --- a/interface/wx/dynarray.h +++ b/interface/wx/dynarray.h @@ -32,7 +32,7 @@ functions are inline, so they do not take @e any space at all. wxWidgets has three different kinds of array. All of them derive from - wxBaseArray class which works with untyped data and can not be used + wxBaseArray class which works with untyped data and cannot be used directly. The standard macros WX_DEFINE_ARRAY(), WX_DEFINE_SORTED_ARRAY() and WX_DEFINE_OBJARRAY() are used to define a new class deriving from it. The classes declared will be called in this documentation wxArray, @@ -659,7 +659,7 @@ public: /** This macro may be used to delete all elements of the array before emptying - it. It can not be used with wxObjArrays - but they will delete their + it. It cannot be used with wxObjArrays - but they will delete their elements anyway when you call Empty(). */ #define WX_CLEAR_ARRAY(wxArray_arrayToBeCleared) diff --git a/interface/wx/file.h b/interface/wx/file.h index f2cff5c32c..9c01ebdd7d 100644 --- a/interface/wx/file.h +++ b/interface/wx/file.h @@ -173,12 +173,12 @@ public: or test if it can be opened for writing with Access(). */ write, - /** Open file for reading and writing; can not be used with Access() */ + /** Open file for reading and writing; cannot be used with Access() */ read_write, /** Open file for appending: the file is opened for writing, but the old contents of the file are not erased and the file pointer is initially placed at the end - of the file; can not be used with Access(). + of the file; cannot be used with Access(). This is the same as OpenMode::write if the file doesn't exist. */ diff --git a/interface/wx/frame.h b/interface/wx/frame.h index 49b55fd441..9e6d5ffb65 100644 --- a/interface/wx/frame.h +++ b/interface/wx/frame.h @@ -90,7 +90,7 @@ @endStyleTable The default frame style is for normal, resizeable frames. - To create a frame which can not be resized by user, you may use the following + To create a frame which cannot be resized by user, you may use the following combination of styles: @code diff --git a/interface/wx/gauge.h b/interface/wx/gauge.h index 7ec0c9bfc5..1abe6bca20 100644 --- a/interface/wx/gauge.h +++ b/interface/wx/gauge.h @@ -138,7 +138,7 @@ public: gauge move a bit to indicate the user that some progress has been made. @note After calling this function the value returned by GetValue() is - undefined and thus you need to explicitely call SetValue() if you + undefined and thus you need to explicitly call SetValue() if you want to restore the determinate mode. */ virtual void Pulse(); diff --git a/interface/wx/html/htmlcell.h b/interface/wx/html/htmlcell.h index d68052384d..ece319d281 100644 --- a/interface/wx/html/htmlcell.h +++ b/interface/wx/html/htmlcell.h @@ -262,7 +262,7 @@ public: This function is simple event handler. Each time the user clicks mouse button over a cell within wxHtmlWindow this method of that cell is called. - Default behavior is to call wxHtmlWindow::LoadPage. + Default behaviour is to call wxHtmlWindow::LoadPage. @param window interface to the parent HTML window diff --git a/interface/wx/htmllbox.h b/interface/wx/htmllbox.h index 277a5ae2fd..6aadd45004 100644 --- a/interface/wx/htmllbox.h +++ b/interface/wx/htmllbox.h @@ -55,7 +55,7 @@ public: (it may also be set or changed later with wxVListBox::SetItemCount). There are no special styles defined for wxHtmlListBox, in particular the - wxListBox styles (with the exception of @c wxLB_MULTIPLE) can not be used here. + wxListBox styles (with the exception of @c wxLB_MULTIPLE) cannot be used here. Returns @true on success or @false if the control couldn't be created */ diff --git a/interface/wx/image.h b/interface/wx/image.h index 823ac49c9f..34808c5c15 100644 --- a/interface/wx/image.h +++ b/interface/wx/image.h @@ -1092,7 +1092,7 @@ public: The function is case-insensitive to @a name. If the given option is not present, the function returns 0. - Use HasOption() is 0 is a possibly valid value for the option. + Use HasOption() if 0 is a possibly valid value for the option. Generic options: @li @c wxIMAGE_OPTION_MAX_WIDTH and @c wxIMAGE_OPTION_MAX_HEIGHT: If either @@ -1801,7 +1801,7 @@ wxImage wxNullImage; /** Initializes all available image handlers. - This function call wxImage::AddHandler() for all the available image + This function calls wxImage::AddHandler() for all the available image handlers (see @ref image_handlers for the full list). Calling it is the simplest way to initialize wxImage but it creates and registers even the handlers your program may not use. If you want to avoid the overhead of diff --git a/interface/wx/list.h b/interface/wx/list.h index fd200e0037..ee97ee6aa8 100644 --- a/interface/wx/list.h +++ b/interface/wx/list.h @@ -27,7 +27,7 @@ for further information on how to use the class. Below we documented both the supported STL and the legacy API that originated from the old wxList class and which can still be used alternatively - for the the same class. + for the same class. Note that if you compile wxWidgets in STL mode (@c wxUSE_STL defined as 1) then wxList will actually derive from @c std::list and just add a legacy diff --git a/interface/wx/mimetype.h b/interface/wx/mimetype.h index 77059fab23..0a31361309 100644 --- a/interface/wx/mimetype.h +++ b/interface/wx/mimetype.h @@ -152,7 +152,7 @@ wxMimeTypesManager* wxTheMimeTypesManager; such as the original file name or the charset (for the text documents). These parameters may be useful to the program used to open, edit, view or print the message, so, for example, an e-mail client program will have to - pass them to this program. Because wxFileType itself can not know about + pass them to this program. Because wxFileType itself cannot know about these parameters, it uses MessageParameters class to query them. The default implementation only requires the caller to provide the file name diff --git a/interface/wx/msw/registry.h b/interface/wx/msw/registry.h index 67a8658f5f..9b215795bc 100644 --- a/interface/wx/msw/registry.h +++ b/interface/wx/msw/registry.h @@ -39,7 +39,7 @@ // for the key existence if necessary. wxRegKey key(wxRegKey::HKLM, "Software\\MyKey"); - // Create a new value "MYVALUE" and set it to 12. + // Create a new value "MyValue" and set it to 12. key.SetValue("MyValue", 12); // Read the value back. diff --git a/interface/wx/print.h b/interface/wx/print.h index fa934e8859..4f522e885e 100644 --- a/interface/wx/print.h +++ b/interface/wx/print.h @@ -770,7 +770,7 @@ public: (It will, of course, be larger or smaller in the preview image, depending on the zoom factor.) - Use this if you want WYSIWYG behavior, e.g., in a text editor. + Use this if you want WYSIWYG behaviour, e.g., in a text editor. */ void MapScreenSizeToPaper(); diff --git a/interface/wx/progdlg.h b/interface/wx/progdlg.h index 517202bac5..45991bb5f3 100644 --- a/interface/wx/progdlg.h +++ b/interface/wx/progdlg.h @@ -114,7 +114,7 @@ public: Like Update() but makes the gauge control run in indeterminate mode. In indeterminate mode the remaining and the estimated time labels (if - present) are set to to "Unknown" or to @a newmsg (if it's non-empty). + present) are set to "Unknown" or to @a newmsg (if it's non-empty). Each call to this function moves the progress bar a bit to indicate that some progress was done. diff --git a/interface/wx/propgrid/editors.h b/interface/wx/propgrid/editors.h index 095f15af0c..8f563a05d7 100644 --- a/interface/wx/propgrid/editors.h +++ b/interface/wx/propgrid/editors.h @@ -96,7 +96,7 @@ public: @remarks wxPropertyGrid will automatically unfocus the editor when @c wxEVT_COMMAND_TEXT_ENTER is received and when it results in property value being modified. This happens regardless of - editor type (ie. behavior is same for any wxTextCtrl and + editor type (ie. behaviour is same for any wxTextCtrl and wxComboBox based editor). */ virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property, diff --git a/interface/wx/propgrid/manager.h b/interface/wx/propgrid/manager.h index 32e468cac3..066a2ace31 100644 --- a/interface/wx/propgrid/manager.h +++ b/interface/wx/propgrid/manager.h @@ -510,8 +510,8 @@ protected: /** Creates property grid for the manager. Reimplement in derived class to - use subclassed wxPropertyGrid. However, if you do this then you - must also use the two-step construction (i.e. default constructor and + use subclassed wxPropertyGrid. However, if you do this then you + must also use the two-step construction (ie. default constructor and Create() instead of constructor with arguments) when creating the manager. */ diff --git a/interface/wx/propgrid/property.h b/interface/wx/propgrid/property.h index bf6bd0d8a4..3c329f3134 100644 --- a/interface/wx/propgrid/property.h +++ b/interface/wx/propgrid/property.h @@ -222,8 +222,8 @@ wxPG_PROP_COLLAPSED = 0x0020, value. If property is not selected, then indicates that the actual property - value has failed validation (NB: this behavior is not currently supported, - but may be used in future). + value has failed validation (NB: this behaviour is not currently supported, + but may be used in the future). */ wxPG_PROP_INVALID_VALUE = 0x0040, @@ -417,15 +417,20 @@ wxPG_PROP_BEING_DELETED = 0x00200000 Note that when displaying the value, sign is omitted if the resulting textual representation is effectively zero (for example, -0.0001 with - precision of 3 will become 0.0 instead of -0.0). This behavior is unlike + precision of 3 will become 0.0 instead of -0.0). This behaviour is unlike what C standard library does, but should result in better end-user experience in almost all cases. @subsection wxBoolProperty Represents a boolean value. wxChoice is used as editor control, by the +<<<<<<< .mine + default. wxPG_BOOL_USE_CHECKBOX attribute can be set to true in order to + use check box instead. +======= default. wxPG_BOOL_USE_CHECKBOX attribute can be set to true in order to use check box instead. +>>>>>>> .r67279 @subsection wxLongStringProperty @@ -474,7 +479,7 @@ wxPG_PROP_BEING_DELETED = 0x00200000 Like wxLongStringProperty, but the button triggers file selector instead. Default wildcard is "All files..." but this can be changed by setting wxPG_FILE_WILDCARD attribute (see wxFileDialog for format details). - Attribute wxPG_FILE_SHOW_FULL_PATH can be set to @false inorder to show + Attribute wxPG_FILE_SHOW_FULL_PATH can be set to @false in order to show only the filename, not the entire path. @subsection wxEnumProperty @@ -767,7 +772,7 @@ public: You might want to take into account that m_value is Null variant if property value is unspecified (which is usually only case if - you explicitly enabled that sort behavior). + you explicitly enabled that sort behaviour). */ virtual bool StringToValue( wxVariant& variant, const wxString& text, int argFlags = 0 ) const; @@ -795,7 +800,7 @@ public: instead of OnEvent. - You might want to take into account that m_value is Mull variant if property value is unspecified (which is usually only case if you - explicitly enabled that sort behavior). + explicitly enabled that sort behaviour). */ virtual bool IntToValue( wxVariant& variant, int number, int argFlags = 0 ) const; @@ -818,7 +823,7 @@ public: /** Converts string to a value, and if successful, calls SetValue() on it. - Default behavior is to do nothing. + Default behaviour is to do nothing. @param text String to get the value from. @@ -830,8 +835,13 @@ public: bool SetValueFromString( const wxString& text, int flags = 0 ); /** +<<<<<<< .mine + Converts integer to a value, and if successful, calls SetValue() on it. + Default behaviour is to do nothing. +======= Converts integer to a value, and if successful, calls SetValue() on it. Default behavior is to do nothing. +>>>>>>> .r67279 @param value Int to get the value from. @@ -851,7 +861,7 @@ public: Normally -1, but can be an index to the property's list of items. @remarks - - Default behavior is to return wxSize(0,0), which means no image. + - Default behaviour is to return wxSize(0,0), which means no image. - Default image width or height is indicated with dimension -1. - You can also return wxPG_DEFAULT_IMAGE_SIZE which equals wxSize(-1, -1). */ @@ -1540,7 +1550,7 @@ public: wxIntProperty, wxUIntProperty, wxFloatProperty, wxEditEnumProperty. @param enable - Whether to enable or disable this behavior (it is disabled by + Whether to enable or disable this behaviour (it is disabled by default). */ void SetAutoUnspecified( bool enable = true ); diff --git a/interface/wx/propgrid/propgrid.h b/interface/wx/propgrid/propgrid.h index e4b3d7b2c1..7de8048cdb 100644 --- a/interface/wx/propgrid/propgrid.h +++ b/interface/wx/propgrid/propgrid.h @@ -45,7 +45,7 @@ wxPG_BOLD_MODIFIED = 0x00000040, /** When wxPropertyGrid is resized, splitter moves to the center. This - behavior stops once the user manually moves the splitter. + behaviour stops once the user manually moves the splitter. */ wxPG_SPLITTER_AUTO_CENTER = 0x00000080, @@ -209,7 +209,7 @@ wxPG_EX_TOOLBAR_SEPARATOR = 0x08000000 // ----------------------------------------------------------------------- /** - @section propgrid_vfbflags wxPropertyGrid Validation Failure Behavior Flags + @section propgrid_vfbflags wxPropertyGrid Validation Failure behaviour Flags @{ */ @@ -218,7 +218,7 @@ enum wxPG_VALIDATION_FAILURE_BEHAVIOR_FLAGS /** Prevents user from leaving property unless value is valid. If this - behavior flag is not used, then value change is instead cancelled. + behaviour flag is not used, then value change is instead cancelled. */ wxPG_VFB_STAY_IN_PROPERTY = 0x01, @@ -237,7 +237,7 @@ wxPG_VFB_MARK_CELL = 0x04, To customize the way the message is displayed, you need to reimplement wxPropertyGrid::DoShowPropertyError() in a - derived class. Default behavior is to display the text on + derived class. Default behaviour is to display the text on the top-level frame's status bar, if present, and otherwise using wxMessageBox. */ @@ -279,7 +279,7 @@ class wxPGValidationInfo { public: /** - @return Returns failure behavior which is a combination of + @return Returns failure behaviour which is a combination of @ref propgrid_vfbflags. */ wxPGVFBFlags GetFailureBehavior(); @@ -294,7 +294,7 @@ public: */ wxVariant& GetValue(); - /** Set validation failure behavior + /** Set validation failure behaviour @param failureBehavior Mixture of @ref propgrid_vfbflags. @@ -1092,7 +1092,7 @@ public: @name wxPropertyGrid customization Reimplement these member functions in derived class for better - control over wxPropertyGrid behavior. + control over wxPropertyGrid behaviour. */ //@{ @@ -1121,7 +1121,7 @@ public: /** Return wxStatusBar that is used by this wxPropertyGrid. You can reimplement this member function in derived class to override - the default behavior of using the top-level wxFrame's status + the default behaviour of using the top-level wxFrame's status bar, if any. */ virtual wxStatusBar* GetStatusBar(); @@ -1282,7 +1282,7 @@ public: void SetProperty( wxPGProperty* p ); /** - Set override validation failure behavior. Only effective if Veto() was + Set override validation failure behaviour. Only effective if Veto() was also called, and only allowed if event type is @c wxEVT_PG_CHANGING. */ void SetValidationFailureBehavior( wxPGVFBFlags flags ); diff --git a/interface/wx/propgrid/propgridiface.h b/interface/wx/propgrid/propgridiface.h index bdf9576171..f405388b64 100644 --- a/interface/wx/propgrid/propgridiface.h +++ b/interface/wx/propgrid/propgridiface.h @@ -283,7 +283,7 @@ public: If there is no property with such name, @NULL pointer is returned. @remarks Properties which have non-category, non-root parent - can not be accessed globally by their name. Instead, use + cannot be accessed globally by their name. Instead, use "." instead of "". */ wxPGProperty* GetProperty( const wxString& name ) const; @@ -339,7 +339,7 @@ public: If there is no property with such name, @NULL pointer is returned. @remarks Properties which have non-category, non-root parent - can not be accessed globally by their name. Instead, use + cannot be accessed globally by their name. Instead, use "." instead of "". */ wxPGProperty* GetPropertyByName( const wxString& name ) const; diff --git a/interface/wx/scrolwin.h b/interface/wx/scrolwin.h index d601b47f86..0185f50cb4 100644 --- a/interface/wx/scrolwin.h +++ b/interface/wx/scrolwin.h @@ -517,7 +517,7 @@ protected: See wxScrolled for detailed description. @note Note that because this class derives from wxPanel, it shares its - behavior with regard to TAB traversal and focus handling (in + behaviour with regard to TAB traversal and focus handling (in particular, it forwards focus to its children). If you don't want this behaviour, use ::wxScrolledCanvas instead. diff --git a/interface/wx/sizer.h b/interface/wx/sizer.h index 17fcf5c292..ec02ec9e3c 100644 --- a/interface/wx/sizer.h +++ b/interface/wx/sizer.h @@ -88,7 +88,7 @@ @c wxFIXED_MINSIZE.} @itemdef{wxRESERVE_SPACE_EVEN_IF_HIDDEN, Normally wxSizers don't allocate space for hidden windows or other - items. This flag overrides this behavior so that sufficient space + items. This flag overrides this behaviour so that sufficient space is allocated for the window even if it isn't visible. This makes it possible to dynamically show and hide controls without resizing parent dialog, for example. (Available since 2.8.8.)} @@ -168,7 +168,7 @@ public: to make them grow and shrink equally with the sizer's horizontal dimension. @param flag - OR-combination of flags affecting sizer's behavior. See + OR-combination of flags affecting sizer's behaviour. See @ref wxsizer_flags "wxSizer flags list" for details. @param border Determines the border width, if the flag parameter is set to @@ -226,7 +226,7 @@ public: to make them grow and shrink equally with the sizer's horizontal dimension. @param flag - OR-combination of flags affecting sizer's behavior. See + OR-combination of flags affecting sizer's behaviour. See @ref wxsizer_flags "wxSizer flags list" for details. @param border Determines the border width, if the flag parameter is set to @@ -274,7 +274,7 @@ public: to make them grow and shrink equally with the sizer's horizontal dimension. @param flag - OR-combination of flags affecting sizer's behavior. See + OR-combination of flags affecting sizer's behaviour. See @ref wxsizer_flags "wxSizer flags list" for details. @param border Determines the border width, if the flag parameter is set to @@ -1362,7 +1362,7 @@ public: /** Set the @c wxRESERVE_SPACE_EVEN_IF_HIDDEN flag. Normally wxSizers don't allocate space for hidden windows or other items. This flag - overrides this behavior so that sufficient space is allocated for the + overrides this behaviour so that sufficient space is allocated for the window even if it isn't visible. This makes it possible to dynamically show and hide controls without resizing parent dialog, for example. diff --git a/interface/wx/socket.h b/interface/wx/socket.h index 0f57ef41a5..43d3c753c2 100644 --- a/interface/wx/socket.h +++ b/interface/wx/socket.h @@ -596,7 +596,7 @@ enum wxSocketEventFlags @b wxSOCKET_REUSEADDR can also be used with socket clients to (re)bind to a particular local port for an outgoing connection. - This option can have surprising platform dependent behavior, so check the + This option can have surprising platform dependent behaviour, so check the documentation for your platform's implementation of setsockopt(). Note that on BSD-based systems(e.g. Mac OS X), use of @@ -616,7 +616,7 @@ enum wxSocketEventFlags the data. - @b wxSOCKET_BLOCK has nothing to do with the previous flags and it controls whether the GUI blocks. - - @b wxSOCKET_REUSEADDR controls special platform-specific behavior for + - @b wxSOCKET_REUSEADDR controls special platform-specific behaviour for reusing local addresses/ports. */ enum diff --git a/interface/wx/textdlg.h b/interface/wx/textdlg.h index ccba11d7d7..a1ddf2e6ec 100644 --- a/interface/wx/textdlg.h +++ b/interface/wx/textdlg.h @@ -73,7 +73,7 @@ public: @param message Message to show on the dialog. @param caption - The caption of the the dialog. + The caption of the dialog. @param value The default value, which may be the empty string. @param style diff --git a/interface/wx/thread.h b/interface/wx/thread.h index e8c5545142..adfe774091 100644 --- a/interface/wx/thread.h +++ b/interface/wx/thread.h @@ -700,7 +700,7 @@ enum modeled after the POSIX thread API. This is different from the Win32 API where all threads are joinable. - By default wxThreads in wxWidgets use the @b detached behavior. + By default wxThreads in wxWidgets use the @b detached behaviour. Detached threads delete themselves once they have completed, either by themselves when they complete processing or through a call to Delete(), and thus @b must be created on the heap (through the new operator, for example). @@ -957,10 +957,10 @@ enum A common problem users experience with wxThread is that in their main thread they will check the thread every now and then to see if it has ended through IsRunning(), only to find that their application has run into problems - because the thread is using the default behavior (i.e. it's @b detached) and + because the thread is using the default behaviour (i.e. it's @b detached) and has already deleted itself. Naturally, they instead attempt to use joinable threads in place of the previous - behavior. However, polling a wxThread for when it has ended is in general a + behaviour. However, polling a wxThread for when it has ended is in general a bad idea - in fact calling a routine on any running wxThread should be avoided if possible. Instead, find a way to notify yourself when the thread has ended. diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h index 417e14ef91..7a15d2ccb0 100644 --- a/interface/wx/toolbar.h +++ b/interface/wx/toolbar.h @@ -28,7 +28,7 @@ Changes to the item's state should be made through calls to wxToolBar methods, for example wxToolBar::EnableTool. Calls to @c wxToolBarToolBase methods (undocumented by purpose) will not change - the visible state of the item within the the tool bar. + the visible state of the item within the tool bar. wxMSW note: Note that under wxMSW toolbar paints tools to reflect system-wide colours. If you use more than 16 colours in your tool bitmaps, diff --git a/interface/wx/treectrl.h b/interface/wx/treectrl.h index 6b3513650b..6bd7e2378c 100644 --- a/interface/wx/treectrl.h +++ b/interface/wx/treectrl.h @@ -72,12 +72,12 @@ @event{EVT_TREE_BEGIN_DRAG(id, func)} Begin dragging with the left mouse button. If you want to enable left-dragging you need to intercept this event - and explicitely call wxTreeEvent::Allow(), as it's vetoed by default. + and explicitly call wxTreeEvent::Allow(), as it's vetoed by default. Processes a @c wxEVT_COMMAND_TREE_BEGIN_DRAG event type. @event{EVT_TREE_BEGIN_RDRAG(id, func)} Begin dragging with the right mouse button. If you want to enable right-dragging you need to intercept this event - and explicitely call wxTreeEvent::Allow(), as it's vetoed by default. + and explicitly call wxTreeEvent::Allow(), as it's vetoed by default. Processes a @c wxEVT_COMMAND_TREE_BEGIN_RDRAG event type. @event{EVT_TREE_END_DRAG(id, func)} End dragging with the left or right mouse button. @@ -1027,13 +1027,13 @@ public: @beginEventTable{wxTreeEvent} @event{EVT_TREE_BEGIN_DRAG(id, func)} Begin dragging with the left mouse button. If you want to enable - left-dragging you need to intercept this event and explicitely call + left-dragging you need to intercept this event and explicitly call wxTreeEvent::Allow(), as it's vetoed by default. Also notice that the control must have an associated image list (see SetImageList()) to drag its items under MSW. @event{EVT_TREE_BEGIN_RDRAG(id, func)} Begin dragging with the right mouse button. If you want to enable - right-dragging you need to intercept this event and explicitely call + right-dragging you need to intercept this event and explicitly call wxTreeEvent::Allow(), as it's vetoed by default. @event{EVT_TREE_END_DRAG(id, func)} End dragging with the left or right mouse button. diff --git a/interface/wx/weakref.h b/interface/wx/weakref.h index 6e988f0e12..bf79582c7e 100644 --- a/interface/wx/weakref.h +++ b/interface/wx/weakref.h @@ -18,7 +18,7 @@ is to handle objects which derived type one does not know. @note wxWeakRef selects an implementation based on the static type of T. - If T does not have wxTrackable statically, it defaults to to a mixed- + If T does not have wxTrackable statically, it defaults to a mixed- mode operation, where it uses @c dynamic_cast as the last measure (if available from the compiler and enabled when building wxWidgets). diff --git a/interface/wx/window.h b/interface/wx/window.h index 0a3043e994..e82abf20c8 100644 --- a/interface/wx/window.h +++ b/interface/wx/window.h @@ -3369,7 +3369,7 @@ protected: @remarks This function is not meant to be called directly by user code, but via Centre, Center, CentreOnParent, or CenterOnParent. - This function can be overriden to fine-tune centring behaviour. + This function can be overridden to fine-tune centring behaviour. */ virtual void DoCentre(int direction); diff --git a/interface/wx/wizard.h b/interface/wx/wizard.h index 4afab8457d..9ffdbc8650 100644 --- a/interface/wx/wizard.h +++ b/interface/wx/wizard.h @@ -95,7 +95,7 @@ public: @beginEventTable{wxWizardEvent} @event{EVT_WIZARD_PAGE_CHANGED(id, func)} - The page has been just changed (this event can not be vetoed). + The page has been just changed (this event cannot be vetoed). @event{EVT_WIZARD_PAGE_CHANGING(id, func)} The page is being changed (this event can be vetoed). @event{EVT_WIZARD_PAGE_SHOWN(id, func)} @@ -432,7 +432,7 @@ public: /** Executes the wizard starting from the given page, returning @true if it was successfully finished or @false if user cancelled it. - The @a firstPage can not be @NULL. + The @a firstPage cannot be @NULL. */ virtual bool RunWizard(wxWizardPage* firstPage); diff --git a/locale/af.po b/locale/af.po index 4351639c51..c55d82b69a 100644 --- a/locale/af.po +++ b/locale/af.po @@ -1317,45 +1317,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Kan nie wedersydse slot skep nie." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Kan lêers in gids '%s' nie opsom nie" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Kan lêers in gids '%s' nie opsom nie" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Kan nie uitvoerdraad %lu laat voortgaan nie" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Kan uitvoerdraad %x nie laat voortgaan nie" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Kan uitvoerdraad nie laat begin nie: fout met skryf van TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Kan nie uitvoerdraad %lu tydelik ophef nie" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Kan uitvoerdraad %x nie opskort nie" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Kan nie wag vir uitvoerdraad-beëindiging nie" #: ../src/common/cmdproc.cpp:262 @@ -5752,7 +5752,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "Inisialisasie van uitvoerdraadmodule het misluk: kan geen waarde in lokale " @@ -6789,7 +6789,7 @@ msgstr "lig" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "landinstelling '%s' kan nie opgestel word word nie." #: ../src/common/intl.cpp:1210 diff --git a/locale/ar.po b/locale/ar.po index 132740ac0d..7ff0d23d37 100644 --- a/locale/ar.po +++ b/locale/ar.po @@ -1320,46 +1320,46 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "" #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "" #: ../src/unix/dir.cpp:228 #: ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "" #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "" #: ../src/common/cmdproc.cpp:262 @@ -5667,7 +5667,7 @@ msgid "This system doesn't support date controls, please upgrade your version of msgstr "" #: ../src/msw/thread.cpp:1247 -msgid "Thread module initialization failed: can not store value in thread local storage" +msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "" #: ../src/unix/threadpsx.cpp:1686 @@ -6681,7 +6681,7 @@ msgstr "فاتح" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "" #: ../src/common/intl.cpp:1210 diff --git a/locale/ca.po b/locale/ca.po index cb1df575c2..660591b9c4 100644 --- a/locale/ca.po +++ b/locale/ca.po @@ -1321,45 +1321,45 @@ msgstr "" #: ../src/os2/thread.cpp:117 #, fuzzy -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "No es pot crear un fil" #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "No es pot enumerar els fitxers '%s'" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "No es pot enumerar els fitxers en el directori '%s'" #: ../src/os2/thread.cpp:526 #, fuzzy, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "No es pot enumerar els fitxers en el directori '%s'" #: ../src/msw/thread.cpp:873 #, fuzzy, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "No es pot enumerar els fitxers en el directori '%s'" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "No es pot iniciar la cadena: error en escriure TLS." #: ../src/os2/thread.cpp:512 #, fuzzy, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "No es pot suspendre en fil %x" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "No es pot suspendre en fil %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "No es pot esperar per a l'acabament de cadena" #: ../src/common/cmdproc.cpp:262 @@ -5781,7 +5781,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "La inicialització de mòduls de la cadena ha fallat: no es pot emmagatzemar " @@ -6841,7 +6841,7 @@ msgstr "clar" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "la localització '%s' no es pot fixar" #: ../src/common/intl.cpp:1210 diff --git a/locale/ca@valencia.po b/locale/ca@valencia.po index 8b5d1d02c2..ed4e131871 100644 --- a/locale/ca@valencia.po +++ b/locale/ca@valencia.po @@ -1319,45 +1319,45 @@ msgstr "" #: ../src/os2/thread.cpp:117 #, fuzzy -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "No es pot crear un fil" #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "No es pot enumerar els fitxers '%s'" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "No es pot enumerar els fitxers en el directori '%s'" #: ../src/os2/thread.cpp:526 #, fuzzy, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "No es pot enumerar els fitxers en el directori '%s'" #: ../src/msw/thread.cpp:873 #, fuzzy, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "No es pot enumerar els fitxers en el directori '%s'" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "No es pot iniciar la cadena: error en escriure TLS." #: ../src/os2/thread.cpp:512 #, fuzzy, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "No es pot suspendre en fil %x" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "No es pot suspendre en fil %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "No es pot esperar per a l'acabament de cadena" #: ../src/common/cmdproc.cpp:262 @@ -5779,7 +5779,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "La inicialització de mòduls de la cadena ha fallat: no es pot emmagatzemar " @@ -6840,7 +6840,7 @@ msgstr "clar" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "la localització '%s' no es pot fixar" #: ../src/common/intl.cpp:1210 diff --git a/locale/cs.po b/locale/cs.po index ec13372b38..73f12cd732 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -1434,45 +1434,45 @@ msgid "Ca&pitals" msgstr "Velká &písmena" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Nelze vytvořit mutex." #: ../src/common/filefn.cpp:1359 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Nelze vyjmenovat soubory odpovídající masce '%s'" #: ../src/msw/dir.cpp:212 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Nelze vyjmenovat soubory v adresáři '%s'" #: ../src/os2/thread.cpp:528 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Nelze obnovit vlákno %lu" #: ../src/msw/thread.cpp:895 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Nelze obnovit vlákno %x" #: ../src/msw/thread.cpp:548 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Nelze spustit vlákno: chyba při zápisu do TLS." #: ../src/os2/thread.cpp:514 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Nelze ukončit vlákno %lu" #: ../src/msw/thread.cpp:880 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Nelze pozastavit vlákno %x" #: ../src/msw/thread.cpp:803 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Nelze počkat na ukončení vlákna" #: ../src/common/cmdproc.cpp:266 @@ -6078,7 +6078,7 @@ msgid "This system doesn't support date controls, please upgrade your version of msgstr "Tento systém nepodporuje ovládací prvky pro výběr data, aktualizujte, prosím, VaÅ¡i verzi comctl32.dll" #: ../src/msw/thread.cpp:1264 -msgid "Thread module initialization failed: can not store value in thread local storage" +msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "Vlákno pro modul se nepodařilo iniciovat: Nelze ukládat hodnoty do 'thread local storage'" #: ../src/unix/threadpsx.cpp:1694 @@ -7220,7 +7220,7 @@ msgstr "tenké" #: ../src/common/intl.cpp:297 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "Místní a jazykové nastavení '%s' nemůže být nastaveno." #: ../src/common/datetimefmt.cpp:1917 diff --git a/locale/da.po b/locale/da.po index 9806864234..3319c275d5 100644 --- a/locale/da.po +++ b/locale/da.po @@ -1306,45 +1306,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Kan ikke oprette mutex." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Kan ikke læse fillisten i mappen '%s'" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Kan ikke få liste af filer i mappen '%s'" #: ../src/os2/thread.cpp:526 #, fuzzy, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Kan ikke genoptage tråd %x" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Kan ikke genoptage tråd %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Kan ikke starte tråd: fejl ved skrivning af TLS." #: ../src/os2/thread.cpp:512 #, fuzzy, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Kan ikke suspendere tråd %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Kan ikke suspendere tråd %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Kan ikke vente på trådafslutning" #: ../src/common/cmdproc.cpp:262 @@ -5755,7 +5755,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "Trådmodul initialisering fejlede: kan ikke gemme værdi i trådens private " @@ -6793,7 +6793,7 @@ msgstr "let" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "locale '%s' kan ikke sættes." #: ../src/common/intl.cpp:1210 @@ -7483,7 +7483,7 @@ msgstr "" #~ msgid "very small" #~ msgstr "meget lille" -#~ msgid "Can not create mutex" +#~ msgid "Cannot create mutex" #~ msgstr "Kan ikke oprette mutex." #~ msgid "Can't create the inter-process read pipe" @@ -7529,7 +7529,7 @@ msgstr "" #~ msgid "Fatal error: %s\n" #~ msgstr "Fatal fejl: " -#~ msgid "Can not create event object." +#~ msgid "Cannot create event object." #~ msgstr "Kan ikke oprette hændelsesobjekt." #~ msgid "Can't find the serialization object '%s' for the object '%s'." @@ -7667,19 +7667,19 @@ msgstr "" #~ msgid "Application Error" #~ msgstr "Program fejl" -#~ msgid "Can not create tooltip control" +#~ msgid "Cannot create tooltip control" #~ msgstr "Kan ikke oprette tooltip kontrol" -#~ msgid "Can not get data in format '%s' from clipboard." +#~ msgid "Cannot get data in format '%s' from clipboard." #~ msgstr "Kan ikke få data i format '%s' fra klippebordet." -#~ msgid "Can not get priority range for scheduling policy %d." +#~ msgid "Cannot get priority range for scheduling policy %d." #~ msgstr "Kan ikke få prioriteringsområde for afviklingsalgoritme %d." -#~ msgid "Can not put data in format '%s' on clipboard." +#~ msgid "Cannot put data in format '%s' on clipboard." #~ msgstr "Kan ikke skrive data i format '%s' til klippebordet." -#~ msgid "Can not retrieve thread scheduling policy." +#~ msgid "Cannot retrieve thread scheduling policy." #~ msgstr "Kan ikke hente trådafviklingsalgoritme." #~ msgid "Character '%c' is invalid in a config entry name." diff --git a/locale/de.po b/locale/de.po index 29927b9e6f..2e40aeda87 100644 --- a/locale/de.po +++ b/locale/de.po @@ -1352,48 +1352,48 @@ msgid "Ca&pitals" msgstr "Ka&pitalien" #: ../src/os2/thread.cpp:116 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Kann Mutex nicht anlegen." #: ../src/common/filefn.cpp:1383 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Kann Dateien '%s' nicht auflisten" #: ../src/unix/dir.cpp:228 #: ../src/msw/dir.cpp:201 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Kann Dateien in Verzeichnis '%s' nicht auflisten" #: ../src/os2/thread.cpp:516 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Kann Thread %lu nicht fortsetzen." #: ../src/msw/thread.cpp:889 #: ../src/mac/classic/thread.cpp:487 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Kann Thread %x nicht fortsetzen." #: ../src/msw/thread.cpp:525 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Kann Thread nicht starten: Fehler beim Beschreiben des TLS." #: ../src/os2/thread.cpp:502 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Kann Thread %lu nicht anhalten." #: ../src/msw/thread.cpp:874 #: ../src/mac/classic/thread.cpp:460 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Kann Thread %x nicht anhalten." #: ../src/msw/thread.cpp:793 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Kann nicht auf Threadende warten" #: ../src/common/cmdproc.cpp:262 @@ -5527,7 +5527,7 @@ msgid "This system doesn't support date picker control, please upgrade your vers msgstr "Dieses System unterstützt nicht die Komponente zur Darstellung der Datumsauswahl. Installieren Sie bitte eine neuere Version der comctl32.dll." #: ../src/msw/thread.cpp:1268 -msgid "Thread module initialization failed: can not store value in thread local storage" +msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "Thread-Modul-Initialisierung gescheitert: Kann den Wert nicht im lokalen Speicherbereich des Thread gespeichert werden" #: ../src/unix/threadpsx.cpp:1618 @@ -6567,7 +6567,7 @@ msgstr "d #: ../src/common/intl.cpp:1580 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "Lokale Umgebung '%s' kann nicht gesetzt werden." #: ../src/common/intl.cpp:1151 diff --git a/locale/el.po b/locale/el.po index e129aa9908..1e84c07670 100644 --- a/locale/el.po +++ b/locale/el.po @@ -1301,47 +1301,47 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Äåí åßíáé äõíáôÞ ç äçìéïõñãßá ôïõ mutex." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Äåí åßíáé äõíáôÞ ç áðáñßèìçóç ôùí áñ÷åßùí '%s'" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Äåí åßíáé äõíáôÞ ç áðáñßèìçóç ôùí áñ÷åßùí óôïí êáôÜëïãï '%s'" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Äåí åßíáé äõíáôÞ ç óõíÝ÷éóç(resume) ôïõ íÞìáôïò(thread) %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Äåí åßíáé äõíáôÞ ç óõíÝ÷éóç(resume) ôïõ íÞìáôïò(thread) %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "" "Äåí åßíáé äõíáôÞ ç åêêßíçóç ôïõ íÞìáôïò(thread): ÓöÜëìá êáôÜ ôçí åããñáöÞ ôïõ " "TLS" #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Äåí åßíáé äõíáôÞ ç áíáóôïëÞ åêôÝëåóçò(suspend) ôïõ íÞìáôïò(thread) %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Äåí åßíáé äõíáôÞ ç áíáóôïëÞ åêôÝëåóçò(suspend) ôïõ íÞìáôïò(thread) %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "" "Äåí åßíáé äõíáôÞ ç áíáìïíÞ(wait) ãéá ôïí ôåñìáôéóìü ôïõ íÞìáôïò åêôÝëåóçò" "(thread)" @@ -5805,7 +5805,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "Ç áñ÷éêïðïßçóç ìïíÜäáò íÞìáôïò åêôÝëåóçò (thread module) áðÝôõ÷å: áäýíáôç ç " @@ -6865,7 +6865,7 @@ msgstr " #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "ç ãëþóóá '%s' äåí ìðïñåé íá ïñéóôåß" #: ../src/common/intl.cpp:1210 diff --git a/locale/es.po b/locale/es.po index abd779875a..3e9ca5ad20 100644 --- a/locale/es.po +++ b/locale/es.po @@ -1319,46 +1319,46 @@ msgid "Ca&pitals" msgstr "Ca&pitulares" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "No se puede crear el mutex" #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "No se pueden enumerar los archivos '%s'" #: ../src/unix/dir.cpp:228 #: ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "No se pueden enumerar los archivos en carpeta '%s'" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "No se puede continuar el hilo de ejecución %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "No se puede continuar hilo de ejecución %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "No se puede empezar el hilo de ejecución: error al escribir TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "No se puede suspender el hilo de ejecución %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "No se puede suspender el hilo de ejecución %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "No se puede esperar a la finalización del hilo de ejecución" #: ../src/common/cmdproc.cpp:262 @@ -5757,7 +5757,7 @@ msgid "This system doesn't support date controls, please upgrade your version of msgstr "El sistema no soporta el control de selección de fecha, sírvase actualizar la versión de comctl32.dll" #: ../src/msw/thread.cpp:1247 -msgid "Thread module initialization failed: can not store value in thread local storage" +msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "Error en la inicialización del módulo de hilos de ejecución: no se pudo almacenar valor en el almacen local de hilos" #: ../src/unix/threadpsx.cpp:1686 @@ -6788,7 +6788,7 @@ msgstr "ligera" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "'%s' local no pudo establecerse." #: ../src/common/intl.cpp:1210 diff --git a/locale/eu.po b/locale/eu.po index f3085d9e1b..18320507b0 100644 --- a/locale/eu.po +++ b/locale/eu.po @@ -1292,45 +1292,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "" #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "" #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "" #: ../src/common/cmdproc.cpp:262 @@ -5573,7 +5573,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" @@ -6579,7 +6579,7 @@ msgstr "" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "" #: ../src/common/intl.cpp:1210 diff --git a/locale/fi.po b/locale/fi.po index 13a66c5868..d09962fe71 100644 --- a/locale/fi.po +++ b/locale/fi.po @@ -1327,46 +1327,46 @@ msgid "Ca&pitals" msgstr "&Suuraakkoset" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Mutexin luonti epäonnistui" #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Tiedostojen ”%s” luettelointi epäonnistui" #: ../src/unix/dir.cpp:228 #: ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Hakemiston ”%s” tiedostojen luettelointi epäonnistui" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Säikeen %lu jatko epäonnistui" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Säikeen %x jatko epäonnistui" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Säikeen käynnistys epäonnistui: virhe TLS-kirjoituksessa." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Säikeen %lu keskeytys epäonnistui" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Säikeen %x keskeytys epäonnistui" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Ei voi odottaa säikeen keskeytystä" #: ../src/common/cmdproc.cpp:262 @@ -5747,7 +5747,7 @@ msgid "This system doesn't support date controls, please upgrade your version of msgstr "Tämä järjestelmä ei tue date picker kontrollia, ole hyvä ja päivitä comctl32.dll" #: ../src/msw/thread.cpp:1247 -msgid "Thread module initialization failed: can not store value in thread local storage" +msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "Säiemoduulin käynnistys epäonnistui: arvoa ei voi tallentaa säikeen muistiin" #: ../src/unix/threadpsx.cpp:1686 @@ -6781,7 +6781,7 @@ msgstr "heikko" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "maa-arvoa ”%s” ei voida asettaa." #: ../src/common/intl.cpp:1210 diff --git a/locale/fr.po b/locale/fr.po index b2c22134c9..01f255dbc6 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -1261,45 +1261,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Impossible de créer le mutex." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Impossible d'énumérer les fichiers « %s »" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Impossible d'énumérer les fichiers dans le répertoire « %s »" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Impossible de reprendre le processus %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Impossible de reprendre le processus %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Impossible de lancer le processus : erreur lors de l'écriture de TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Impossible de suspendre le processus %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Impossible de suspendre le processus %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Impossible d'attendre la fin du processus" #: ../src/common/cmdproc.cpp:262 @@ -5649,7 +5649,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "Échec de l'initialisation du module du processus : enregistrement impossible " @@ -6686,7 +6686,7 @@ msgstr "l #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "la locale « %s » ne peut pas être spécifiée." #: ../src/common/intl.cpp:1210 diff --git a/locale/gl_ES.po b/locale/gl_ES.po index 6bcffe3df7..1efb2b0120 100644 --- a/locale/gl_ES.po +++ b/locale/gl_ES.po @@ -1342,47 +1342,47 @@ msgstr "" #: ../src/os2/thread.cpp:117 #, fuzzy -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "No se puede crear el mutex" #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Non se puido enumerar os ficheiros '%s'" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Non se puido enumerar os ficheiros do directorio '%s'" #: ../src/os2/thread.cpp:526 #, fuzzy, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "No se puede continuar el hilo de ejecución %lu" #: ../src/msw/thread.cpp:873 #, fuzzy, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "No se puede continuar hilo de ejecución %x" #: ../src/msw/thread.cpp:526 #, fuzzy -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "No se puede empezar el hilo de ejecución: error al escribir TLS." #: ../src/os2/thread.cpp:512 #, fuzzy, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "No se puede suspender el hilo de ejecución %lu" #: ../src/msw/thread.cpp:858 #, fuzzy, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "No se puede suspender el hilo de ejecución %x" #: ../src/msw/thread.cpp:781 #, fuzzy -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "No se puede esperar a la finalización del hilo de ejecución" #: ../src/common/cmdproc.cpp:262 @@ -5961,7 +5961,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 #, fuzzy msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "Error en la inicialización del módulo de hilos: no se puede almacenar valor " @@ -7077,7 +7077,7 @@ msgstr "ligera" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "Non se pode establecer locale '%s'." #: ../src/common/intl.cpp:1210 diff --git a/locale/hi.po b/locale/hi.po index ed0c2123e5..c3b78c68e4 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -1368,48 +1368,48 @@ msgid "Ca&pitals" msgstr "बड़े अक्षर (&P)" #: ../src/os2/thread.cpp:116 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "म्यूटेक्स का निर्माण नहीं किया जा सकता है।" #: ../src/common/filefn.cpp:1383 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "'%s' फ़ाइलों की परिगणना नहीं की जा सकती है" #: ../src/unix/dir.cpp:228 #: ../src/msw/dir.cpp:201 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "'%s' निर्देशिका में फ़ाइलों की परिगणना नहीं की जा सकती है" #: ../src/os2/thread.cpp:516 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "%lu थ्रेड को समान-बिन्दु से पुनः आरम्भ नहीं किया जा सकता है" #: ../src/msw/thread.cpp:889 #: ../src/mac/classic/thread.cpp:487 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "%x थ्रेड को समान-बिन्दु से पुनः आरम्भ नहीं किया जा सकता है" #: ../src/msw/thread.cpp:525 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "थ्रेड को आरम्भ नहीं किया जा सकता है: टीएलएस लेखन में त्रुटि" #: ../src/os2/thread.cpp:502 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "%lu थ्रेड को अधर में नहीं छोड़ा जा सकता है" #: ../src/msw/thread.cpp:874 #: ../src/mac/classic/thread.cpp:460 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "%x थ्रेड को अधर में नहीं छोड़ा जा सकता है" #: ../src/msw/thread.cpp:793 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "थ्रेड समाप्ति की प्रतीक्षा नहीं की जा सकती है" #: ../src/common/cmdproc.cpp:262 @@ -5553,7 +5553,7 @@ msgid "This system doesn't support date picker control, please upgrade your vers msgstr "" #: ../src/msw/thread.cpp:1268 -msgid "Thread module initialization failed: can not store value in thread local storage" +msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "थ्रेड माड्यूल आरम्भीकरण असफ़ल रहा: स्थानीय थ्रेड में मूल्य को सुरक्षित नहीं किया जा सका " #: ../src/unix/threadpsx.cpp:1618 @@ -6593,7 +6593,7 @@ msgstr "हल्का" #: ../src/common/intl.cpp:1580 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "'%s' लोकेल को स्थापित नहीं किया जा सका।" #: ../src/common/intl.cpp:1151 diff --git a/locale/hu.po b/locale/hu.po index 1e4294a264..fd8b68cb09 100644 --- a/locale/hu.po +++ b/locale/hu.po @@ -1342,46 +1342,46 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Nem tudom létrehozni a mutex-et" #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Nem tudom megszámolni a(z) '%s' fájlokat" #: ../src/unix/dir.cpp:228 #: ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Nem tudom megszámolni a(z) '%s' könyvtárban a fájlokat" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Nem tudom folytatni a(z) %lu szálat" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Nem tudom folytatni a(z) %x szálat" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Nem tudom elindítani a szálat: hiba a TLS írásakor." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Nem tudom felfüggeszteni a(z) %lu szálat" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Nem tudom felfüggeszteni a(z) %x szálat" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Nem tudom megvárni a szál befejezõdését" #: ../src/common/cmdproc.cpp:262 @@ -5843,7 +5843,7 @@ msgid "This system doesn't support date controls, please upgrade your version of msgstr "Ez a rendszer nem támogatja a dátumkiolvasó egységet, kérem frissítse a comctl32.dll-t." #: ../src/msw/thread.cpp:1247 -msgid "Thread module initialization failed: can not store value in thread local storage" +msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "A szál modul inicializálása nem sikerült: nem tudok értéket tárolni a szál helyi tárolójába" #: ../src/unix/threadpsx.cpp:1686 @@ -6879,7 +6879,7 @@ msgstr "v #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "A(z) '%s' helyi változó nem állítható be." #: ../src/common/intl.cpp:1210 diff --git a/locale/id.po b/locale/id.po index d5f9c172aa..dcf9af5627 100644 --- a/locale/id.po +++ b/locale/id.po @@ -1305,45 +1305,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Tidak bisa menciptakan mutex." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Tidak bisa mengenumerasi file-file '%s'" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Tidak bisa mengenumerasi file-file di direktori '%s'" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Tidak bisa meneruskan thread %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Tidak bisa meneruskan thread %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Tidak bisa memulai thread: kesalahan menulis TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Tidak bisa menunda thread %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Tidak bisa menunda thread %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Tidak bisa menunggu penghentian thread" #: ../src/common/cmdproc.cpp:262 @@ -5755,7 +5755,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "Inisialisasi modul thread gagal: tidak bisa menyimpan nilai dalam " @@ -6812,7 +6812,7 @@ msgstr "ringan" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "locale '%s' tidak bisa ditetapkan." #: ../src/common/intl.cpp:1210 diff --git a/locale/it.po b/locale/it.po index 7932ed1a84..6f3791d833 100644 --- a/locale/it.po +++ b/locale/it.po @@ -1260,45 +1260,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Impossibile creare mutex" #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Impossibile elencare i file '%s'" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Impossibile elencare i file nella cartella '%s'" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Impossibile riprendere il thread %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Impossibile riprendere il thread %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Impossibile avviare il thread: errore nella scrittura del TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Impossibile sospendere il thread %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Impossibile sospendere il thread %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Impossibile attendere la fine del thread" #: ../src/common/cmdproc.cpp:262 @@ -5641,7 +5641,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "Inizializzazione del modulo dei thread fallita: impossibile memorizzare un " @@ -6678,7 +6678,7 @@ msgstr "leggero" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "impossibile selezionare le impostazioni locali '%s'." #: ../src/common/intl.cpp:1210 diff --git a/locale/ja.po b/locale/ja.po index a77d5fb296..148d43d5b8 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -1429,45 +1429,45 @@ msgid "Ca&pitals" msgstr "大文字化 (&P)" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Mutex を作成できません。" #: ../src/common/filefn.cpp:1359 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "ファイルを列挙できません '%s'" #: ../src/msw/dir.cpp:212 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "ディレクトリー '%s' のファイルは列挙できません" #: ../src/os2/thread.cpp:528 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "スレッド %lu のリジュームができません" #: ../src/msw/thread.cpp:895 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "スレッド %x のリジュームができません" #: ../src/msw/thread.cpp:548 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "スレッドを開始できませんでした: TLS への書き込みに失敗しています。" #: ../src/os2/thread.cpp:514 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "スレッド %lu のサスペンドができません" #: ../src/msw/thread.cpp:880 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "スレッド %x のサスペンドができません" #: ../src/msw/thread.cpp:803 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "スレッドの終了を待つことはできません" #: ../src/common/cmdproc.cpp:266 @@ -6071,7 +6071,7 @@ msgid "This system doesn't support date controls, please upgrade your version of msgstr "このシステムは、date コントロールに未対応です。comctl32.dllを更新してください" #: ../src/msw/thread.cpp:1264 -msgid "Thread module initialization failed: can not store value in thread local storage" +msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "スレッドモジュールの初期化に失敗: スレッドローカルストレージに値を保存できませんでした" #: ../src/unix/threadpsx.cpp:1694 @@ -7213,7 +7213,7 @@ msgstr "軽量" #: ../src/common/intl.cpp:297 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "ロケールに '%s' を指定できませんでした｡" #: ../src/common/datetimefmt.cpp:1917 diff --git a/locale/ko_KR.po b/locale/ko_KR.po index 15cd199b3b..1f411c99a4 100644 --- a/locale/ko_KR.po +++ b/locale/ko_KR.po @@ -1313,46 +1313,46 @@ msgid "Ca&pitals" msgstr "대문자(&P)" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "뮤텍스 생성 할 수 없습니다" #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "'%s' 에 해당하는 파일을 찾을 수 없습니다" #: ../src/unix/dir.cpp:228 #: ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "'%s' 폴더에서 파일을 찾을 수 없습니다." #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "쓰레드 %lu 를 다시시작 실패" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "쓰레드 %x 를 다시시작 할 수 없습니다" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "쓰레드 시작 실패: TLS 쓰기 오류." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "쓰레드 %lu 일시정지 할 수 없습니다" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "쓰레드 %x 일시정지 할 수 없습니다" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "쓰레드 종료 실패로 Thread를 강제로 종료합니다" #: ../src/common/cmdproc.cpp:262 @@ -5713,7 +5713,7 @@ msgid "This system doesn't support date controls, please upgrade your version of msgstr "현재 시스템은 데이타 컨트롤을 지원 하지 않습니다, comctl32.dll 업데이트를 확인하세요." #: ../src/msw/thread.cpp:1247 -msgid "Thread module initialization failed: can not store value in thread local storage" +msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "쓰레드 모듈 초기화 실패:TLS 초기화 실패 " #: ../src/unix/threadpsx.cpp:1686 @@ -6742,7 +6742,7 @@ msgstr "가늘게" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "문자 인코딩을 '%s' 로 설정할 수 없습니다." #: ../src/common/intl.cpp:1210 diff --git a/locale/lv.po b/locale/lv.po index 5781263ae9..4ea7313faf 100644 --- a/locale/lv.po +++ b/locale/lv.po @@ -1293,45 +1293,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "" #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "" #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "" #: ../src/common/cmdproc.cpp:262 @@ -5585,7 +5585,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" @@ -6588,7 +6588,7 @@ msgstr "" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "" #: ../src/common/intl.cpp:1210 diff --git a/locale/ms.po b/locale/ms.po index 17288ceda2..3c3f39045a 100644 --- a/locale/ms.po +++ b/locale/ms.po @@ -1265,45 +1265,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Gagal mencipta mutex." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Gagal menghitung fail '%s'" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Gagal menghitung fail dalam direktori '%s'" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Gagal menyambung benang %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Gagal menyambung benang %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Gagal memulakan benang: ralat menulis TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Gagal menggantung benang %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Gagal menggantung benang %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Tidak dapat menunggu benang ditamatkan" #: ../src/common/cmdproc.cpp:262 @@ -5612,7 +5612,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "Gagal memulakan modul benang: Gagal simpan data dalam penyimpan benang lokal" @@ -6631,7 +6631,7 @@ msgstr "ringan" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "locale '%s' Gagal ditetapkan." #: ../src/common/intl.cpp:1210 diff --git a/locale/nb.po b/locale/nb.po index 976612d371..9e055138c3 100644 --- a/locale/nb.po +++ b/locale/nb.po @@ -1305,45 +1305,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Klarte ikke opprette mutex." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Klarte ikke telle opp filer «%s»" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Klarte ikke telle opp filer i mappen «%s»" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Klarte ikke gjenoppta tråden %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Klarte ikke gjenoppta tråden %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Klarte ikke starte tråden: feil ved skriving til TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Klarte ikke innstille tråden %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Klarte ikke innstille tråden %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Klarte ikke vente på trådens avslutning" #: ../src/common/cmdproc.cpp:262 @@ -5736,7 +5736,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "Initialisering av trådmodul feilet: klarte ikke lagre verdien i det lokale " @@ -6761,7 +6761,7 @@ msgstr "lett" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "klarte ikke sette lokale «%s»." #: ../src/common/intl.cpp:1210 diff --git a/locale/nl.po b/locale/nl.po index 72f44062a4..cab5194a0c 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -1312,46 +1312,46 @@ msgid "Ca&pitals" msgstr "&Hoofdletters" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "De mutex kan niet worden aangemaakt." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Kan bestanden in map '%s' niet opsommen" #: ../src/unix/dir.cpp:228 #: ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Kan bestanden in map '%s' niet opsommen" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Kan thread %lu niet hervatten" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Kan thread %x niet voortzetten" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Kan thread niet starten: fout bij schrijven TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Kan thread %lu niet tijdelijk buiten dienst stellen" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Kan thread %x niet tijdelijk buiten dienst stellen" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Kan niet wachten op thread-beëindiging" #: ../src/common/cmdproc.cpp:262 @@ -5697,7 +5697,7 @@ msgid "This system doesn't support date controls, please upgrade your version of msgstr "Dit systeem ondersteunt geen datum controls. Werk uw versie van comctl32.dll bij" #: ../src/msw/thread.cpp:1247 -msgid "Thread module initialization failed: can not store value in thread local storage" +msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "Threadmodule-initialisatie mislukt: kan geen waarde opslaan in lokale thread-geheugenruimte." #: ../src/unix/threadpsx.cpp:1686 @@ -6722,7 +6722,7 @@ msgstr "licht" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "landinstelling '%s' kan niet worden ingesteld." #: ../src/common/intl.cpp:1210 diff --git a/locale/pl.po b/locale/pl.po index 0bcbbd0792..b9ca25f289 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -1311,46 +1311,46 @@ msgid "Ca&pitals" msgstr "&Du¿e litery" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Nie mo¿na utworzyæ muteksu." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Nie mo¿na wyliczyæ plików '%s'" #: ../src/unix/dir.cpp:228 #: ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Nie mo¿na wyliczyæ plików w katalogu '%s'" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Nie mo¿na wznowiæ w±tku %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Nie mo¿na wznowiæ w±tku %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Nie mo¿na wystartowaæ w±tku: b³±d zapisu TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Nie mo¿na zawiesiæ w±tku %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Nie mo¿na zawiesiæ w±tku %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Nie mo¿na czekaæ na zakoñczenie w±tku" #: ../src/common/cmdproc.cpp:262 @@ -5732,7 +5732,7 @@ msgid "This system doesn't support date controls, please upgrade your version of msgstr "Ten system nie wspiera wyboru daty, nale¿y zaktualizowaæ bibliotekê comctl32.dll" #: ../src/msw/thread.cpp:1247 -msgid "Thread module initialization failed: can not store value in thread local storage" +msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "Zainicjowanie modu³u w±tków nie powiod³o siê: nie mo¿na od³o¿yæ warto¶ci do lokalnej pamiêci w±tków" #: ../src/unix/threadpsx.cpp:1686 @@ -6770,7 +6770,7 @@ msgstr "lekki" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "lokalizacja '%s' nie mo¿e byæ ustawiona." # w ¶cie¿ce - nie³adne diff --git a/locale/pt.po b/locale/pt.po index 0047746892..608bac905c 100644 --- a/locale/pt.po +++ b/locale/pt.po @@ -1268,45 +1268,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Não foi possível criar o mutex." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Não foi possível enumerar os ficheiros '%s'" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Não foi possível enumerar os ficheiros no directório '%s'" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Não é possível retomar a thread %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Não é possível retomar a thread %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Não é possível iniciar a thread: erro ao escrever o TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Não é possível suspender a thread %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Não é possível suspender a thread %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Não é possível esperar pela terminação da thread" #: ../src/common/cmdproc.cpp:262 @@ -5641,7 +5641,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "Falhou a inicialização do módulo da thread: não foi possível armazenar o " @@ -6677,7 +6677,7 @@ msgstr "leve" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "localização '%s' não pode ser definida." #: ../src/common/intl.cpp:1210 diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 0aeb906ed1..529c151cfc 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -1318,46 +1318,46 @@ msgid "Ca&pitals" msgstr "Ma&iúsculas" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Não pode criar o mutex." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Não pode enumerar os arquivos '%s'" #: ../src/unix/dir.cpp:228 #: ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Não pode enumerar os arquivos no diretório '%s'" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Não pode resumir o thread %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Não pode resumir o thread %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Não pode iniciar o thread: erro escrevendo o TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Não pode suspender o thread %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Não pode suspender o thread %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Não pode esperar pelo término do thread" #: ../src/common/cmdproc.cpp:262 @@ -5702,7 +5702,7 @@ msgid "This system doesn't support date controls, please upgrade your version of msgstr "Este sistema não suporta os controles de data, por favor atualize sua versão do comctl32.dll" #: ../src/msw/thread.cpp:1247 -msgid "Thread module initialization failed: can not store value in thread local storage" +msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "A inicialização do módulo dos threads falhou: não pode armazenar o valor no armazém local do thread" #: ../src/unix/threadpsx.cpp:1686 @@ -6729,7 +6729,7 @@ msgstr "leve" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "locale '%s' não pode ser definido." #: ../src/common/intl.cpp:1210 diff --git a/locale/ro.po b/locale/ro.po index 8dcb0827ec..d5d7bf5343 100644 --- a/locale/ro.po +++ b/locale/ro.po @@ -1435,45 +1435,45 @@ msgid "Ca&pitals" msgstr "&Majuscule" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Nu se poate crea mutex." #: ../src/common/filefn.cpp:1359 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Nu se pot enumera fișierele '%s'" #: ../src/msw/dir.cpp:212 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Nu se pot enumera fișierele din directorul '%s'" #: ../src/os2/thread.cpp:528 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Nu se poate continua firul de execuție %lu" #: ../src/msw/thread.cpp:895 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Nu se poate continua firul de execuție %x" #: ../src/msw/thread.cpp:548 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Nu se poate porni firul de execuție: eroare la scrierea TLS." #: ../src/os2/thread.cpp:514 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Nu se poate suspenda firul de execuție %lu" #: ../src/msw/thread.cpp:880 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Nu se poate suspenda firul de execuție %x" #: ../src/msw/thread.cpp:803 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Nu se poate aștepta terminarea firului de execuție" #: ../src/common/cmdproc.cpp:266 @@ -6079,7 +6079,7 @@ msgid "This system doesn't support date controls, please upgrade your version of msgstr "Acest sistem nu suportă controale de tip dată, trebuie să actualizați comctl32.dll la o versiune mai nouă" #: ../src/msw/thread.cpp:1264 -msgid "Thread module initialization failed: can not store value in thread local storage" +msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "Inițializarea modulului pentru fire de execuție a eșuat: valoarea nu poate fi memorată în memoria locală a firului de execuție" #: ../src/unix/threadpsx.cpp:1694 @@ -7221,7 +7221,7 @@ msgstr "subțire" #: ../src/common/intl.cpp:297 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "locala '%s' nu poate fi setată." #: ../src/common/datetimefmt.cpp:1917 diff --git a/locale/ru.po b/locale/ru.po index a4cc29be52..512d221412 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -1303,45 +1303,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÍÕÔÅËÓ." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "îÅ ÍÏÇÕ ÐÏÄÓÞÉÔÁÔØ ËÏÌÉÞÅÓÔ×Ï ÆÁÊÌÏ× '%s'" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "îÅ ÍÏÇÕ ÐÅÒÅÓÞÉÔÁÔØ ÆÁÊÌÙ × ËÁÔÁÌÏÇÅ '%s'" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÏÚÏÂÎÏ×ÉÔØ ×ÙÐÏÌÎÅÎÉÅ ÐÏÔÏËÁ %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÏÚÏÂÎÏ×ÉÔØ ×ÙÐÏÌÎÅÎÉÅ ÐÏÔÏËÁ %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ ×ÙÐÏÌÎÅÎÉÅ ÐÏÔÏËÁ: ÏÛÉÂËÁ ÚÁÐÉÓÉ TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÉÏÓÔÁÎÏ×ÉÔØ ×ÙÐÏÌÎÅÎÉÅ ÐÏÔÏËÁ %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÉÏÓÔÁÎÏ×ÉÔØ ×ÙÐÏÌÎÅÎÉÅ ÐÏÔÏËÁ %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "îÅ×ÏÚÍÏÖÎÏ ÄÏÖÄÁÔØÓÑ ÏËÏÎÞÁÎÉÑ ×ÙÐÏÌÎÅÎÉÑ ÐÏÔÏËÁ" #: ../src/common/cmdproc.cpp:262 @@ -5753,7 +5753,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÍÏÄÕÌÑ ÐÏÔÏËÏ×: ÎÅ×ÏÚÍÏÖÎÏ ÓÏÈÒÁÎÉÔØ ÚÎÁÞÅÎÉÅ × " @@ -6782,7 +6782,7 @@ msgstr " #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "ÌÏËÁÌØ '%s' ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎÁ." #: ../src/common/intl.cpp:1210 diff --git a/locale/sk.po b/locale/sk.po index c437b56c34..2a9d0bf71a 100644 --- a/locale/sk.po +++ b/locale/sk.po @@ -1263,45 +1263,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Nemôžem vytvoriÅ¥ mutex." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Nebolo možné vymenovaÅ¥ súbory '%s'" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Nebolo možné vymenovaÅ¥ súbory v adresári '%s'" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Nebolo možné obnoviÅ¥ vlákno %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Nebolo možné obnoviÅ¥ vlákno %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Nebolo možné začaÅ¥ vlákno: chyba zápisu TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Nebolo možné suspendovaÅ¥ vlákno %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Nebolo možné suspendovaÅ¥ vlákno %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Nemôžem čakaÅ¥ na ukončenie vlákna" #: ../src/common/cmdproc.cpp:262 @@ -5601,7 +5601,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "Zlyhala inicializácia modulu vlákien: nie je možné uložiÅ¥ hodnotu v lokálnom " @@ -6608,7 +6608,7 @@ msgstr "" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "nie je možné nastaviÅ¥ locale '%s'." #: ../src/common/intl.cpp:1210 diff --git a/locale/sl.po b/locale/sl.po index d26fc270af..c33269f4d9 100644 --- a/locale/sl.po +++ b/locale/sl.po @@ -1489,14 +1489,14 @@ msgstr "Ve&like začetnice" # # msw/thread.cpp:519 #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Mutexa ni mogoče ustvariti." # common/filefn.cpp:1287 # msw/dir.cpp:294 #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "OÅ¡tevilčenje datotek '%s' ni možno" # common/filefn.cpp:1287 @@ -1504,7 +1504,7 @@ msgstr "OÅ¡tevilčenje datotek '%s' ni možno" #: ../src/unix/dir.cpp:228 #: ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "OÅ¡tevilčenje datotek v mapi '%s' ni možno." # SOME DESCRIPTIVE TITLE. @@ -1514,34 +1514,34 @@ msgstr "OÅ¡tevilčenje datotek v mapi '%s' ni možno." # msw/thread.cpp:519 #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Niti %lu ni mogoče nadaljevati." # msw/thread.cpp:552 #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Niti %x ni mogoče nadaljevati" # msw/thread.cpp:433 #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Niti ni mogoče začeti: napaka pri pisanju TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Niti %lu ni mogoče začasno ustaviti." # msw/thread.cpp:537 #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Niti %x ni mogoče začasno ustaviti." # msw/thread.cpp:871 #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Ustavitve niti ni mogoče pričakati." # common/docview.cpp:1928 @@ -6613,7 +6613,7 @@ msgstr "Ta sistem ne podpira kontrolnika za izbor datuma, prosimo, nadgradite sv # msw/thread.cpp:1083 #: ../src/msw/thread.cpp:1247 -msgid "Thread module initialization failed: can not store value in thread local storage" +msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "Inicializacija modula niti ni uspela: vrednosti ni mogoče shraniti v lokalni shrambi niti" #: ../src/unix/threadpsx.cpp:1686 @@ -7792,7 +7792,7 @@ msgstr "svetlo" # common/intl.cpp:575 #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "ne morem nastaviti locale '%s'." # common/intl.cpp:369 diff --git a/locale/sq.po b/locale/sq.po index e9c411e405..c211eee734 100644 --- a/locale/sq.po +++ b/locale/sq.po @@ -1286,45 +1286,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "S'krijoj dot mutex." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Nuk numërtoj dot kartela '%s'" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Nuk numërtoj dot kartela në drejtori '%s'" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" -msgstr "Can not resume thread %lu" +msgid "Cannot resume thread %lu" +msgstr "Cannot resume thread %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Nuk rimarr dot rrjedhën %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Nuk filloj dot rrjedhë: gabim në shkrimin e TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "S'pushoj dot rrjedhën %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Nuk pezulloj dot rrjedhën %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Nuk pres dot për përfundim rrjedhe" #: ../src/common/cmdproc.cpp:262 @@ -5702,7 +5702,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "Gatitja e modulit të rrjedhës dështoi: nuk mund të ruaj vlera në hambar " @@ -6734,7 +6734,7 @@ msgstr "but #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "nuk vendoset dot vendorja '%s'." #: ../src/common/intl.cpp:1210 diff --git a/locale/sv.po b/locale/sv.po index 26808375bb..9098925df2 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -1259,45 +1259,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Kan inte skapa mutex." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Kan inte räkna upp filerna \"%s\"" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Kan inte räkna upp filerna i katalogen \"%s\"" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Kan inte återuppta tråden %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Kan inte återuppta tråden %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Kan inte starta tråden: fel vid skrivning av TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Kan inte hålla inne tråd %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Kan inte hålla inne tråd %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Kan inte vänta på att tråden avslutas" #: ../src/common/cmdproc.cpp:262 @@ -5603,7 +5603,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "Trådmodulinitialisering misslyckades: Kan inte spara värde i trådens lokala " @@ -6625,7 +6625,7 @@ msgstr "tunn" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "lokal \"%s\" kan inte anges." #: ../src/common/intl.cpp:1210 diff --git a/locale/tr.po b/locale/tr.po index 0fe2e08d1e..6b37d75bc5 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -1311,46 +1311,46 @@ msgid "Ca&pitals" msgstr "Büyük harfler" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Muteks yaratýlamadý." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "'%s' dosyalarý sayýlamýyor" #: ../src/unix/dir.cpp:228 #: ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "'%s' klasöründeki dosyalar sayýlamýyor" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "%lu iþ parçacýðý yeniden baþlatýlamadý" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "%x iþ parçacýðý yeniden baþlatýlamadý" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Ýþ parçacýðý baþlatýlamadý: TLS yazma hatasý." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "%lu iþ parçacýðý beklemeye alýnamadý" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "%x iþ parçacýðý beklemeye alýnamadý" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Ýþ parçacýðýnýn bitmesi beklenemiyor" #: ../src/common/cmdproc.cpp:262 @@ -5694,7 +5694,7 @@ msgid "This system doesn't support date controls, please upgrade your version of msgstr "Bu sistem tarih öðelerini desteklemiyor, lütfen comctl32.dll sürümünü yükseltiniz" #: ../src/msw/thread.cpp:1247 -msgid "Thread module initialization failed: can not store value in thread local storage" +msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "Ýþparçacýðý birimi baþlatma baþarýsýz: yerel depoya deðer koyulamýyor" #: ../src/unix/threadpsx.cpp:1686 @@ -6720,7 +6720,7 @@ msgstr "a #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "'%s' yereli ayarlanamýyor." #: ../src/common/intl.cpp:1210 diff --git a/locale/uk.po b/locale/uk.po index 2c67f32a49..11af0e3ec0 100644 --- a/locale/uk.po +++ b/locale/uk.po @@ -1258,45 +1258,45 @@ msgid "Ca&pitals" msgstr "Пр&описні" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Не вдалося створити синхронізацію." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Не можу перелічити файли «%s»" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr " Не можу перелічити файли в каталозі «%s»" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Не вдалося відновити нитку %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Не вдалося відновити нитку %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr " Не вдалося запустити нитку: помилка запису TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr " Не вдалося призупинити нитку %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr " Не вдалося зупинити нитку %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr " Не вдалося дочекатись закінчення нитки" #: ../src/common/cmdproc.cpp:262 @@ -5581,7 +5581,7 @@ msgstr "" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" "Помилка ініціалізації модуля ниток: Не вдалося записати значення в " @@ -6603,7 +6603,7 @@ msgstr "легкий" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "локаль «%s» не може бути встановлена." #: ../src/common/intl.cpp:1210 diff --git a/locale/vi.po b/locale/vi.po index 21d7d933a2..ec25c7291c 100644 --- a/locale/vi.po +++ b/locale/vi.po @@ -1316,46 +1316,46 @@ msgid "Ca&pitals" msgstr "Chữ viết &hoa" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "Không thể tạo mutex." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "Không thể liệt kê các tệp tin '%s'" #: ../src/unix/dir.cpp:228 #: ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "Không thể đếm các tệp tin trong thÆ° mục '%s'" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "Không thể phục hồi tuyến trình %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "Không thể phục hồi tuyến trình %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "Không thể bắt đầu tuyến trình: lỗi ghi TLS." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "Không thể đình chỉ tuyến trình %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "Không thể đình chỉ tuyến trình %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "Không thể chờ tuyến trình kết thúc" #: ../src/common/cmdproc.cpp:262 @@ -5700,7 +5700,7 @@ msgid "This system doesn't support date controls, please upgrade your version of msgstr "Hệ thống không hỗ trợ điều khiển ngày tháng, xin hãy cập nhật phiên bản mới của comctl32.dll" #: ../src/msw/thread.cpp:1247 -msgid "Thread module initialization failed: can not store value in thread local storage" +msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "Khởi tạo mô đun tuyến trình gặp lỗi: không thể lÆ°u giá trị trong phần lÆ°u trữ nội bộ tuyến trình" #: ../src/unix/threadpsx.cpp:1686 @@ -6727,7 +6727,7 @@ msgstr "ánh sáng" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "vị trí '%s' không thể đặt được." #: ../src/common/intl.cpp:1210 diff --git a/locale/wxstd.pot b/locale/wxstd.pot index e3f49851c5..0349aeb16b 100644 --- a/locale/wxstd.pot +++ b/locale/wxstd.pot @@ -1371,45 +1371,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "" #: ../src/common/filefn.cpp:1359 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "" #: ../src/msw/dir.cpp:212 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "" #: ../src/os2/thread.cpp:528 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "" #: ../src/msw/thread.cpp:895 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "" #: ../src/msw/thread.cpp:548 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "" #: ../src/os2/thread.cpp:514 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "" #: ../src/msw/thread.cpp:880 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "" #: ../src/msw/thread.cpp:803 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "" #: ../src/common/cmdproc.cpp:266 @@ -5877,7 +5877,7 @@ msgstr "" #: ../src/msw/thread.cpp:1264 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "" @@ -6994,7 +6994,7 @@ msgstr "" #: ../src/common/intl.cpp:297 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "" #: ../src/common/datetimefmt.cpp:1917 diff --git a/locale/zh_CN.po b/locale/zh_CN.po index f6a3b69d77..44e29bed0c 100644 --- a/locale/zh_CN.po +++ b/locale/zh_CN.po @@ -1291,45 +1291,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "不能创建互斥对象." #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "不能枚举文件 '%s'" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "不能枚举目录 '%s'中的文件" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "不能恢复线程 %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "不能恢复线程 %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "不能启动线程: 写TLS出错." #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "不能挂起线程 %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "不能挂起线程 %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "不能等候线程终止" #: ../src/common/cmdproc.cpp:262 @@ -5673,7 +5673,7 @@ msgstr "本系统不支持日期获取控制, 请升级您的comctl32.dll" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "线程模块初始化失败: 不能在线程本地存储区中存放值" @@ -6694,7 +6694,7 @@ msgstr "细" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "不能设置语言(locale) '%s'." #: ../src/common/intl.cpp:1210 diff --git a/locale/zh_TW.po b/locale/zh_TW.po index ca307d101e..02eb9c9c11 100644 --- a/locale/zh_TW.po +++ b/locale/zh_TW.po @@ -1290,45 +1290,45 @@ msgid "Ca&pitals" msgstr "" #: ../src/os2/thread.cpp:117 -msgid "Can not create mutex." +msgid "Cannot create mutex." msgstr "無法建立 mutex。" #: ../src/common/filefn.cpp:1421 #, c-format -msgid "Can not enumerate files '%s'" +msgid "Cannot enumerate files '%s'" msgstr "無法列舉檔案 '%s'" #: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 #, c-format -msgid "Can not enumerate files in directory '%s'" +msgid "Cannot enumerate files in directory '%s'" msgstr "無法列舉目錄 '%s' 中的檔案" #: ../src/os2/thread.cpp:526 #, c-format -msgid "Can not resume thread %lu" +msgid "Cannot resume thread %lu" msgstr "無法恢復執行緒 %lu" #: ../src/msw/thread.cpp:873 #, c-format -msgid "Can not resume thread %x" +msgid "Cannot resume thread %x" msgstr "無法恢復執行緒 %x" #: ../src/msw/thread.cpp:526 -msgid "Can not start thread: error writing TLS." +msgid "Cannot start thread: error writing TLS." msgstr "無法啟動執行緒：寫入「執行緒內部儲存區」時發生錯誤。" #: ../src/os2/thread.cpp:512 #, c-format -msgid "Can not suspend thread %lu" +msgid "Cannot suspend thread %lu" msgstr "無法暫停執行緒 %lu" #: ../src/msw/thread.cpp:858 #, c-format -msgid "Can not suspend thread %x" +msgid "Cannot suspend thread %x" msgstr "無法暫停執行緒 %x" #: ../src/msw/thread.cpp:781 -msgid "Can not wait for thread termination" +msgid "Cannot wait for thread termination" msgstr "無法等候執行緒終結" #: ../src/common/cmdproc.cpp:262 @@ -5672,7 +5672,7 @@ msgstr "本系統不支援日期獲取控制, 請升級您的comctl32.dll" #: ../src/msw/thread.cpp:1247 msgid "" -"Thread module initialization failed: can not store value in thread local " +"Thread module initialization failed: cannot store value in thread local " "storage" msgstr "執行緒模組初始化失敗：無法存值到「執行緒內部儲存區」" @@ -6690,7 +6690,7 @@ msgstr "細體" #: ../src/common/intl.cpp:1645 #, c-format -msgid "locale '%s' can not be set." +msgid "locale '%s' cannot be set." msgstr "無法設定地區為 '%s'。" #: ../src/common/intl.cpp:1210 diff --git a/misc/theme_test/test.c b/misc/theme_test/test.c index 58c6bebdee..f9b9c88579 100644 --- a/misc/theme_test/test.c +++ b/misc/theme_test/test.c @@ -84,7 +84,7 @@ int main (int argc, char *argv[]) gtk_table_attach_defaults(GTK_TABLE(table), notebook, 0,6,0,1); gtk_widget_show(notebook); - /* Now finally lets prepend pages to the notebook */ + /* Now finally let's prepend pages to the notebook */ frame = gtk_frame_new ("frame"); gtk_container_set_border_width (GTK_CONTAINER (frame), 10); diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp index ee0b86ef95..b6bb96102f 100644 --- a/samples/aui/auidemo.cpp +++ b/samples/aui/auidemo.cpp @@ -1704,7 +1704,7 @@ wxString MyFrame::GetIntroText() "

  • Native, dockable floating frames
    • " "
  • Perspective saving and loading
    • " "
  • Native toolbars incorporating real-time, "spring-loaded" dragging
    • " - "
  • Customizable floating/docking behavior
    • " + "
  • Customizable floating/docking behaviour
    • " "
  • Completely customizable look-and-feel
    • " "
  • Optional transparent window effects (while dragging or docking)
    • " "
  • Splittable notebook control
    • " diff --git a/samples/debugrpt/debugrpt.cpp b/samples/debugrpt/debugrpt.cpp index 3ec7fc7f31..e8b5ee9f3a 100644 --- a/samples/debugrpt/debugrpt.cpp +++ b/samples/debugrpt/debugrpt.cpp @@ -322,7 +322,7 @@ void MyFrame::OnPaint(wxPaintEvent& WXUNUSED(event)) MyApp::MyApp() { - // user needs to explicitely enable this + // user needs to explicitly enable this m_uploadReport = false; // call this to tell the library to call our OnFatalException() diff --git a/samples/dnd/d_and_d.txt b/samples/dnd/d_and_d.txt index b85b7c1570..7127ef4932 100644 --- a/samples/dnd/d_and_d.txt +++ b/samples/dnd/d_and_d.txt @@ -32,7 +32,7 @@ act as modifiers: keeping down the key at the moment of drop does There are several objects participating in a d&d operation. First of all, there is the data object itself. Second, there is the drop source which is responsible for creating the data object (if it doesn't exist yet) and starting -the d&d operation. Finally, the drop target recieves the notification when +the d&d operation. Finally, the drop target receives the notification when the data is dropped onto the associated window (see below) and is responsible for pasting the data and returning the result code (copy, move or failure). There is one class for each one of these roles in wxWindows d&d implementation, diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp index b39fb8972c..19818132f7 100644 --- a/samples/internat/internat.cpp +++ b/samples/internat/internat.cpp @@ -398,7 +398,7 @@ void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event)) str = wxGetTranslation(wxTRANSLATE("Bad luck! try again...")); // note also that if we want 'str' to contain a localized string - // we need to use wxGetTranslation explicitely as wxTRANSLATE just + // we need to use wxGetTranslation explicitly as wxTRANSLATE just // tells xgettext to extract the string but has no effect on the // runtime of the program! } diff --git a/samples/mediaplayer/mediaplayer.cpp b/samples/mediaplayer/mediaplayer.cpp index 56d74e0f58..1ca1da55f6 100644 --- a/samples/mediaplayer/mediaplayer.cpp +++ b/samples/mediaplayer/mediaplayer.cpp @@ -404,7 +404,7 @@ const wxChar* wxGetMediaStateText(int nState) // // IMPLEMENT_APP does this, and also implements the platform-specific entry // routine, such as main or WinMain(). Use IMPLEMENT_APP_NO_MAIN if you do -// not desire this behavior. +// not desire this behaviour. // ---------------------------------------------------------------------------- IMPLEMENT_APP(wxMediaPlayerApp) diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp index a8ba08b034..d49ead6e8e 100644 --- a/samples/menu/menu.cpp +++ b/samples/menu/menu.cpp @@ -708,7 +708,7 @@ void MyFrame::OnInsertMenu(wxCommandEvent& WXUNUSED(event)) wxString title; wxMenu *menu = CreateDummyMenu(&title); // Insert before the 'Help' menu - // Othewise repeated Deletes will remove the 'Test' menu + // Otherwise repeated Deletes will remove the 'Test' menu GetMenuBar()->Insert(4, menu, title); } diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp index a2ea654f91..2138a85c26 100644 --- a/samples/opengl/isosurf/isosurf.cpp +++ b/samples/opengl/isosurf/isosurf.cpp @@ -210,7 +210,7 @@ void TestGLCanvas::LoadSurface(const wxString& filename) { // we suppose to have in input a text file containing floating numbers - // space/newline-separed... first 3 numbers are the coordinates of a + // space/newline-separated... first 3 numbers are the coordinates of a // vertex and the following 3 are the relative vertex normal and so on... wxTextInputStream inFile(*stream); diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp index bb4daffb35..9ba62aa6cf 100644 --- a/samples/printing/printing.cpp +++ b/samples/printing/printing.cpp @@ -642,7 +642,7 @@ void MyPrintout::DrawPageTwo() int ppiPrinterX, ppiPrinterY; GetPPIPrinter(&ppiPrinterX, &ppiPrinterY); - // This scales the DC so that the printout roughly represents the the screen + // This scales the DC so that the printout roughly represents the screen // scaling. The text point size _should_ be the right size but in fact is // too small for some reason. This is a detail that will need to be // addressed at some point but can be fudged for the moment. diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp index bff02063b4..4d36f39bfe 100644 --- a/samples/propgrid/propgrid.cpp +++ b/samples/propgrid/propgrid.cpp @@ -650,7 +650,7 @@ void FormMain::OnPropertyGridChanging( wxPropertyGridEvent& event ) event.Veto(); // Since we ask a question, it is better if we omit any validation - // failure behavior. + // failure behaviour. event.SetValidationFailureBehavior(0); } } @@ -1098,7 +1098,7 @@ void FormMain::PopulateWithStandardItems () pg->SetPropertyAttribute(wxT("Y"), wxPG_ATTR_UNITS, wxT("Pixels") ); pg->SetPropertyHelpString(wxT("Y"), wxT("This property uses \"Units\" attribute.") ); - const wxChar* disabledHelpString = wxT("This property is simply disabled. Inorder to have label disabled as well, ") + const wxChar* disabledHelpString = wxT("This property is simply disabled. In order to have label disabled as well, ") wxT("you need to set wxPG_EX_GREY_LABEL_WHEN_DISABLED using SetExtraStyle."); pg->Append( new wxPropertyCategory(wxT("Environment"),wxPG_LABEL) ); @@ -1932,7 +1932,7 @@ void FormMain::CreateGrid( int style, int extraStyle ) pgman->SetExtraStyle(extraStyle); - // This is the default validation failure behavior + // This is the default validation failure behaviour m_pPropGridManager->SetValidationFailureBehavior( wxPG_VFB_MARK_CELL | wxPG_VFB_SHOW_MESSAGEBOX ); diff --git a/samples/propgrid/sampleprops.h b/samples/propgrid/sampleprops.h index 7cbb41f3e3..0fbbf446b7 100644 --- a/samples/propgrid/sampleprops.h +++ b/samples/propgrid/sampleprops.h @@ -29,7 +29,7 @@ public: void OnSetValue(); - // Inorder to have different value type in a derived property + // In order to have different value type in a derived property // class, we will override GetValue to return custom variant, // instead of changing the base m_value. This allows the methods // in base class to function properly. diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp index 331e7e8a09..96b90ba23f 100644 --- a/samples/propgrid/tests.cpp +++ b/samples/propgrid/tests.cpp @@ -1392,7 +1392,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive ) s = wxString::Format(wxT("%i tests failed!!!"), failures); #ifdef __WXDEBUG__ else - s = wxString::Format(wxT("All tests were succesfull, but there were %i warnings!"), wxPGGlobalVars->m_warnings); + s = wxString::Format(wxT("All tests were successfull, but there were %i warnings!"), wxPGGlobalVars->m_warnings); #endif RT_MSG(s) for ( i=0; iAdd(m_combobox, 0, wxGROW | wxALL, 5); m_sizerCombo->Layout(); - // Allow changing height inorder to demonstrate flexible + // Allow changing height in order to demonstrate flexible // size of image "thumbnail" painted in the control itself. long h = 0; m_textChangeHeight->GetValue().ToLong(&h); diff --git a/samples/xti/classlist.h b/samples/xti/classlist.h index b8187c9868..bcb19821ea 100644 --- a/samples/xti/classlist.h +++ b/samples/xti/classlist.h @@ -44,7 +44,7 @@ class ClassListDialog: public wxDialog { - // we explicitely don't want to use the following macro: + // we explicitly don't want to use the following macro: // DECLARE_DYNAMIC_CLASS( ClassListDialog ) // as otherwise the ClassListDialog class would appear in the list // shown by this dialog! diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp index bc109ddec5..5e6ef680ed 100644 --- a/src/aui/auibook.cpp +++ b/src/aui/auibook.cpp @@ -2931,7 +2931,7 @@ void wxAuiNotebook::SetArtProvider(wxAuiTabArt* art) // specified tab ctrl height, overriding all other considerations, // such as text or bitmap height. It overrides any call to // SetUniformBitmapSize(). Specifying a height of -1 reverts -// any previous call and returns to the default behavior +// any previous call and returns to the default behaviour void wxAuiNotebook::SetTabCtrlHeight(int height) { diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp index 0ad3721c5c..6988854125 100644 --- a/src/aui/framemanager.cpp +++ b/src/aui/framemanager.cpp @@ -801,7 +801,7 @@ wxAuiManager* wxAuiManager::GetManager(wxWindow* window) void wxAuiManager::UpdateHintWindowConfig() { - // find out if the the system can do transparent frames + // find out if the system can do transparent frames bool can_do_transparent = false; wxWindow* w = m_frame; @@ -3401,7 +3401,7 @@ void wxAuiManager::OnHintActivate(wxActivateEvent& WXUNUSED(event)) // Do nothing so this event isn't handled in the base handlers. // Letting the hint window activate without this handler can lead to - // weird behavior on Mac where the menu is switched out to the top + // weird behaviour on Mac where the menu is switched out to the top // window's menu in MDI applications when it shouldn't be. So since // we don't want user interaction with the hint window anyway, we just // prevent it from activating here. @@ -3434,7 +3434,7 @@ void wxAuiManager::StartPaneDrag(wxWindow* pane_window, // CalculateHintRect() calculates the drop hint rectangle. The method // first calls DoDrop() to determine the exact position the pane would // be at were if dropped. If the pane would indeed become docked at the -// specified drop point, the the rectangle hint will be returned in +// specified drop point, the rectangle hint will be returned in // screen coordinates. Otherwise, an empty rectangle is returned. // |pane_window| is the window pointer of the pane being dragged, |pt| is // the mouse position, in client coordinates. |offset| describes the offset @@ -3851,7 +3851,7 @@ void wxAuiManager::OnRender(wxAuiManagerEvent& evt) // Render() fire a render event, which is normally handled by // wxAuiManager::OnRender(). This allows the render function to // be overridden via the render event. This can be useful for paintin -// custom graphics in the main window. Default behavior can be +// custom graphics in the main window. Default behaviour can be // invoked in the overridden function by calling OnRender() void wxAuiManager::Render(wxDC* dc) diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm index 076da16b09..f05ea8c419 100644 --- a/src/cocoa/app.mm +++ b/src/cocoa/app.mm @@ -319,7 +319,7 @@ void wxApp::WakeUpIdle() done without exiting the runloop. Be careful if you decide to change the implementation of this method - as wxEventLoop::Exit depends on the current behavior. + as wxEventLoop::Exit depends on the current behaviour. */ [m_cocoaApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined location:NSZeroPoint modifierFlags:NSAnyEventMask diff --git a/src/cocoa/combobox.mm b/src/cocoa/combobox.mm index 14c8d35532..f9d8da8edf 100644 --- a/src/cocoa/combobox.mm +++ b/src/cocoa/combobox.mm @@ -12,7 +12,7 @@ // // Impl notes: // There is no custom data source because doing so unnecessarily sacrifices -// some native autocompletion behavior (we would have to make our own - +// some native autocompletion behaviour (we would have to make our own - // the SimpleComboBox sample does so in the developer folder that // comes with OSX). One reason you might want this would be to have // only one array or be able to display numbers returned by an NSNumber diff --git a/src/cocoa/font.mm b/src/cocoa/font.mm index c7297d8aa3..be2717fb1f 100644 --- a/src/cocoa/font.mm +++ b/src/cocoa/font.mm @@ -64,7 +64,7 @@ and a particular set of attributes. Furthermore, the attributes instead of being flags as in NSFontManager are instead well-defined keys in a dictionary. - The only way to get that behavior without NSFontManager is to pare down the + The only way to get that behaviour without NSFontManager is to pare down the list as much as possible using the classic NSFontManager methods and then to instantiate each font in the list and match on each font's afmDictionary. @@ -102,7 +102,7 @@ static wxNativeFontInfo MakeNativeFontInfo(int size, wxFontFamily family, wxFont wxNativeFontInfo so anyone who subclassed it or created one without going through wxFont should expect what they get (i.e. horrible breakage) There's a concern that wxFontRefData was in the public header when 2.8 shipped so - it's possible that someone did subclass it to get better font behavior. + it's possible that someone did subclass it to get better font behaviour. For right now, the plan is to write it strictly ABI compatible with 2.8 and eventually to enhance it in trunk to accurately represent font attributes as Cocoa sees them. diff --git a/src/cocoa/radiobox.mm b/src/cocoa/radiobox.mm index 5aee5df989..0a8e1aaefb 100644 --- a/src/cocoa/radiobox.mm +++ b/src/cocoa/radiobox.mm @@ -255,7 +255,7 @@ bool wxRadioBox::Show(unsigned int n, bool show) // TODO // NOTE: Cocoa has no visible state for cells so we'd need to replace the // cell with a dummy one to hide it or alternatively subclass NSButtonCell - // and add the behavior. + // and add the behaviour. return false; } diff --git a/src/cocoa/sound.mm b/src/cocoa/sound.mm index aad32611f3..81a6def712 100644 --- a/src/cocoa/sound.mm +++ b/src/cocoa/sound.mm @@ -165,7 +165,7 @@ bool wxSound::DoPlay(unsigned flags) const bool wxSound::IsPlaying() { // Normally you can send a message to a nil object and it will return - // nil. That behavior would probably be okay here but in general it's + // nil. That behaviour would probably be okay here but in general it's // not recommended to send a message to a nil object if the return // value is not an object. Better safe than sorry. if(s_currentSound) diff --git a/src/cocoa/taskbar.mm b/src/cocoa/taskbar.mm index 05ceafc5ca..b48ecd30d1 100644 --- a/src/cocoa/taskbar.mm +++ b/src/cocoa/taskbar.mm @@ -390,7 +390,7 @@ void wxTaskBarIconWindowCustom::OnPaint(wxPaintEvent &event) // This neatly solves the problem of DLL separation. If the wxAdvanced // library (which this file is part of) is loaded then this category is -// defined and we get dock menu behavior without app.mm ever having to +// defined and we get dock menu behaviour without app.mm ever having to // know we exist. C++ did sucketh so. :-) @interface wxNSApplicationDelegate(wxTaskBarIconNSApplicationDelegateCategory) diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm index c7e8c56b08..8a432a0609 100644 --- a/src/cocoa/window.mm +++ b/src/cocoa/window.mm @@ -357,9 +357,9 @@ bool wxWindowCocoaHider::Cocoa_drawRect(const NSRect& rect) /*! @class WXManualScrollView - @abstract An NSScrollView subclass which implements wx scroll behavior + @abstract An NSScrollView subclass which implements wx scroll behaviour @discussion - Overrides default behavior of NSScrollView such that this class receives + Overrides default behaviour of NSScrollView such that this class receives the scroller action messages and allows the wxCocoaScrollView to act on them accordingly. In particular, because the NSScrollView will not receive action messages from the scroller, it will not adjust the diff --git a/src/common/any.cpp b/src/common/any.cpp index 451d8395b4..c8681efec7 100644 --- a/src/common/any.cpp +++ b/src/common/any.cpp @@ -152,7 +152,7 @@ bool wxConvertAnyToVariant(const wxAny& any, wxVariant* variant) if ( any.GetAs(&ll) ) { // NB: Do not use LONG_MAX here. Explicitly using 32-bit - // integer constraint yields more consistent behavior across + // integer constraint yields more consistent behaviour across // builds. if ( ll > wxINT32_MAX || ll < wxINT32_MIN ) *variant = wxLongLong(ll); diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp index 1432300dc6..67a06eda99 100644 --- a/src/common/combocmn.cpp +++ b/src/common/combocmn.cpp @@ -160,7 +160,7 @@ wxCONSTRUCTOR_5( wxComboBox, wxWindow*, Parent, wxWindowID, Id, \ #endif // NB: Let's not be afraid to use wxGTK's wxPopupTransientWindow as a -// 'perfect' popup, as it can succesfully host child controls even in +// 'perfect' popup, as it can successfully host child controls even in // popups that are shown in modal dialogs. #define USE_TRANSIENT_POPUP 1 // Use wxPopupWindowTransient (preferred, if it works properly on platform) @@ -2645,7 +2645,7 @@ void wxComboCtrlBase::OnSetValue(const wxString& value) bool found = true; wxString trueValue = value; - // Conform to wxComboBox behavior: read-only control can only accept + // Conform to wxComboBox behaviour: read-only control can only accept // valid list items and empty string if ( m_popupInterface && HasFlag(wxCB_READONLY) && value.length() ) { diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp index 2e41b29a1c..32fc65a8db 100644 --- a/src/common/dcgraph.cpp +++ b/src/common/dcgraph.cpp @@ -341,7 +341,7 @@ void wxGCDCImpl::DestroyClippingRegion() { m_graphicContext->ResetClip(); // currently the clip eg of a window extends to the area between the scrollbars - // so we must explicitely make sure it only covers the area we want it to draw + // so we must explicitly make sure it only covers the area we want it to draw int width, height ; GetOwner()->GetSize( &width , &height ) ; m_graphicContext->Clip( DeviceToLogicalX(0) , DeviceToLogicalY(0) , DeviceToLogicalXRel(width), DeviceToLogicalYRel(height) ); diff --git a/src/common/docview.cpp b/src/common/docview.cpp index 162a175517..680ff2bde4 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -425,7 +425,7 @@ bool wxDocument::Revert() #if WXWIN_COMPATIBILITY_2_8 bool wxDocument::GetPrintableName(wxString& buf) const { - // this function can not only be overridden by the user code but also + // this function cannot only be overridden by the user code but also // called by it so we need to ensure that we return the same thing as // GetUserReadableName() but we can't call it because this would result in // an infinite recursion, hence we use the helper DoGetUserReadableName() diff --git a/src/common/event.cpp b/src/common/event.cpp index 4a9ade6ccf..8284b8212e 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -959,7 +959,7 @@ void wxEventHashTable::InitHashTable() table = table->baseTable; } - // Lets free some memory. + // Let's free some memory. size_t i; for(i = 0; i < m_size; i++) { diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp index 1eabee0e1a..33b83d88e7 100644 --- a/src/common/fileconf.cpp +++ b/src/common/fileconf.cpp @@ -146,7 +146,7 @@ private: wxString m_strName, // entry name m_strValue; // value - bool m_bImmutable:1, // can be overriden locally? + bool m_bImmutable:1, // can be overridden locally? m_bHasValue:1; // set after first call to SetValue() int m_nLine; // used if m_pLine == NULL only diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 3fe29bbe8b..d7ed0b83fd 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -1345,7 +1345,7 @@ wxString wxFindFirstFile(const wxString& spec, int flags) if ( !gs_dir->IsOpened() ) { - wxLogSysError(_("Can not enumerate files '%s'"), spec); + wxLogSysError(_("Cannot enumerate files '%s'"), spec); return wxEmptyString; } diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index 036066d29f..1bc3151fcb 100644 --- a/src/common/fontcmn.cpp +++ b/src/common/fontcmn.cpp @@ -1020,7 +1020,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s) SetFamily(family); } // NB: the check on the facename is implemented in wxFontBase::SetFaceName - // and not in wxNativeFontInfo::SetFaceName thus we need to explicitely + // and not in wxNativeFontInfo::SetFaceName thus we need to explicitly // call here wxFontEnumerator::IsValidFacename else if ( #if wxUSE_FONTENUM @@ -1039,7 +1039,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s) if ( !face.empty() ) { // NB: the check on the facename is implemented in wxFontBase::SetFaceName - // and not in wxNativeFontInfo::SetFaceName thus we need to explicitely + // and not in wxNativeFontInfo::SetFaceName thus we need to explicitly // call here wxFontEnumerator::IsValidFacename if ( #if wxUSE_FONTENUM diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp index 17d9c5ce04..ae77931ca7 100644 --- a/src/common/ftp.cpp +++ b/src/common/ftp.cpp @@ -686,7 +686,7 @@ public: // when checking the result, the stream will // almost always show an error, even if the file was - // properly transfered, thus, lets just grab the result + // properly transfered, thus, let's just grab the result // we are looking for "226 transfer completed" char code = m_ftp->GetResult(); diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index c0b1939510..5b151d568d 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -43,7 +43,7 @@ // constants // ---------------------------------------------------------------------------- -// image can not have any transparent pixels at all, have only 100% opaque +// image cannot have any transparent pixels at all, have only 100% opaque // and/or 100% transparent pixels in which case a simple mask is enough to // store this information in wxImage or have a real alpha channel in which case // we need to have it in wxImage as well diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 14b2469f3e..575900d041 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -293,7 +293,7 @@ bool wxLocale::DoInit(const wxString& name, if ( m_pszOldLocale == NULL ) { - wxLogError(_("locale '%s' can not be set."), szLocale); + wxLogError(_("locale '%s' cannot be set."), szLocale); } // the short name will be used to look for catalog files as well, diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 77e3b8c34e..9bc6fcc416 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -2093,7 +2093,7 @@ void wxBoxSizer::RecalcSizes() // Check for the degenerated case when we don't have enough space for even // the min sizes of all the items: in this case we really can't do much - // more than to to allocate the min size to as many of fixed size items as + // more than to allocate the min size to as many of fixed size items as // possible (on the assumption that variable size items such as text zones // or list boxes may use scrollbars to show their content even if their // size is less than min size but that fixed size items such as buttons diff --git a/src/common/string.cpp b/src/common/string.cpp index 6cfea4102c..2978dcdca8 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -2008,16 +2008,16 @@ int wxString::DoPrintfUtf8(const char *format, ...) Since EILSEQ and EINVAL are rather common but EOVERFLOW is not and since EILSEQ and EINVAL are specifically defined to mean the error is other than an undersized buffer and no other errno are defined we treat those two - as meaning hard errors and everything else gets the old behavior which + as meaning hard errors and everything else gets the old behaviour which is to keep looping and increasing buffer size until the function succeeds. - In practice it's impossible to determine before compilation which behavior - may be used. The vswprintf function may have vsnprintf-like behavior or - vice-versa. Behavior detected on one release can theoretically change + In practice it's impossible to determine before compilation which behaviour + may be used. The vswprintf function may have vsnprintf-like behaviour or + vice-versa. Behaviour detected on one release can theoretically change with an updated release. Not to mention that configure testing for it would require the test to be run on the host system, not the build system which makes cross compilation difficult. Therefore, we make no assumptions - about behavior and try our best to handle every known case, including the + about behaviour and try our best to handle every known case, including the case where wxVsnprintf returns a negative number and fails to set errno. There is yet one more non-standard implementation and that is our own. @@ -2028,9 +2028,9 @@ int wxString::DoPrintfUtf8(const char *format, ...) at the given buffer size minus 1. It is supposed to do this even if it turns out that the buffer is sized too small. - Darwin (tested on 10.5) follows the C99 behavior exactly. + Darwin (tested on 10.5) follows the C99 behaviour exactly. - Glibc 2.6 almost follows the C99 behavior except vswprintf never sets + Glibc 2.6 almost follows the C99 behaviour except vswprintf never sets errno even when it fails. However, it only seems to ever fail due to an undersized buffer. */ diff --git a/src/common/sysopt.cpp b/src/common/sysopt.cpp index 2f611918dd..8b117011d2 100644 --- a/src/common/sysopt.cpp +++ b/src/common/sysopt.cpp @@ -76,7 +76,7 @@ wxString wxSystemOptions::GetOption(const wxString& name) { val = gs_optionValues[idx]; } - else // not set explicitely + else // not set explicitly { // look in the environment: first for a variable named "wx_appname_name" // which can be set to affect the behaviour or just this application diff --git a/src/common/translation.cpp b/src/common/translation.cpp index 6b54200b85..ae01cce210 100644 --- a/src/common/translation.cpp +++ b/src/common/translation.cpp @@ -904,7 +904,7 @@ bool wxMsgCatalogFile::LoadFile(const wxString& filename, if ( !fileMsg.IsOpened() ) return false; - // get the file size (assume it is less than 4Gb...) + // get the file size (assume it is less than 4GB...) wxFileOffset lenFile = fileMsg.Length(); if ( lenFile == wxInvalidOffset ) return false; diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp index 4282806175..7a5b619a35 100644 --- a/src/common/zipstrm.cpp +++ b/src/common/zipstrm.cpp @@ -1773,7 +1773,7 @@ bool wxZipInputStream::OpenDecompressor(bool raw /*=false*/) return IsOk(); } -// Can be overriden to add support for additional decompression methods +// Can be overridden to add support for additional decompression methods // wxInputStream *wxZipInputStream::OpenDecompressor(wxInputStream& stream) { @@ -2128,7 +2128,7 @@ bool wxZipOutputStream::DoCreate(wxZipEntry *entry, bool raw /*=false*/) return true; } -// Can be overriden to add support for additional compression methods +// Can be overridden to add support for additional compression methods // wxOutputStream *wxZipOutputStream::OpenCompressor( wxOutputStream& stream, diff --git a/src/expat/aclocal.m4 b/src/expat/aclocal.m4 index 9ec879f0b6..e59c18e759 100644 --- a/src/expat/aclocal.m4 +++ b/src/expat/aclocal.m4 @@ -5061,7 +5061,7 @@ EOF # that the semantics of dynamic libraries on AmigaOS, at least up # to version 4, is to share data among multiple programs linked # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use + # behaviour of shared libraries on other platforms, we can't use # them. _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp index 82cb648ad0..227ac07e7a 100644 --- a/src/generic/animateg.cpp +++ b/src/generic/animateg.cpp @@ -504,7 +504,7 @@ void wxAnimationCtrl::IncrementalUpdateBackingStore() case wxANIM_TOPREVIOUS: // this disposal should never be used too often. - // E.g. GIF specification explicitely say to keep the usage of this + // E.g. GIF specification explicitly say to keep the usage of this // disposal limited to the minimum. // In fact it may require a lot of time to restore if (m_currentFrame == 1) @@ -627,7 +627,7 @@ void wxAnimationCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) if ( m_backingStore.IsOk() ) { - // NOTE: we draw the bitmap explicitely ignoring the mask (if any); + // NOTE: we draw the bitmap explicitly ignoring the mask (if any); // i.e. we don't want to combine the backing store with the // possibly wrong preexisting contents of the window! dc.DrawBitmap(m_backingStore, 0, 0, false /* no mask */); diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp index b17a9f38af..ffc71547ad 100644 --- a/src/generic/clrpickerg.cpp +++ b/src/generic/clrpickerg.cpp @@ -83,7 +83,7 @@ void wxGenericColourButton::InitColourData() void wxGenericColourButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev)) { - // update the wxColouData to be shown in the the dialog + // update the wxColouData to be shown in the dialog ms_data.SetColour(m_colour); // create the colour dialog and display it diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp index 894345be6b..a0371ad191 100644 --- a/src/generic/collpaneg.cpp +++ b/src/generic/collpaneg.cpp @@ -168,7 +168,7 @@ void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz) if (this->HasFlag(wxCP_NO_TLW_RESIZE)) { - // the user asked to explicitely handle the resizing itself... + // the user asked to explicitly handle the resizing itself... return; } diff --git a/src/generic/fontpickerg.cpp b/src/generic/fontpickerg.cpp index e78f3588eb..7d1cfb908a 100644 --- a/src/generic/fontpickerg.cpp +++ b/src/generic/fontpickerg.cpp @@ -79,7 +79,7 @@ void wxGenericFontButton::InitFontData() void wxGenericFontButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev)) { - // update the wxFontData to be shown in the the dialog + // update the wxFontData to be shown in the dialog m_data.SetInitialFont(m_selectedFont); // create the font dialog and display it diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 5701bbef22..6a2bf5e506 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -6918,7 +6918,7 @@ void wxGrid::SetCellHighlightPenWidth(int width) m_cellHighlightPenWidth = width; // Just redrawing the cell highlight is not enough since that won't - // make any visible change if the the thickness is getting smaller. + // make any visible change if the thickness is getting smaller. int row = m_currentCellCoords.GetRow(); int col = m_currentCellCoords.GetCol(); if ( row == -1 || col == -1 || GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) @@ -6936,7 +6936,7 @@ void wxGrid::SetCellHighlightROPenWidth(int width) m_cellHighlightROPenWidth = width; // Just redrawing the cell highlight is not enough since that won't - // make any visible change if the the thickness is getting smaller. + // make any visible change if the thickness is getting smaller. int row = m_currentCellCoords.GetRow(); int col = m_currentCellCoords.GetCol(); if ( row == -1 || col == -1 || diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp index 8dddab3540..ee1c9d7bdd 100644 --- a/src/generic/imaglist.cpp +++ b/src/generic/imaglist.cpp @@ -76,7 +76,7 @@ int wxGenericImageList::Add( const wxBitmap &bitmap ) } else { - // Mimic behavior of Windows ImageList_Add that automatically breaks up the added + // Mimic behaviour of Windows ImageList_Add that automatically breaks up the added // bitmap into sub-images of the correct size if (m_width > 0 && bitmap.GetWidth() > m_width && bitmap.GetHeight() >= m_height) { diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 89c08e18c6..0c877f3b0c 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -1046,7 +1046,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) // NB: The code below is not really Mac-specific, but since we are close // to 2.8 release and I don't have time to test on other platforms, I -// defined this only for wxMac. If this behavior is desired on +// defined this only for wxMac. If this behaviour is desired on // other platforms, please go ahead and revise or remove the #ifdef. #ifdef __WXMAC__ if ( !m_owner->IsVirtual() && (item.m_mask & wxLIST_MASK_STATE) && diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index 3cffee36f0..b0c6dead72 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -741,7 +741,7 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode, return false; wxCHECK_MSG( window1 && window2, false, - wxT("can not split with NULL window(s)") ); + wxT("cannot split with NULL window(s)") ); wxCHECK_MSG( window1->GetParent() == this && window2->GetParent() == this, false, wxT("windows in the splitter should have it as parent!") ); diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index 4c24ee5c35..691cd520e1 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -345,7 +345,7 @@ int wxStatusBarGeneric::GetFieldFromPoint(const wxPoint& pt) const if (m_widthsAbs.IsEmpty()) return wxNOT_FOUND; - // NOTE: we explicitely don't take in count the borders since they are only + // NOTE: we explicitly don't take in count the borders since they are only // useful when rendering the status text, not for hit-test computations if (pt.y <= 0 || pt.y >= m_lastClientHeight) diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp index 729daa5011..8e76ca8c23 100644 --- a/src/generic/timer.cpp +++ b/src/generic/timer.cpp @@ -49,7 +49,7 @@ #ifdef __DOS__ // Under DOS the MGL timer has a 24hr period, so consider the 12 hours - // before y to be 'less' and the the 12 hours after 'greater' modulo + // before y to be 'less' and the 12 hours after 'greater' modulo // 24 hours. inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y) { diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index 0e38a10f37..a857c843b9 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -3699,7 +3699,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event ) event.Skip(!GetEventHandler()->ProcessEvent(nevent)); // Consistent with MSW (for now), send the ITEM_MENU *after* - // the RIGHT_CLICK event. TODO: This behavior may change. + // the RIGHT_CLICK event. TODO: This behaviour may change. wxTreeEvent nevent2(wxEVT_COMMAND_TREE_ITEM_MENU, this, item); nevent2.m_pointDrag = CalcScrolledPosition(pt); GetEventHandler()->ProcessEvent(nevent2); diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp index 96fcd3f54d..c1b5a4071a 100644 --- a/src/generic/vscroll.cpp +++ b/src/generic/vscroll.cpp @@ -822,7 +822,7 @@ void wxVarHVScrollHelper::RefreshRowColumn(size_t row, size_t column) h_rect.x += OnGetColumnWidth(n); } - // refresh but specialize the behavior if we have a single target window + // refresh but specialize the behaviour if we have a single target window if ( wxVarVScrollHelper::GetTargetWindow() == wxVarHScrollHelper::GetTargetWindow() ) { v_rect.x = h_rect.x; @@ -889,7 +889,7 @@ void wxVarHVScrollHelper::RefreshRowsColumns(size_t fromRow, size_t toRow, h_rect.width += OnGetColumnWidth(nBetween); } - // refresh but specialize the behavior if we have a single target window + // refresh but specialize the behaviour if we have a single target window if ( wxVarVScrollHelper::GetTargetWindow() == wxVarHScrollHelper::GetTargetWindow() ) { v_rect.x = h_rect.x; diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp index af2cdf6274..8490534ae9 100644 --- a/src/generic/wizard.cpp +++ b/src/generic/wizard.cpp @@ -316,7 +316,7 @@ void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn) mainColumn->Add( m_sizerBmpAndPage, 1, // Vertically stretchable - wxEXPAND // Horizonal stretching, no border + wxEXPAND // Horizontal stretching, no border ); mainColumn->Add(0,5, 0, // No vertical stretching diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp index b2da06fe52..ea4c4ac317 100644 --- a/src/gtk/aboutdlg.cpp +++ b/src/gtk/aboutdlg.cpp @@ -192,7 +192,7 @@ void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* WXUNUSED(parent)) transCredits << translators[n] << wxT('\n'); } } - else // no translators explicitely specified + else // no translators explicitly specified { // maybe we have translator credits in the message catalog? wxString translator = _("translator-credits"); diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index f90decedb1..a4029e23d5 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -86,7 +86,7 @@ static void wx_add_idle_hooks() } } // "size_allocate" hook - // Needed to match the behavior of the old idle system, + // Needed to match the behaviour of the old idle system, // but probably not necessary. { static bool hook_installed; @@ -125,7 +125,7 @@ bool wxApp::DoIdle() #if wxDEBUG_LEVEL // don't generate the idle events while the assert modal dialog is shown, - // this matches the behavior of wxMSW + // this matches the behaviour of wxMSW if (m_isInAssert) return false; #endif @@ -439,7 +439,7 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_) return false; } - // we can not enter threads before gtk_init is done + // we cannot enter threads before gtk_init is done gdk_threads_enter(); #if wxUSE_INTL diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp index 1d7817bcdb..87b4a42488 100644 --- a/src/gtk/collpane.cpp +++ b/src/gtk/collpane.cpp @@ -104,7 +104,7 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object), wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed()); p->HandleWindowEvent(ev); - // the user asked to explicitely handle the resizing itself... + // the user asked to explicitly handle the resizing itself... return; } @@ -272,7 +272,7 @@ void wxCollapsiblePane::OnSize(wxSizeEvent &ev) // is expanded or shrunk, the pane window won't be updated! m_pPane->SetSize(ev.GetSize().x, ev.GetSize().y - m_szCollapsed.y); - // we need to explicitely call m_pPane->Layout() or else it won't correctly relayout + // we need to explicitly call m_pPane->Layout() or else it won't correctly relayout // (even if SetAutoLayout(true) has been called on it!) m_pPane->Layout(); } diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp index ca7eb49da4..2772055c87 100644 --- a/src/gtk/print.cpp +++ b/src/gtk/print.cpp @@ -2213,7 +2213,7 @@ void wxGtkPrinterDCImpl::SetPrintData(const wxPrintData& data) m_printData = data; } -// overriden for wxPrinterDC Impl +// overridden for wxPrinterDC Impl wxRect wxGtkPrinterDCImpl::GetPaperRect() const { diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index 70315318dd..87cb564e8f 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -632,7 +632,7 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in ); } -// Draw the equivallent of a wxComboBox +// Draw the equivalent of a wxComboBox void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) { GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget(); diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 0c05229765..8638aa0331 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -3162,7 +3162,7 @@ void wxWindowGTK::SetFocus() // within its toplevel", i.e. returns true for one widget per TLW, not // globally) returns true immediately after grabbing focus, // GTK_WIDGET_HAS_FOCUS (which returns true only for the one widget that - // has focus at the moment) takes affect only after the window is shown + // has focus at the moment) takes effect only after the window is shown // (if it was hidden at the moment of the call) or at the next event loop // iteration. // diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 5627fbe89a..6c81dc38a4 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -587,7 +587,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) return false; } - // we can not enter threads before gtk_init is done + // we cannot enter threads before gtk_init is done gdk_threads_enter(); if ( !wxAppBase::Initialize(argc, argv) ) diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index 420c567af6..9018d38702 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -100,7 +100,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), if (notebook->m_skipNextPageChangeEvent) { - // this event was programatically generated by ChangeSelection() and thus must + // this event was programmatically generated by ChangeSelection() and thus must // be skipped notebook->m_skipNextPageChangeEvent = false; diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index e1f495e0a0..52640fae19 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -201,9 +201,9 @@ wxCursor wxHtmlCell::GetMouseCursor(wxHtmlWindowInterface *window) const #if WXWIN_COMPATIBILITY_2_6 // NB: Older versions of wx used GetCursor() virtual method in place of // GetMouseCursor(interface). This code ensures that user code that - // overriden GetCursor() continues to work. The trick is that the base + // overridden GetCursor() continues to work. The trick is that the base // wxHtmlCell::GetCursor() method simply returns wxNullCursor, so we - // know that GetCursor() was overriden iff it returns valid cursor. + // know that GetCursor() was overridden iff it returns valid cursor. wxCursor cur = GetCursor(); if (cur.Ok()) return cur; diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 058499e481..1eefb4b3cb 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -1576,7 +1576,7 @@ void wxHtmlWindow::SelectLine(const wxPoint& pos) { // We use following heuristic to find a "line": let the line be all // cells in same container as the cell under mouse cursor that are - // neither completely above nor completely bellow the clicked cell + // neither completely above nor completely below the clicked cell // (i.e. are likely to be words positioned on same line of text). int y1 = cell->GetAbsPos().y; diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp index a62f4ac677..753d2df7f6 100644 --- a/src/mgl/app.cpp +++ b/src/mgl/app.cpp @@ -197,7 +197,7 @@ bool wxApp::OnInitGui() if ( !wxAppBase::OnInitGui() ) return false; - // MGL redirects stdout and stderr to physical console, so lets redirect + // MGL redirects stdout and stderr to physical console, so let's redirect // it to file if WXSTDERR environment variable is set to be able to see // wxLogDebug() output wxString redirect; diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp index 620730bca0..5e89f6b8b8 100644 --- a/src/mgl/evtloop.cpp +++ b/src/mgl/evtloop.cpp @@ -73,9 +73,9 @@ void wxEventLoopImpl::Dispatch() { event_t evt; - // VS: The code bellow is equal to MGL's EVT_halt implementation, with - // two things added: sleeping (busy waiting is stupid, lets make CPU's - // life a bit easier) and timers updating + // VS: The code below is equal to MGL's EVT_halt implementation, with + // two things added: sleeping (busy waiting is stupid, let's make CPU's + // life a bit easier) and timers updating. // EVT_halt(&evt, EVT_EVERYEVT); for (;;) diff --git a/src/mgl/fontmgr.cpp b/src/mgl/fontmgr.cpp index 4098d667af..63449e2739 100644 --- a/src/mgl/fontmgr.cpp +++ b/src/mgl/fontmgr.cpp @@ -94,7 +94,7 @@ wxFontInstance *wxFontFace::GetFontInstance(float ptSize, bool aa) } // Small characters don't look good when antialiased with the algorithm - // that FreeType uses (mere 2x2 supersampling), so lets disable AA + // that FreeType uses (mere 2x2 supersampling), so let's disable AA // completely for small fonts. Bitmap fonts are not antialiased either. if ( ptSize <= gs_antialiasingThreshold || m_fontLib->fontLibType == MGL_BITMAPFONT_LIB ) diff --git a/src/motif/mdi/README b/src/motif/mdi/README index 354b88ddb6..0f449b75f4 100644 --- a/src/motif/mdi/README +++ b/src/motif/mdi/README @@ -5,7 +5,7 @@ INTRODUCTION ============ The Motif Multi-Document Interface (MDI) is a collection of C++ classes -that emulates the behavior of the Multi-Document Interface in Microsoft +that emulates the behaviour of the Multi-Document Interface in Microsoft Windows. The MDI framework allows a user to view multiple documents (windows) constrained to a single parent window. diff --git a/src/motif/mdi/doc/canvas.html b/src/motif/mdi/doc/canvas.html index d18faaf226..cd5a0c8d9b 100644 --- a/src/motif/mdi/doc/canvas.html +++ b/src/motif/mdi/doc/canvas.html @@ -54,7 +54,7 @@ After the documents are created, they must be added to the canvas. The

    -The behavior of adding the same document to the canvas more than once +The behaviour of adding the same document to the canvas more than once is undefined. Documents can be removed from the canvas by using:

    @@ -110,7 +110,7 @@ the location of the document. Please refer to the code (XsMDICanvas.C) for more details.

    -Canvas Behavior: +Canvas Behaviour:

    The XsMDICanvas is implemented as an XmScrolledWindow with an @@ -123,13 +123,13 @@ being clipped as they are moved around. By default, the XmDrawingArea work-window has its XmNresizePolicy set to XmRESIZE_GROW. This will allow the work-area to grow to whatever size necessary, but it will not automatically shrink as windows -are manipulated. If different behavior is desired, the XmNresizePolicy +are manipulated. If different behaviour is desired, the XmNresizePolicy resource on the work-area can be set to XmRESIZE_ANY. This will force the work-window to recompute its size as windows are manipulated, and it will grow and shrink as necessary. However, the XsMDICanvas will still force the work-area to be at-least the size of the clip-window. -

    To change the default behavior, add the following resource: +

    To change the default behaviour, add the following resource:

    <XsMDICanvas name>*canvas.resizePolicy: XmRESIZE_ANY
    diff --git a/src/motif/mdi/doc/mdi.html b/src/motif/mdi/doc/mdi.html index 0052c2da90..f07fe792c2 100644 --- a/src/motif/mdi/doc/mdi.html +++ b/src/motif/mdi/doc/mdi.html @@ -151,7 +151,7 @@ RESOURCES:

    The MDI classes support a number of different X-resources (please refer -the the class manual pages for complete details). In order to get a feel +to the class manual pages for complete details). In order to get a feel for the customization capabilities of the MDI library, try running the test program (MDItest) with the following command-line options: diff --git a/src/motif/mdi/doc/mwindow.html b/src/motif/mdi/doc/mwindow.html index 8ea6cd8c81..61fab7bed6 100644 --- a/src/motif/mdi/doc/mwindow.html +++ b/src/motif/mdi/doc/mwindow.html @@ -228,7 +228,7 @@ corner of the window when it is iconified.

    raiseString
    String used as the "raise" menu item.
    lowerString
    -
    String used as the the "lower" menu item.
    +
    String used as the "lower" menu item.
    closeString
    String used as the "close" menu item.
    menuFont
    diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp index 4a94ff0734..6b34406327 100644 --- a/src/motif/utils.cpp +++ b/src/motif/utils.cpp @@ -370,7 +370,7 @@ void wxAllocColor(Display *d,Colormap cmp,XColor *xc) { if (!XAllocColor(d,cmp,xc)) { - // cout << "wxAllocColor : Warning : Can not allocate color, attempt find nearest !\n"; + // cout << "wxAllocColor : Warning : cannot allocate color, attempt find nearest !\n"; wxAllocNearestColor(d,cmp,xc); } } diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index b999b94f2d..726bccff52 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -410,7 +410,7 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event) } else { - // implement default behavior on click outside of client zone + // implement default behaviour on click outside of client zone event.Skip(); } } diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp index 64c3929328..03d3b3fb50 100644 --- a/src/msw/choice.cpp +++ b/src/msw/choice.cpp @@ -556,7 +556,7 @@ void wxChoice::DoSetSize(int x, int y, // make the control itself of the requested height: notice that this // must be done after changing its size or it has no effect (apparently // the height is reset to default during the control layout) and that it's - // useless to to do it when using the deferred sizing -- in this case it + // useless to do it when using the deferred sizing -- in this case it // will be done from MSWEndDeferWindowPos() #if wxUSE_DEFERRED_SIZING if ( m_pendingSize == wxDefaultSize ) diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp index fa65cd2a21..594610275d 100644 --- a/src/msw/clipbrd.cpp +++ b/src/msw/clipbrd.cpp @@ -98,7 +98,7 @@ bool wxOpenClipboard() } else { - wxLogDebug(wxT("Can not open clipboard without a main window.")); + wxLogDebug(wxT("Cannot open clipboard without a main window.")); return false; } diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp index 672397394b..bb059dc992 100644 --- a/src/msw/dir.cpp +++ b/src/msw/dir.cpp @@ -208,7 +208,7 @@ bool wxDirData::Read(wxString *filename) if ( err != ERROR_FILE_NOT_FOUND && err != ERROR_NO_MORE_FILES ) { - wxLogSysError(err, _("Can not enumerate files in directory '%s'"), + wxLogSysError(err, _("Cannot enumerate files in directory '%s'"), m_dirname.c_str()); } #endif // __WIN32__ diff --git a/src/msw/display.cpp b/src/msw/display.cpp index 6f4f1b84c5..b7abb30192 100644 --- a/src/msw/display.cpp +++ b/src/msw/display.cpp @@ -417,7 +417,7 @@ bool wxDisplayMSW::ChangeMode(const wxVideoMode& mode) // ok { // If we have a top-level, full-screen frame, emulate - // the DirectX behavior and resize it. This makes this + // the DirectX behaviour and resize it. This makes this // API quite a bit easier to use. wxWindow *winTop = wxTheApp->GetTopWindow(); wxFrame *frameTop = wxDynamicCast(winTop, wxFrame); diff --git a/src/msw/fdrepdlg.cpp b/src/msw/fdrepdlg.cpp index ac23bf1d95..3964c6a4bf 100644 --- a/src/msw/fdrepdlg.cpp +++ b/src/msw/fdrepdlg.cpp @@ -217,7 +217,7 @@ wxFindReplaceDialogImpl::FindMessageHandler(wxWindow * WXUNUSED(win), #if wxUSE_UNICODE_MSLU // This is a hack for a MSLU problem: Versions up to 1.0.4011 // of UNICOWS.DLL send the correct UNICODE item after button press - // and a bogus ANSI mode item right after this, so lets ignore + // and a bogus ANSI mode item right after this, so let's ignore // the second bogus message if ( wxUsingUnicowsDll() && s_lastMsgFlags == pFR->Flags ) { diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index 1fb4bc288c..32b87f7817 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -225,7 +225,7 @@ void wxFileDialog::DoCentre(int dir) void wxFileDialog::MSWOnInitDone(WXHWND hDlg) { - // note the the dialog is the parent window: hDlg is a child of it when + // note the dialog is the parent window: hDlg is a child of it when // OFN_EXPLORER is used HWND hFileDlg = ::GetParent((HWND)hDlg); diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 44f8c19f17..6dbb49ea1a 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -1111,7 +1111,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), WXHMENU hMenuParent = parent->m_hMenu; - // activate the the parent menu only when there is no other child + // activate the parent menu only when there is no other child // that has been activated if ( hMenuParent && !hwndAct ) hMenuToSet = hMenuParent; diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp index 97541c9105..300cb6816d 100644 --- a/src/msw/mediactrl_am.cpp +++ b/src/msw/mediactrl_am.cpp @@ -1823,8 +1823,8 @@ void wxAMMediaBackend::FinishLoad() bool wxAMMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags) { // Note that IMediaPlayer doesn't have a statusbar by - // default but IActiveMovie does - so lets try to keep - // the interface consistant + // default but IActiveMovie does - so let's try to keep + // the interface consistent. if(!flags) { GetAM()->put_Enabled(VARIANT_FALSE); diff --git a/src/msw/mediactrl_qt.cpp b/src/msw/mediactrl_qt.cpp index 1d3bd398cc..d84fa5f44b 100644 --- a/src/msw/mediactrl_qt.cpp +++ b/src/msw/mediactrl_qt.cpp @@ -1162,7 +1162,7 @@ bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags) //--------------------------------------------------------------------------- // wxQTMediaBackend::MCFilterProc (static) // -// Callback for when the movie controller recieves a message +// Callback for when the movie controller receives a message //--------------------------------------------------------------------------- Boolean wxQTMediaBackend::MCFilterProc(MovieController WXUNUSED(theController), short action, diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp index 27c1e7e82b..b8198a80e0 100644 --- a/src/msw/regconf.cpp +++ b/src/msw/regconf.cpp @@ -79,7 +79,7 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName, bool bDoUseGlobal = (style & wxCONFIG_USE_GLOBAL_FILE) != 0; // the convention is to put the programs keys under \ - // (but it can be overriden by specifying the pathes explicitly in strLocal + // (but it can be overridden by specifying the pathes explicitly in strLocal // and/or strGlobal) if ( strLocal.empty() || (strGlobal.empty() && bDoUseGlobal) ) { @@ -563,7 +563,7 @@ bool wxRegConfig::DoReadString(const wxString& key, wxString *pStr) const bool bQueryGlobal = true; // if immutable key exists in global key we must check that it's not - // overriden by the local key with the same name + // overridden by the local key with the same name if ( IsImmutable(path.Name()) ) { if ( TryGetValue(m_keyGlobal, path.Name(), *pStr) ) { if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) { @@ -600,7 +600,7 @@ bool wxRegConfig::DoReadLong(const wxString& key, long *plResult) const bool bQueryGlobal = true; // if immutable key exists in global key we must check that it's not - // overriden by the local key with the same name + // overridden by the local key with the same name if ( IsImmutable(path.Name()) ) { if ( TryGetValue(m_keyGlobal, path.Name(), plResult) ) { if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) { @@ -634,7 +634,7 @@ bool wxRegConfig::DoReadBinary(const wxString& key, wxMemoryBuffer *buf) const bool bQueryGlobal = true; // if immutable key exists in global key we must check that it's not - // overriden by the local key with the same name + // overridden by the local key with the same name if ( IsImmutable(path.Name()) ) { if ( TryGetValue(m_keyGlobal, path.Name(), *buf) ) { if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) { diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp index 399a2837b5..58bb6013ba 100644 --- a/src/msw/thread.cpp +++ b/src/msw/thread.cpp @@ -546,7 +546,7 @@ THREAD_RETVAL wxThreadInternal::DoThreadStart(wxThread *thread) // store the thread object in the TLS if ( !::TlsSetValue(gs_tlsThisThread, thread) ) { - wxLogSysError(_("Can not start thread: error writing TLS.")); + wxLogSysError(_("Cannot start thread: error writing TLS.")); return THREAD_ERROR_EXIT; } @@ -806,7 +806,7 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs, { case 0xFFFFFFFF: // error - wxLogSysError(_("Can not wait for thread termination")); + wxLogSysError(_("Cannot wait for thread termination")); Kill(); return wxTHREAD_KILLED; @@ -883,7 +883,7 @@ bool wxThreadInternal::Suspend() DWORD nSuspendCount = ::SuspendThread(m_hThread); if ( nSuspendCount == (DWORD)-1 ) { - wxLogSysError(_("Can not suspend thread %x"), m_hThread); + wxLogSysError(_("Cannot suspend thread %x"), m_hThread); return false; } @@ -898,7 +898,7 @@ bool wxThreadInternal::Resume() DWORD nSuspendCount = ::ResumeThread(m_hThread); if ( nSuspendCount == (DWORD)-1 ) { - wxLogSysError(_("Can not resume thread %x"), m_hThread); + wxLogSysError(_("Cannot resume thread %x"), m_hThread); return false; } @@ -1264,7 +1264,7 @@ bool wxThreadModule::OnInit() ::TlsFree(gs_tlsThisThread); gs_tlsThisThread = 0xFFFFFFFF; - wxLogSysError(_("Thread module initialization failed: can not store value in thread local storage")); + wxLogSysError(_("Thread module initialization failed: cannot store value in thread local storage")); return false; } diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp index 38067f00d0..7e17a1828d 100644 --- a/src/msw/toolbar.cpp +++ b/src/msw/toolbar.cpp @@ -1296,7 +1296,7 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_) // Without the two lines of code below, if the toolbar was repainted during // OnLeftClick(), then it could end up without the tool bitmap temporarily // (see http://lists.nongnu.org/archive/html/lmi/2008-10/msg00014.html). - // The Update() call bellow ensures that this won't happen, by repainting + // The Update() call below ensures that this won't happen, by repainting // invalidated areas of the toolbar immediately. // // To complicate matters, the tool would be drawn in depressed state (this @@ -1323,7 +1323,7 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_) ::SendMessage(GetHwnd(), TB_SETSTATE, id, MAKELONG(state, 0)); // OnLeftClick() can veto the button state change - for buttons which - // may be toggled only, of couse + // may be toggled only, of course. if ( !allowLeftClick && tool->CanBeToggled() ) { // revert back diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index 326e154469..d7aebb80d6 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -77,7 +77,7 @@ typedef struct tagNMTVITEMCHANGE // The vista tree control includes some new code that originally broke the // multi-selection tree, causing seemingly spurious item selection state changes // during Shift or Ctrl-click item selection. (To witness the original broken -// behavior, simply make IsLocked() below always return false). This problem was +// behaviour, simply make IsLocked() below always return false). This problem was // solved by using the following class to 'unlock' an item's selection state. class TreeItemUnlocker @@ -3371,7 +3371,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) // the wrong items are deselected. // Fortunately, Vista provides a new notification, TVN_ITEMCHANGING - // that can be used to regulate this incorrect behavior. The + // that can be used to regulate this incorrect behaviour. The // following messages will allow only the unlocked item's selection // state to change diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index e7445c3fcb..a002517d25 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -303,7 +303,7 @@ bool wxGetUserName(wxChar *buf, int maxSize) // Get the computer name of a DC for the domain. if ( NetGetDCName( NULL, wszDomain, &ComputerName ) != NERR_Success ) { - wxLogError(wxT("Can not find domain controller")); + wxLogError(wxT("Cannot find domain controller")); goto error; } diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp index 4850dd6638..90da7a1ebd 100644 --- a/src/msw/wince/tbarwce.cpp +++ b/src/msw/wince/tbarwce.cpp @@ -525,7 +525,7 @@ bool wxToolMenuBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_) if ( !tool->CanBeToggled() || tool->GetKind() != wxITEM_RADIO || toggled ) { // OnLeftClick() can veto the button state change - for buttons which - // may be toggled only, of couse + // may be toggled only, of course. if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() ) { // revert back diff --git a/src/msw/wince/time.cpp b/src/msw/wince/time.cpp index edeab3e935..dffe23a045 100644 --- a/src/msw/wince/time.cpp +++ b/src/msw/wince/time.cpp @@ -612,7 +612,7 @@ static struct tm * __cdecl common_localtime(const time_t *t, BOOL bLocal) res->tm_wday = SystemTime.wDayOfWeek; res->tm_yday = __mon_yday[iLeap][res->tm_mon] + SystemTime.wDay - 1; // localtime returns year-day aligned to zero - // if localtime behavior and daylight saving + // if localtime behaviour and daylight saving if (bLocal && pTz.DaylightBias != 0) res->tm_isdst = 1; else diff --git a/src/os2/clipbrd.cpp b/src/os2/clipbrd.cpp index 523ee72294..3803c01f09 100644 --- a/src/os2/clipbrd.cpp +++ b/src/os2/clipbrd.cpp @@ -68,7 +68,7 @@ bool wxOpenClipboard() } else { - wxLogDebug(wxT("Can not open clipboard without a main window.")); + wxLogDebug(wxT("Cannot open clipboard without a main window.")); return false; } diff --git a/src/os2/font.cpp b/src/os2/font.cpp index 8d046f78b9..37f3bc3bfb 100644 --- a/src/os2/font.cpp +++ b/src/os2/font.cpp @@ -925,7 +925,7 @@ wxFont::~wxFont() // ---------------------------------------------------------------------------- // real implementation // Boris' Kovalenko comments: -// Because OS/2 fonts are associated with PS we can not create the font +// Because OS/2 fonts are associated with PS we cannot create the font // here, but we may check that font definition is true // ---------------------------------------------------------------------------- diff --git a/src/os2/listctrl.cpp b/src/os2/listctrl.cpp index fac8777375..50283974a6 100644 --- a/src/os2/listctrl.cpp +++ b/src/os2/listctrl.cpp @@ -106,7 +106,7 @@ typedef struct _MYRECORD // Problem: // The MSW version had problems with SetTextColour() et al as the // CListItemAttr's were stored keyed on the item index. If a item was -// inserted anywhere but the end of the list the the text attributes +// inserted anywhere but the end of the list the text attributes // (colour etc) for the following items were out of sync. // // Solution: diff --git a/src/os2/thread.cpp b/src/os2/thread.cpp index 2dbd226855..d1ee5dc364 100644 --- a/src/os2/thread.cpp +++ b/src/os2/thread.cpp @@ -114,7 +114,7 @@ wxMutexInternal::wxMutexInternal(wxMutexType WXUNUSED(eMutexType)) APIRET ulrc = ::DosCreateMutexSem(NULL, &m_vMutex, 0L, FALSE); if (ulrc != 0) { - wxLogSysError(_("Can not create mutex.")); + wxLogSysError(_("Cannot create mutex.")); m_vMutex = NULL; } } @@ -511,7 +511,7 @@ bool wxThreadInternal::Suspend() if (ulrc != 0) { - wxLogSysError(_("Can not suspend thread %lu"), m_hThread); + wxLogSysError(_("Cannot suspend thread %lu"), m_hThread); return false; } m_eState = STATE_PAUSED; @@ -525,7 +525,7 @@ bool wxThreadInternal::Resume() if (ulrc != 0) { - wxLogSysError(_("Can not resume thread %lu"), m_hThread); + wxLogSysError(_("Cannot resume thread %lu"), m_hThread); return false; } diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp index 7867f9f5ae..da30664452 100644 --- a/src/osx/button_osx.cpp +++ b/src/osx/button_osx.cpp @@ -211,7 +211,7 @@ bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxStrin SetPeer(wxWidgetImpl::CreateDisclosureTriangle(this, parent, id, label, pos, size, style, GetExtraStyle() )); MacPostControlCreate( pos, size ); - // passing the text in the param doesn't seem to work, so lets do it again + // passing the text in the param doesn't seem to work, so let's do it again SetLabel( label ); return true; diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp index a981920486..48b992758b 100644 --- a/src/osx/carbon/dataview.cpp +++ b/src/osx/carbon/dataview.cpp @@ -854,7 +854,7 @@ bool wxMacDataViewDataBrowserListViewControl::DeleteColumn(wxDataViewColumn* col void wxMacDataViewDataBrowserListViewControl::DoSetExpanderColumn(wxDataViewColumn const* columnPtr) { - SetDisclosureColumn(columnPtr->GetNativeData()->GetPropertyID(),false); // second parameter explicitely passed to ensure that arrow is centered + SetDisclosureColumn(columnPtr->GetNativeData()->GetPropertyID(),false); // second parameter explicitly passed to ensure that arrow is centered } wxDataViewColumn* wxMacDataViewDataBrowserListViewControl::GetColumn(unsigned int pos) const @@ -2489,7 +2489,7 @@ wxDataViewColumn::~wxDataViewColumn() int wxDataViewColumn::GetWidth() const { - // FIXME: This returns the last programatically set width and will not work if + // FIXME: This returns the last programmatically set width and will not work if // the user changes the column's width by dragging it with the mouse. return m_width; } diff --git a/src/osx/carbon/glcanvas.cpp b/src/osx/carbon/glcanvas.cpp index d281274cda..9d6e009241 100644 --- a/src/osx/carbon/glcanvas.cpp +++ b/src/osx/carbon/glcanvas.cpp @@ -311,7 +311,7 @@ that previously allocated surface is associated with the context (e.g., no new surface is created) and the subsequent call to aglSetDrawable will attach that surface. This allows multiple contexts to be attached to a single surface. Using the default buffer name zero, returns to one surface per -context behavior. +context behaviour. */ /* diff --git a/src/osx/carbon/listbox.cpp b/src/osx/carbon/listbox.cpp index 5baf503d8b..bc09cb8df0 100644 --- a/src/osx/carbon/listbox.cpp +++ b/src/osx/carbon/listbox.cpp @@ -140,7 +140,7 @@ int wxMacDataBrowserListControl::DoListHitTest(const wxPoint& inpoint) const // index(bounds) greater then key(point) high = mid - 1; else - // index(bounds) less then key(point) + // index(bounds) less than key(point) low = mid + 1; } } diff --git a/src/osx/carbon/mediactrl.cpp b/src/osx/carbon/mediactrl.cpp index ba2e5831e5..c3f3c4ec68 100644 --- a/src/osx/carbon/mediactrl.cpp +++ b/src/osx/carbon/mediactrl.cpp @@ -1158,7 +1158,7 @@ pascal void wxQTMediaBackend::PPRMProc( //--------------------------------------------------------------------------- // wxQTMediaBackend::MCFilterProc (static) // -// Callback for when the movie controller recieves a message +// Callback for when the movie controller receives a message //--------------------------------------------------------------------------- pascal Boolean wxQTMediaBackend::MCFilterProc( MovieController WXUNUSED(theController), diff --git a/src/osx/carbon/nonownedwnd.cpp b/src/osx/carbon/nonownedwnd.cpp index 909e6a3ad1..cdc3249f0d 100644 --- a/src/osx/carbon/nonownedwnd.cpp +++ b/src/osx/carbon/nonownedwnd.cpp @@ -237,12 +237,12 @@ void wxNonOwnedWindowCarbonImpl::MacSetUnifiedAppearance( bool set ) set ? kWindowNoAttributes : kWindowUnifiedTitleAndToolbarAttribute) ; // For some reason, Tiger uses white as the background color for this appearance, - // while most apps using it use the typical striped background. Restore that behavior + // while most apps using it use the typical striped background. Restore that behaviour // for wx. // TODO: Determine if we need this on Leopard as well. (should be harmless either way, // though) // since when creating the peering is not yet completely set-up we call both setters - // explicitely + // explicitly m_wxPeer->SetBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ) ; SetBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ) ; } diff --git a/src/osx/core/hidjoystick.cpp b/src/osx/core/hidjoystick.cpp index ed6ccabde4..d1563b650c 100644 --- a/src/osx/core/hidjoystick.cpp +++ b/src/osx/core/hidjoystick.cpp @@ -778,7 +778,7 @@ void* wxJoystickThread::Entry() //--------------------------------------------------------------------------- // wxJoystickThread::HIDCallback (static) // -// Callback for the native HID device when it recieves input. +// Callback for the native HID device when it receives input. // // This is where the REAL dirty work gets done. // diff --git a/src/osx/core/sockosx.cpp b/src/osx/core/sockosx.cpp index cf1da2c7f8..847b8ac12d 100644 --- a/src/osx/core/sockosx.cpp +++ b/src/osx/core/sockosx.cpp @@ -141,7 +141,7 @@ private: // KH: If data is non-NULL, the connect failed, do not call Detected_Write, // which will only end up creating a spurious connect event because the // call to getsocketopt SO_ERROR inexplicably returns no error. - // The change in behavior cannot be traced to any particular commit or + // The change in behaviour cannot be traced to any particular commit or // timeframe so I'm not sure what to think, but after so many hours, // this seems to address the issue and it's time to move on. if (data == NULL) diff --git a/src/osx/imaglist.cpp b/src/osx/imaglist.cpp index 0a5cc0c742..e2191ca179 100644 --- a/src/osx/imaglist.cpp +++ b/src/osx/imaglist.cpp @@ -79,7 +79,7 @@ int wxImageList::Add( const wxBitmap &bitmap ) wxT("invalid bitmap size in wxImageList: this might work ") wxT("on this platform but definitely won't under Windows.") ); - // Mimic behavior of Windows ImageList_Add that automatically breaks up the added + // Mimic behaviour of Windows ImageList_Add that automatically breaks up the added // bitmap into sub-images of the correct size if (m_width > 0 && bitmap.GetWidth() > m_width && bitmap.GetHeight() >= m_height) { diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp index 4d10897053..0ca85a9877 100644 --- a/src/propgrid/editors.cpp +++ b/src/propgrid/editors.cpp @@ -149,7 +149,7 @@ // Number added to image width for SetCustomPaintWidth #define ODCB_CUST_PAINT_MARGIN 6 -// Milliseconds to wait for two mouse-ups after focus inorder +// Milliseconds to wait for two mouse-ups after focus in order // to trigger a double-click. #define DOUBLE_CLICK_CONVERSION_TRESHOLD 500 diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index dba68bde37..2b2877276d 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -4828,7 +4828,7 @@ bool wxPropertyGrid::HandleMouseClick( int x, unsigned int y, wxMouseEvent &even } // Do not Skip() the event after selection has been made. - // Otherwise default event handling behavior kicks in + // Otherwise default event handling behaviour kicks in // and may revert focus back to the main canvas. res = true; } diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp index ec33107255..6cda98c1a5 100644 --- a/src/propgrid/propgridpagestate.cpp +++ b/src/propgrid/propgridpagestate.cpp @@ -1626,7 +1626,7 @@ bool wxPropertyGridPageState::PrepareToAddItem( wxPGProperty* property, { wxPropertyGrid* propGrid = m_pPropGrid; - // This will allow better behavior. + // This will allow better behaviour. if ( scheduledParent == m_properties ) scheduledParent = NULL; @@ -1722,7 +1722,7 @@ wxPGProperty* wxPropertyGridPageState::DoInsert( wxPGProperty* parent, int index bool res = PrepareToAddItem( property, (wxPropertyCategory*)parent ); - // PrepareToAddItem() may just decide to use use current category + // PrepareToAddItem() may just decide to use current category // instead of adding new one. if ( !res ) return m_currentCategory; diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp index 58f5ab5d41..ca1231db4d 100644 --- a/src/stc/stc.cpp +++ b/src/stc/stc.cpp @@ -1964,7 +1964,7 @@ void wxStyledTextCtrl::SetWrapVisualFlags(int wrapVisualFlags) SendMsg(2460, wrapVisualFlags, 0); } -// Retrive the display mode of visual flags for wrapped lines. +// Retrieve the display mode of visual flags for wrapped lines. int wxStyledTextCtrl::GetWrapVisualFlags() const { return SendMsg(2461, 0, 0); @@ -1976,7 +1976,7 @@ void wxStyledTextCtrl::SetWrapVisualFlagsLocation(int wrapVisualFlagsLocation) SendMsg(2462, wrapVisualFlagsLocation, 0); } -// Retrive the location of visual flags for wrapped lines. +// Retrieve the location of visual flags for wrapped lines. int wxStyledTextCtrl::GetWrapVisualFlagsLocation() const { return SendMsg(2463, 0, 0); @@ -1988,7 +1988,7 @@ void wxStyledTextCtrl::SetWrapStartIndent(int indent) SendMsg(2464, indent, 0); } -// Retrive the start indent for wrapped lines. +// Retrieve the start indent for wrapped lines. int wxStyledTextCtrl::GetWrapStartIndent() const { return SendMsg(2465, 0, 0); diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in index 12d998ada8..73fa5603c9 100644 --- a/src/stc/stc.h.in +++ b/src/stc/stc.h.in @@ -240,7 +240,7 @@ public: - // The following methods are nearly equivallent to their similarly named + // The following methods are nearly equivalent to their similarly named // cousins above. The difference is that these methods bypass wxString // and always use a char* even if used in a unicode build of wxWidgets. // In that case the character data will be utf-8 encoded since that is diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp index d738b49f7c..95df6afad4 100644 --- a/src/univ/combobox.cpp +++ b/src/univ/combobox.cpp @@ -409,7 +409,7 @@ void wxComboBox::SetSelection(int n) int wxComboBox::GetSelection() const { -#if 1 // FIXME:: What is the correct behavior? +#if 1 // FIXME:: What is the correct behaviour? // if the current value isn't one of the listbox strings, return -1 return GetLBox()->GetSelection(); #else diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp index fa01d86848..c32f5c62c9 100644 --- a/src/x11/utils.cpp +++ b/src/x11/utils.cpp @@ -365,7 +365,7 @@ void wxAllocColor(Display *d,Colormap cmp,XColor *xc) { if (!XAllocColor(d,cmp,xc)) { - // cout << "wxAllocColor : Warning : Can not allocate color, attempt find nearest !\n"; + // cout << "wxAllocColor : Warning : Cannot allocate color, attempt find nearest !\n"; wxAllocNearestColor(d,cmp,xc); } } diff --git a/tests/benchmarks/htmlparser/htmlpars.h b/tests/benchmarks/htmlparser/htmlpars.h index db6637814a..728481ed53 100644 --- a/tests/benchmarks/htmlparser/htmlpars.h +++ b/tests/benchmarks/htmlparser/htmlpars.h @@ -136,15 +136,15 @@ protected: wx28HtmlTagsCache *cache); // Adds text to the output. - // This is called from Parse() and must be overriden in derived classes. + // This is called from Parse() and must be overridden in derived classes. // txt is not guaranteed to be only one word. It is largest continuous part of text // (= not broken by tags) // NOTE : using char* because of speed improvements virtual void AddText(const wxChar* txt) = 0; // Adds tag and proceeds it. Parse() may (and usually is) called from this method. - // This is called from Parse() and may be overriden. - // Default behavior is that it looks for proper handler in m_Handlers. The tag is + // This is called from Parse() and may be overridden. + // Default behaviour is that it looks for proper handler in m_Handlers. The tag is // ignored if no hander is found. // Derived class is *responsible* for filling in m_Handlers table. virtual void AddTag(const wx28HtmlTag& tag); diff --git a/tests/fswatcher/fswatchertest.cpp b/tests/fswatcher/fswatchertest.cpp index bc7ff966bf..5021acd9f2 100644 --- a/tests/fswatcher/fswatchertest.cpp +++ b/tests/fswatcher/fswatchertest.cpp @@ -295,7 +295,7 @@ public: // did we receive event already? if (!tested) { - // well, lets wait a bit more + // well, let's wait a bit more wxSleep(WAIT_DURATION); } diff --git a/tests/streams/bstream.h b/tests/streams/bstream.h index 16548b626a..3a0fc092a4 100644 --- a/tests/streams/bstream.h +++ b/tests/streams/bstream.h @@ -154,7 +154,7 @@ protected: // Check EOF stream state. CPPUNIT_ASSERT_MESSAGE("EOF is not EOF?", stream_in.Eof()); - // Ok we found the end, lets see if we can go past it. + // Ok we found the end, let's see if we can go past it. for (size_t i = 0; i < 100; i++) (void)stream_in.GetC(); diff --git a/utils/ifacecheck/README.txt b/utils/ifacecheck/README.txt index 6630172816..8b676b2cdb 100644 --- a/utils/ifacecheck/README.txt +++ b/utils/ifacecheck/README.txt @@ -13,7 +13,7 @@ (see http://www.gccxml.org) and of the Doxygen utility (see http://www.doxygen.org) to do the comparison. - It's explicitely designed for wxWidgets documentation needs and is probably of little + It's explicitly designed for wxWidgets documentation needs and is probably of little use for anything else than wxWidgets docs reviewing. diff --git a/utils/ifacecheck/src/xmlparser.cpp b/utils/ifacecheck/src/xmlparser.cpp index 350d2f0986..86247d1122 100644 --- a/utils/ifacecheck/src/xmlparser.cpp +++ b/utils/ifacecheck/src/xmlparser.cpp @@ -760,7 +760,7 @@ bool getID(unsigned long *id, const wxString& str) } // utility specialized to parse efficiently the gccXML list of IDs which occur -// in nodes like ones... i.e. numeric values separed by " _" token +// in nodes like ones... i.e. numeric values separated by " _" token bool getMemberIDs(wxClassMemberIdHashMap* map, wxClass* p, const wxString& str) { const wxStringCharType * const start = str.wx_str(); @@ -1280,7 +1280,7 @@ bool wxXmlGccInterface::ParseMethod(const wxXmlNode *p, // NOTE: gccxml is smart enough to mark as virtual those functions // which are declared virtual in base classes but don't have - // the "virtual" keyword explicitely indicated in the derived + // the "virtual" keyword explicitly indicated in the derived // classes... so we don't need any further logic for virtuals m.SetVirtual(p->GetAttribute("virtual") == "1"); @@ -1686,7 +1686,7 @@ bool wxXmlDoxygenInterface::ParseMethod(const wxXmlNode* p, wxMethod& m, wxStrin // NOTE: Doxygen is smart enough to mark as virtual those functions // which are declared virtual in base classes but don't have - // the "virtual" keyword explicitely indicated in the derived + // the "virtual" keyword explicitly indicated in the derived // classes... so we don't need any further logic for virtuals m.SetVirtual(p->GetAttribute("virt")=="virtual"); diff --git a/wx-config.in b/wx-config.in index 28e9fa4c0c..d1dd47920b 100755 --- a/wx-config.in +++ b/wx-config.in @@ -251,7 +251,7 @@ check_yesno_option() # With just a little more complexity here we could have shortest # unique string matching for options, but that is probably overkill -# today, so lets just get the job done. +# today, so let's just get the job done. # # The important thing now then is that we simply read all input from # the user and don't try to act prematurely on partial information. @@ -357,7 +357,7 @@ fi -# Everything came in as a legal argument then, lets put some of +# Everything came in as a legal argument then, let's put some of # the pieces together with a little self knowledge to see what # we should do next. # -------------------------------------------------------------- @@ -560,7 +560,7 @@ not() { if "$@"; then false; else true; fi; } # and its downhill fast from here if we have to ride that boat. # Early pruning still gets that down to under half a second (up from about # .25), so we have some breathing space yet before a different search method -# will be called for, but lets not squander it. +# will be called for, but let's not squander it. do_find_best_delegate() { ( @@ -796,7 +796,7 @@ fi if not user_mask_fits "$this_config" ; then - # No? Then lets see if it knows anybody who can. + # No? Then let's see if it knows anybody who can. # But first, just be sure someone hasn't typo'd us into a loop. # In present day wx, correct delegation should never need more # than one hop so this is trivial to detect. -- 2.45.2