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

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

@@ -510,8 +510,8 @@ protected:
/**
Creates property grid for the manager. Reimplement in derived class to
use subclassed wxPropertyGrid. However, if you do this then you
must also use the two-step construction (i.e. default constructor and
use subclassed wxPropertyGrid. However, if you do this then you
must also use the two-step construction (ie. default constructor and
Create() instead of constructor with arguments) when creating the
manager.
*/

28
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
@@ -474,7 +479,7 @@ wxPG_PROP_BEING_DELETED = 0x00200000
Like wxLongStringProperty, but the button triggers file selector instead.
Default wildcard is "All files..." but this can be changed by setting
wxPG_FILE_WILDCARD attribute (see wxFileDialog for format details).
Attribute wxPG_FILE_SHOW_FULL_PATH can be set to @false inorder to show
Attribute wxPG_FILE_SHOW_FULL_PATH can be set to @false in order to show
only the filename, not the entire path.
@subsection wxEnumProperty
@@ -767,7 +772,7 @@ public:
You might want to take into account that m_value is Null variant
if property value is unspecified (which is usually only case if
you explicitly enabled that sort behavior).
you explicitly enabled that sort behaviour).
*/
virtual bool StringToValue( wxVariant& variant, const wxString& text, int argFlags = 0 ) const;
@@ -795,7 +800,7 @@ public:
instead of OnEvent.
- You might want to take into account that m_value is Mull variant if
property value is unspecified (which is usually only case if you
explicitly enabled that sort behavior).
explicitly enabled that sort behaviour).
*/
virtual bool IntToValue( wxVariant& variant, int number, int argFlags = 0 ) const;
@@ -818,7 +823,7 @@ public:
/**
Converts string to a value, and if successful, calls SetValue() on it.
Default behavior is to do nothing.
Default behaviour is to do nothing.
@param text
String to get the value from.
@@ -830,8 +835,13 @@ public:
bool SetValueFromString( const wxString& text, int flags = 0 );
/**
<<<<<<< .mine
Converts integer to a value, and if successful, calls SetValue() on it.
Default behaviour is to do nothing.
=======
Converts integer to a value, and if successful, calls SetValue() on it.
Default behavior is to do nothing.
>>>>>>> .r67279
@param value
Int to get the value from.
@@ -851,7 +861,7 @@ public:
Normally -1, but can be an index to the property's list of items.
@remarks
- Default behavior is to return wxSize(0,0), which means no image.
- Default behaviour is to return wxSize(0,0), which means no image.
- Default image width or height is indicated with dimension -1.
- You can also return wxPG_DEFAULT_IMAGE_SIZE which equals wxSize(-1, -1).
*/
@@ -1540,7 +1550,7 @@ public:
wxIntProperty, wxUIntProperty, wxFloatProperty, wxEditEnumProperty.
@param enable
Whether to enable or disable this behavior (it is disabled by
Whether to enable or disable this behaviour (it is disabled by
default).
*/
void SetAutoUnspecified( bool enable = true );

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

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

@@ -283,7 +283,7 @@ public:
If there is no property with such name, @NULL pointer is returned.
@remarks Properties which have non-category, non-root parent
can not be accessed globally by their name. Instead, use
cannot be accessed globally by their name. Instead, use
"<property>.<subproperty>" instead of "<subproperty>".
*/
wxPGProperty* GetProperty( const wxString& name ) const;
@@ -339,7 +339,7 @@ public:
If there is no property with such name, @NULL pointer is returned.
@remarks Properties which have non-category, non-root parent
can not be accessed globally by their name. Instead, use
cannot be accessed globally by their name. Instead, use
"<property>.<subproperty>" instead of "<subproperty>".
*/
wxPGProperty* GetPropertyByName( const wxString& name ) const;