Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed various typos.

Browse Source 
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
This commit is contained in:
Dimitri Schoolwerth
2011-03-22 14:17:38 +00:00
parent 57ab6f2314
commit 4c51a665c6
265 changed files with 817 additions and 807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acinclude.m4
View File

@@ -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)

2
build/bakefiles/common.bkl
View File

@@ -187,7 +187,7 @@
$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(WXDLLFLAG)$(CFG)
</set>
<!-- NB: this is make_var so that it can be overriden on command line
<!-- NB: this is make_var so that it can be overridden on command line
like this: nmake -f makefile.vc COMPILER_PREFIX=vc6 -->
<set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>

4
build/bakefiles/config.bkl
View File

@@ -388,7 +388,7 @@ to run the tests, include CppUnit library here.
<set var="TOP_SRCDIR">$(top_srcdir)/</set>
<set var="RUNTIME_LIBS">dynamic</set>
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
<set var="WXTOPDIR"/> <!-- to be overridden on bakefile cmd line -->
<option name="WITH_PLUGIN_SDL">
<values>0,1</values>
@@ -413,7 +413,7 @@ it if SHARED=1 unless you know what you are doing.
</description>
</option>
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
<set var="WXTOPDIR"/> <!-- to be overridden on bakefile cmd line -->
<set var="TOOLKIT" overwrite="0">
<if cond="FORMAT=='msevc4prj'">WINCE</if>

4
build/bakefiles/wxpresets/presets/wx.bkl
View File

@@ -391,7 +391,7 @@
<!-- Sets as output folder for the current target a directory
called "$(value)/$(COMPILER_PREFIX)_lib|dll", just like wxWidgets does.
This makes it possible to keep separed the libraries/exes compiled with
This makes it possible to keep separated the libraries/exes compiled with
different compilers and with a different value for WX_SHARED.
-->
<define-tag name="wxlike-dirname" rules="lib,dll,exe,module">
@@ -472,7 +472,7 @@
<!-- -->
<!-- Sets the BUILDDIR variable using the same rules used by wxWidgets itself.
This makes it possible to keep separed the object files compiled with
This makes it possible to keep separated the object files compiled with
different configuration settings.
-->
<define-global-tag name="set-wxlike-builddir">

8
configure vendored
View File

@@ -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

4
configure.in
View File

@@ -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

10
docs/changes.txt
View File

@@ -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):

4
docs/cocoa/coding_patterns.txt
View File

@@ -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()

4
docs/doxygen/mainpages/utilities.h
View File

@@ -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.

2
docs/doxygen/overviews/archive.h
View File

@@ -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()

2
docs/doxygen/overviews/customwidgets.h
View File

@@ -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

16
docs/doxygen/overviews/propgrid.h
View File

@@ -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. <b>However, be sure to call it after
the sizer setup and SetSize calls!</b> (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

2
docs/doxygen/overviews/referencenotes.h
View File

@@ -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.

2
docs/doxygen/overviews/thread.h
View File

@@ -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.
*/

2
docs/doxygen/overviews/windowsizing.h
View File

@@ -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.

2
docs/doxygen/overviews/xrc_format.h
View File

@@ -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

2
docs/os2/install.txt
View File

@@ -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

2
docs/publicity/WoWoW30.html
View File

@@ -250,7 +250,7 @@ and may thus be the most important changes from a user's perspective
<LI><P ALIGN=JUSTIFY>Added a new sizer which can wrap across
multiple lines. See <A HREF="http://docs.wxwidgets.org/trunk/classwx_wrap_sizer.html">wxWrapSizer</A>.</P>
<LI><P ALIGN=JUSTIFY>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
<A HREF="http://docs.wxwidgets.org/trunk/classwx_g_l_canvas.html">wxGLCanvas</A>.</P>
<LI><P ALIGN=JUSTIFY>Added wxNativeContainerWindow in order to
construct a wxTopLevelWindow from a native window handle (MSW and

2
docs/tech/tn0003.txt
View File

@@ -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.:

2
include/wx/accel.h
View File

@@ -116,7 +116,7 @@ public:
// returns a wxString for the this accelerator.
// this function formats it using the <flags>-<keycode> format
// where <flags> maybe a hyphen-separed list of "shift|alt|ctrl"
// where <flags> maybe a hyphen-separated list of "shift|alt|ctrl"
wxString ToString() const;
// returns true if the given string correctly initialized this object

2
include/wx/caret.h
View File

@@ -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)
{

4
include/wx/chkconf.h
View File

@@ -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

2
include/wx/cocoa/NSApplication.h
View File

@@ -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.

4
include/wx/cocoa/objc/objc_uniquifying.h
View File

@@ -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<ObjcClass>::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<ObjcClass>::GetCompiledClass on this platform"

2
include/wx/cocoa/private/scrollview.h
View File

@@ -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.

2
include/wx/cocoa/radiobox.h
View File

@@ -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);

4
include/wx/combo.h
View File

@@ -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)

2
include/wx/datetime.h
View File

@@ -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

2
include/wx/debug.h
View File

@@ -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 ) \

4
include/wx/dfb/nonownedwnd.h
View File

@@ -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_)) {}

4
include/wx/docview.h
View File

@@ -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);

2
include/wx/gauge.h
View File

@@ -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:

2
include/wx/gtk/gnome/gprint.h
View File

@@ -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;

2
include/wx/gtk/print.h
View File

@@ -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;

2
include/wx/gtk1/app.h
View File

@@ -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*

2
include/wx/gtk1/notebook.h
View File

@@ -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:

2
include/wx/gtk1/window.h
View File

@@ -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)

6
include/wx/html/htmlpars.h
View File

@@ -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);

4
include/wx/html/htmlwin.h
View File

@@ -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);

2
include/wx/mediactrl.h
View File

@@ -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,

2
include/wx/msw/gauge.h
View File

@@ -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);

2
include/wx/msw/registry.h
View File

@@ -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);

2
include/wx/msw/statline.h
View File

@@ -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

2
include/wx/os2/statbmp.h
View File

@@ -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

2
include/wx/os2/statbox.h
View File

@@ -50,7 +50,7 @@ public:
);
//
// overriden base class virtuals
// overridden base class virtuals
//
inline virtual bool AcceptsFocus(void) const { return FALSE; }

2
include/wx/os2/statline.h
View File

@@ -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;}

2
include/wx/os2/stattext.h
View File

@@ -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; }

2
include/wx/osx/carbon/statbmp.h
View File

@@ -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:

2
include/wx/osx/core/cfdataref.h
View File

@@ -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

6
include/wx/osx/core/cfref.h
View File

@@ -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<refType> static_cfref_cast(const wxCFRef<otherRefType> &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 <class T>
inline void CFRelease(const wxCFRef<T*> & 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.

2
include/wx/osx/core/dataview.h
View File

@@ -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
// ---------------------------------------------------------

2
include/wx/osx/window.h
View File

@@ -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 );

2
include/wx/palmos/gauge.h
View File

@@ -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);

2
include/wx/palmos/statbox.h
View File

@@ -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:

2
include/wx/palmos/statline.h
View File

@@ -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:

2
include/wx/propgrid/editors.h
View File

@@ -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,

2
include/wx/propgrid/manager.h
View File

@@ -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.

24
include/wx/propgrid/property.h
View File

@@ -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,
@@ -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 )

26
include/wx/propgrid/propgrid.h
View File

@@ -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.

2
include/wx/propgrid/propgridiface.h
View File

@@ -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.
*/

4
include/wx/propgrid/propgridpagestate.h
View File

@@ -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,

2
include/wx/propgrid/props.h
View File

@@ -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.
<b>Note:</b> When changing "choices" (ie. flag labels) of wxFlagsProperty,
you will need to use SetPropertyChoices - otherwise they will not get

2
include/wx/protocol/ftp.h
View File

@@ -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

2
include/wx/statbmp.h
View File

@@ -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; }

2
include/wx/statbox.h
View File

@@ -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; }

2
include/wx/statline.h
View File

@@ -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:

2
include/wx/stattext.h
View File

@@ -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; }

10
include/wx/stc/stc.h
View File

@@ -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

2
include/wx/strvararg.h
View File

@@ -207,7 +207,7 @@ public:
{ return const_cast<wxFormatString*>(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();

2
include/wx/weakref.h
View File

@@ -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<wxObject>). 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) || \

6
include/wx/window.h
View File

@@ -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,

2
include/wx/xml/xml.h
View File

@@ -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.

2
interface/wx/animate.h
View File

@@ -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.

2
interface/wx/app.h
View File

@@ -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().

2
interface/wx/archive.h
View File

@@ -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;

8
interface/wx/aui/framemanager.h
View File

@@ -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);

2
interface/wx/dc.h
View File

@@ -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).

2
interface/wx/display.h
View File

@@ -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.

2
interface/wx/gauge.h
View File

@@ -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();

2
interface/wx/html/htmlcell.h
View File

@@ -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

4
interface/wx/image.h
View File

@@ -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

2
interface/wx/list.h
View File

@@ -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<T> will actually derive from @c std::list and just add a legacy

2
interface/wx/msw/registry.h
View File

@@ -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.

2
interface/wx/print.h
View File

@@ -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();

2
interface/wx/progdlg.h
View File

@@ -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.

2
interface/wx/propgrid/editors.h
View File

@@ -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,

2
interface/wx/propgrid/manager.h
View File

@@ -511,7 +511,7 @@ 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
must also use the two-step construction (ie. default constructor and
Create() instead of constructor with arguments) when creating the
manager.
*/

26
interface/wx/propgrid/property.h
View File

@@ -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
@@ -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 );

18
interface/wx/propgrid/propgrid.h
View File

@@ -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 );

2
interface/wx/scrolwin.h
View File

@@ -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.

10
interface/wx/sizer.h
View File

@@ -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.

4
interface/wx/socket.h
View File

@@ -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

2
interface/wx/textdlg.h
View File

@@ -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

6
interface/wx/thread.h
View File

@@ -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.

2
interface/wx/toolbar.h
View File

@@ -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.
<b>wxMSW note</b>: Note that under wxMSW toolbar paints tools to reflect
system-wide colours. If you use more than 16 colours in your tool bitmaps,

8
interface/wx/treectrl.h
View File

@@ -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.

2
interface/wx/weakref.h
View File

@@ -18,7 +18,7 @@
is to handle objects which derived type one does not know.
@note wxWeakRef<T> 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).

2
interface/wx/window.h
View File

@@ -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);

2
misc/theme_test/test.c
View File

@@ -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);

2
samples/aui/auidemo.cpp
View File

@@ -1704,7 +1704,7 @@ wxString MyFrame::GetIntroText()
"<li>Native, dockable floating frames</li>"
"<li>Perspective saving and loading</li>"
"<li>Native toolbars incorporating real-time, &quot;spring-loaded&quot; dragging</li>"
"<li>Customizable floating/docking behavior</li>"
"<li>Customizable floating/docking behaviour</li>"
"<li>Completely customizable look-and-feel</li>"
"<li>Optional transparent window effects (while dragging or docking)</li>"
"<li>Splittable notebook control</li>"

Some files were not shown because too many files have changed in this diff Show More