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

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.

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

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/propgriddefs.h
View File

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

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

@@ -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
"<property>.<subproperty>" instead of "<subproperty>".
*/
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.
*/

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,

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

@@ -94,7 +94,7 @@ private:
Basic property with string value.
<b>Supported special attributes:</b>
- "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 "<composed>" 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.
<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.