Typo correction patch [ 1208110 ] Lots of typo corrections

Olly Betts


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-05-31 09:20:43 +00:00
parent a6905d8b55
commit 3103e8a97e
155 changed files with 279 additions and 371 deletions

View File

@@ -11,7 +11,7 @@
// VC++ IDE predefines _DEBUG and _UNICODE for the new projects itself, but
// the other symbols (WXUSINGDLL, __WXUNIVERSAL__, ...) should be defined
// explicitely!
// explicitly!
#ifdef _MSC_VER
#ifdef _UNICODE

View File

@@ -263,7 +263,7 @@ public:
// version does the normal processing (i.e. shows the usual assert failure
// dialog box)
//
// the arguments are the place where the assert occured, the text of the
// the arguments are the place where the assert occurred, the text of the
// assert itself and the user-specified message
#ifdef __WXDEBUG__
virtual void OnAssert(const wxChar *file,

View File

@@ -174,7 +174,7 @@ public:
// parse the command line, return 0 if ok, -1 if "-h" or "--help" option
// was encountered and the help message was given or a positive value if a
// syntax error occured
// syntax error occurred
//
// if showUsage is true, Usage() is called in case of syntax error or if
// help was requested

View File

@@ -1150,7 +1150,7 @@ public:
return wxTimeSpan(*this).Multiply(n);
}
// return this timespan with inversed sign
// return this timespan with opposite sign
wxTimeSpan Negate() const { return wxTimeSpan(-GetValue()); }
// negate the value of the timespan
wxTimeSpan& Neg() { m_diff = -GetValue(); return *this; }

View File

@@ -789,7 +789,7 @@ wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMaxLength, wxChar *DsDesc,
// Change this to 0 to remove use of all deprecated functions
#if wxODBC_BACKWARD_COMPATABILITY
//#################################################################################
//############### DEPRECATED functions for backward compatability #################
//############### DEPRECATED functions for backward compatibility #################
//#################################################################################
// Backward compability structures/classes. This will eventually go away

View File

@@ -360,7 +360,7 @@ public:
// Change this to 0 to remove use of all deprecated functions
#if wxODBC_BACKWARD_COMPATABILITY
//#################################################################################
//############### DEPRECATED functions for backward compatability #################
//############### DEPRECATED functions for backward compatibility #################
//#################################################################################
// Backward compability. These will eventually go away

View File

@@ -1899,7 +1899,7 @@ enum
wxTOOL_RIGHT
};
/* the values of the format constants should be the same as correspondign */
/* the values of the format constants should be the same as corresponding */
/* CF_XXX constants in Windows API */
enum wxDataFormatId
{

View File

@@ -249,7 +249,7 @@ public:
// return all modules/shared libraries in the address space of this process
//
// returns an empty array if not implemented or an error occured
// returns an empty array if not implemented or an error occurred
static wxDynamicLibraryDetailsArray ListLoaded();
// return platform-specific name of dynamic library with proper extension

View File

@@ -2410,7 +2410,7 @@ protected:
// NB: This method is intentionally *not* inside wxUSE_VALIDATORS!
// It is part of wxBase which doesn't use validators and the code
// is compiled out when building wxBase w/o GUI classes, which affects
// binary compatiblity and wxBase library can't be used by GUI
// binary compatibility and wxBase library can't be used by GUI
// ports.
virtual bool TryValidator(wxEvent& WXUNUSED(event)) { return false; }

View File

@@ -62,7 +62,7 @@ public:
// read all data from the file into a string (useful for text files)
bool ReadAll(wxString *str, wxMBConv& conv = wxConvUTF8);
// returns number of bytes read - use Eof() and Error() to see if an error
// occured or not
// occurred or not
size_t Read(void *pBuf, size_t nCount);
// returns the number of bytes written
size_t Write(const void *pBuf, size_t nCount);
@@ -92,7 +92,7 @@ public:
bool IsOpened() const { return m_fp != NULL; }
// is end of file reached?
bool Eof() const { return feof(m_fp) != 0; }
// is an error occured?
// has an error occurred?
bool Error() const { return ferror(m_fp) != 0; }
// get the file name
const wxString& GetName() const { return m_name; }

View File

@@ -125,7 +125,7 @@ public:
bool IsOpened() const { return m_fd != fd_invalid; }
// is end of file reached?
bool Eof() const;
// has an error occured?
// has an error occurred?
bool Error() const { return m_error; }
// type such as disk or pipe
wxFileKind GetKind() const { return wxGetFileKind(m_fd); }

View File

@@ -226,7 +226,7 @@ private:
// the currently default encoding: by default, it's the default system
// encoding, but may be changed by the application using
// SetDefaultEncoding() to make all subsequent fonts created without
// specifing encoding parameter using this encoding
// specifying encoding parameter using this encoding
static wxFontEncoding ms_encodingDefault;
};

View File

@@ -153,8 +153,8 @@ private:
};
// State information of a search action. I'd have prefered to make this a nested
// class inside wxHtmlHelpData, but that's against coding standards :-(
// State information of a search action. I'd have preferred to make this a
// nested class inside wxHtmlHelpData, but that's against coding standards :-(
// Never construct this class yourself, obtain a copy from
// wxHtmlHelpData::PrepareKeywordSearch(const wxString& key)
class WXDLLIMPEXP_HTML wxHtmlSearchStatus

View File

@@ -89,7 +89,7 @@ public:
// Set HTML page and display it. !! source is HTML document itself,
// it is NOT address/filename of HTML document. If you want to
// specify document location, use LoadPage() istead
// Return value : false if an error occured, true otherwise
// Return value : false if an error occurred, true otherwise
bool SetPage(const wxString& source);
// Append to current page

View File

@@ -378,7 +378,7 @@ public:
const wxChar *szShort = (const wxChar *) NULL, // dir prefix (for msg files)
const wxChar *szLocale = (const wxChar *) NULL, // locale (for setlocale)
bool bLoadDefault = true, // preload wxstd.mo?
bool bConvertEncoding = false) // convert Win<->Unix if neccessary?
bool bConvertEncoding = false) // convert Win<->Unix if necessary?
{
DoCommonInit();
@@ -407,7 +407,7 @@ public:
// restores old locale
~wxLocale();
// Try to get user's (or OS's) prefered language setting.
// Try to get user's (or OS's) preferred language setting.
// Return wxLANGUAGE_UNKNOWN if language-guessing algorithm failed
static int GetSystemLanguage();

View File

@@ -984,7 +984,7 @@
#define wxODBC_FWD_ONLY_CURSORS 1
// Default is 0. Set to 1 to use the deprecated classes, enum types, function,
// member variables. With a setting of 1, full backward compatability with the
// member variables. With a setting of 1, full backward compatibility with the
// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
// as future development will be done only on the non-deprecated
// functions/classes/member variables/etc.

View File

@@ -129,7 +129,7 @@ protected:
*m_subMenu; // our sub menu or NULL
wxString m_text, // label of the item
m_help; // the help string for the item
wxItemKind m_kind; // seperator/normal/check/radio item?
wxItemKind m_kind; // separator/normal/check/radio item?
bool m_isChecked; // is checked?
bool m_isEnabled; // is enabled?

View File

@@ -320,7 +320,7 @@ public:
wxFileType *GetFileTypeFromMimeType(const wxString& mimeType);
// other operations: return true if there were no errors or false if there
// were some unreckognized entries (the good entries are always read anyhow)
// were some unrecognized entries (the good entries are always read anyhow)
//
// FIXME: These ought to be private ??

View File

@@ -24,7 +24,7 @@ struct _EXCEPTION_POINTERS;
enum
{
// we always report where the crash occured
// we always report where the crash occurred
wxCRASH_REPORT_LOCATION = 0,
// if this flag is given, the call stack is dumped

View File

@@ -46,7 +46,7 @@ public:
wxWindowDC(wxWindow *win);
protected:
// intiialize the newly created DC
// initialize the newly created DC
void InitDC();
// override some base class virtuals

View File

@@ -201,7 +201,7 @@ public:
// get the accel table for all the menus
const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; }
// update the accel table (must be called after adding/deletign a menu)
// update the accel table (must be called after adding/deleting a menu)
void RebuildAccelTable();
#endif // wxUSE_ACCEL

View File

@@ -983,7 +983,7 @@
#define wxODBC_FWD_ONLY_CURSORS 1
// Default is 0. Set to 1 to use the deprecated classes, enum types, function,
// member variables. With a setting of 1, full backward compatability with the
// member variables. With a setting of 1, full backward compatibility with the
// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
// as future development will be done only on the non-deprecated
// functions/classes/member variables/etc.

View File

@@ -825,7 +825,7 @@
#define wxODBC_FWD_ONLY_CURSORS 1
// Default is 0. Set to 1 to use the deprecated classes, enum types, function,
// member variables. With a setting of 1, full backward compatability with the
// member variables. With a setting of 1, full backward compatibility with the
// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
// as future development will be done only on the non-deprecated
// functions/classes/member variables/etc.

View File

@@ -983,7 +983,7 @@
#define wxODBC_FWD_ONLY_CURSORS 1
// Default is 0. Set to 1 to use the deprecated classes, enum types, function,
// member variables. With a setting of 1, full backward compatability with the
// member variables. With a setting of 1, full backward compatibility with the
// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
// as future development will be done only on the non-deprecated
// functions/classes/member variables/etc.

View File

@@ -245,7 +245,7 @@ public:
const wxAcceleratorTable& GetAccelTable(void) const { return m_vAccelTable; }
//
// Update the accel table (must be called after adding/deletign a menu)
// Update the accel table (must be called after adding/deleting a menu)
//
void RebuildAccelTable(void);
#endif // wxUSE_ACCEL

View File

@@ -24,7 +24,7 @@ public:
// The program directory can be determined automatically from argv[0],
// this function is automatically called from application initialisation.
// If you override the initialisation routine, you should call it
// explicitely yourself.
// explicitly yourself.
static void SetInstallPrefix(const wxString& prefix);
// get the program installation prefix

View File

@@ -46,7 +46,7 @@ public:
wxWindowDC(wxWindow *win);
protected:
// intiialize the newly created DC
// initialize the newly created DC
void InitDC();
// override some base class virtuals

View File

@@ -174,7 +174,7 @@ public:
// get the accel table for all the menus
const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; }
// update the accel table (must be called after adding/deletign a menu)
// update the accel table (must be called after adding/deleting a menu)
void RebuildAccelTable();
#endif // wxUSE_ACCEL

View File

@@ -939,7 +939,7 @@
#define wxODBC_FWD_ONLY_CURSORS 0
// Default is 0. Set to 1 to use the deprecated classes, enum types, function,
// member variables. With a setting of 1, full backward compatability with the
// member variables. With a setting of 1, full backward compatibility with the
// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
// as future development will be done only on the non-deprecated
// functions/classes/member variables/etc.

View File

@@ -129,7 +129,7 @@ protected:
const wxString& arg = wxEmptyString);
// get the server reply, return the first character of the reply code,
// '1'..'5' for normal FTP replies, 0 (*not* '0') if an error occured
// '1'..'5' for normal FTP replies, 0 (*not* '0') if an error occurred
char GetResult();
// check that the result is equal to expected value

View File

@@ -153,7 +153,7 @@ typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
// the (most common) native bitmap format without alpha support
#if defined(__WXMSW__)
// under MSW the RGB components are inversed, they're in BGR order
// under MSW the RGB components are reversed, they're in BGR order
typedef wxPixelFormat<unsigned char, 24, 2, 1, 0> wxNativePixelFormat;
#define wxPIXEL_FORMAT_ALPHA 3

View File

@@ -964,7 +964,7 @@
#define wxODBC_FWD_ONLY_CURSORS 1
// Default is 0. Set to 1 to use the deprecated classes, enum types, function,
// member variables. With a setting of 1, full backward compatability with the
// member variables. With a setting of 1, full backward compatibility with the
// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
// as future development will be done only on the non-deprecated
// functions/classes/member variables/etc.

View File

@@ -39,7 +39,7 @@
class WXDLLEXPORT wxSpinButtonBase : public wxControl
{
public:
// ctor intiializes the range with the default (0..100) values
// ctor initializes the range with the default (0..100) values
wxSpinButtonBase() { m_min = 0; m_max = 100; }
// accessors

View File

@@ -223,7 +223,7 @@ public:
protected:
// do read up to size bytes of data into the provided buffer
//
// this method should return 0 if EOF has been reached or an error occured
// this method should return 0 if EOF has been reached or an error occurred
// (m_lasterror should be set accordingly as well) or the number of bytes
// read
virtual size_t OnSysRead(void *buffer, size_t size) = 0;

View File

@@ -359,7 +359,7 @@ END_DECLARE_EVENT_TYPES()
#define EVT_TREE_BEGIN_DRAG(id, fn) wx__DECLARE_TREEEVT(BEGIN_DRAG, id, fn)
#define EVT_TREE_BEGIN_RDRAG(id, fn) wx__DECLARE_TREEEVT(BEGIN_RDRAG, id, fn)
// GetItem() is the item on which the drop occured (if any) and GetPoint() the
// GetItem() is the item on which the drop occurred (if any) and GetPoint() the
// current mouse coords
#define EVT_TREE_END_DRAG(id, fn) wx__DECLARE_TREEEVT(END_DRAG, id, fn)

View File

@@ -1021,7 +1021,7 @@
#define wxODBC_FWD_ONLY_CURSORS 0
// Default is 0. Set to 1 to use the deprecated classes, enum types, function,
// member variables. With a setting of 1, full backward compatability with the
// member variables. With a setting of 1, full backward compatibility with the
// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
// as future development will be done only on the non-deprecated
// functions/classes/member variables/etc.

View File

@@ -23,7 +23,7 @@ public:
//
// under some systems (currently only Linux) the program directory can be
// determined automatically but for portable programs you should always set
// it explicitely
// it explicitly
void SetInstallPrefix(const wxString& prefix);
// get the program installation prefix

View File

@@ -310,7 +310,7 @@ public:
// Creates an object (menu, dialog, control, ...) from an XML node.
// Should check for validity.
// parent is a higher-level object (usually window, dialog or panel)
// that is often neccessary to create the resource.
// that is often necessary to create the resource.
// If instance is non-NULL it should not create a new instance via 'new' but
// should rather use this one, and call its Create method.
wxObject *CreateResource(wxXmlNode *node, wxObject *parent,