diff --git a/include/wx/fswatcher.h b/include/wx/fswatcher.h index a29ff834e6..388fbc9c0f 100644 --- a/include/wx/fswatcher.h +++ b/include/wx/fswatcher.h @@ -337,7 +337,7 @@ public: int GetWatchedPathsCount() const; /** - * Retrevies all watched paths and places them in wxArrayString. Returns + * Retrieves all watched paths and places them in wxArrayString. Returns * the number of paths. * * TODO think about API here: we need to return more information (like is diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h index b91304d16e..8a81f1bd52 100644 --- a/include/wx/html/htmlwin.h +++ b/include/wx/html/htmlwin.h @@ -146,7 +146,7 @@ protected: /** Virtual dtor. - It is not really needed in this case but at leats it prevents gcc from + It is not really needed in this case, but at least it prevents gcc from complaining about its absence. */ virtual ~wxHtmlWindowMouseHelper() { } diff --git a/include/wx/msw/ole/safearray.h b/include/wx/msw/ole/safearray.h index fb5c70a399..02d052d54f 100644 --- a/include/wx/msw/ole/safearray.h +++ b/include/wx/msw/ole/safearray.h @@ -294,7 +294,7 @@ public: Converts the array to a wxVariant with the list type, regardless of the underlying SAFEARRAY type. - If the array is multidimensional, it is flattened using the alghoritm + If the array is multidimensional, it is flattened using the algorithm originally employed in wxConvertOleToVariant(). */ bool ConvertToVariant(wxVariant& variant) const @@ -327,7 +327,7 @@ public: Converts an array to an ArrayString. Can be called only for wxSafeArray. If the array is - multidimensional, it is flattened using the alghoritm originally + multidimensional, it is flattened using the algorithm originally employed in wxConvertOleToVariant(). */ bool ConvertToArrayString(wxArrayString& strings) const diff --git a/include/wx/osx/core/cfdataref.h b/include/wx/osx/core/cfdataref.h index 54e7498243..8917451b16 100644 --- a/include/wx/osx/core/cfdataref.h +++ b/include/wx/osx/core/cfdataref.h @@ -40,7 +40,7 @@ public: 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 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. + A handy way to do this is to use the non-member wxCFRefFromGet factory function. This method is templated and takes an otherType *p. This prevents implicit conversion using an operator refType() in a different ref-holding class type. */ diff --git a/include/wx/osx/core/cfdictionary.h b/include/wx/osx/core/cfdictionary.h index 2088450060..5c2c3b4f93 100644 --- a/include/wx/osx/core/cfdictionary.h +++ b/include/wx/osx/core/cfdictionary.h @@ -41,7 +41,7 @@ public: 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 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. + A handy way to do this is to use the non-member wxCFRefFromGet factory function. This method is templated and takes an otherType *p. This prevents implicit conversion using an operator refType() in a different ref-holding class type. */ diff --git a/include/wx/osx/core/cfref.h b/include/wx/osx/core/cfref.h index 54580da695..b441693779 100644 --- a/include/wx/osx/core/cfref.h +++ b/include/wx/osx/core/cfref.h @@ -172,7 +172,7 @@ public: 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 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. + A handy way to do this is to use the non-member wxCFRefFromGet factory function. */ wxCFRef(refType p) : m_ptr(p) { @@ -186,7 +186,7 @@ public: 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 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. + A handy way to do this is to use the non-member wxCFRefFromGet factory function. This method is templated and takes an otherType *p. This prevents implicit conversion using an operator refType() in a different ref-holding class type. */ diff --git a/include/wx/private/fontmgr.h b/include/wx/private/fontmgr.h index c00270a6b1..76f2210f6e 100644 --- a/include/wx/private/fontmgr.h +++ b/include/wx/private/fontmgr.h @@ -70,7 +70,7 @@ public: @param ptSize point size of the font to create; note that this is a float and not integer, it should be wxFont's point - size multipled by wxDC's scale factor + size multiplied by wxDC's scale factor @param aa should the font be antialiased? */ virtual wxFontInstance *GetFontInstance(float ptSize, bool aa); @@ -98,7 +98,7 @@ public: /// Returns name of the bundle virtual wxString GetName() const = 0; - /// Returns true if the font is fixe-width + /// Returns true if the font is fixed-width virtual bool IsFixed() const = 0; /// Type of faces in the bundle diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h index 3320f27ba1..a3a900dde1 100644 --- a/include/wx/richtext/richtextbuffer.h +++ b/include/wx/richtext/richtextbuffer.h @@ -505,7 +505,7 @@ public: /** Partial equality test. If @a weakTest is @true, attributes of this object do not - have to be present if those attributes of @a dim sare present. If @a weakTest is + have to be present if those attributes of @a dims are present. If @a weakTest is @false, the function will fail if an attribute is present in @a dims but not in this object. diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h index a15fe4e681..075f10df2a 100644 --- a/include/wx/richtext/richtextctrl.h +++ b/include/wx/richtext/richtextctrl.h @@ -1247,7 +1247,7 @@ public: bool EndParagraphSpacing() { return GetBuffer().EndParagraphSpacing(); } /** - Begins appling line spacing. @e spacing is a multiple, where 10 means + Begins applying line spacing. @e spacing is a multiple, where 10 means single-spacing, 15 means 1.5 spacing, and 20 means double spacing. The ::wxTextAttrLineSpacing constants are defined for convenience. @@ -1497,7 +1497,7 @@ public: virtual bool WordLeft(int noPages = 1, int flags = 0); /** - Move a nuber of words to the right. + Move a number of words to the right. */ virtual bool WordRight(int noPages = 1, int flags = 0); diff --git a/interface/wx/richtext/richtextbuffer.h b/interface/wx/richtext/richtextbuffer.h index b86c9bd32f..b58125debd 100644 --- a/interface/wx/richtext/richtextbuffer.h +++ b/interface/wx/richtext/richtextbuffer.h @@ -385,7 +385,7 @@ public: /** Partial equality test. If @a weakTest is @true, attributes of this object do not - have to be present if those attributes of @a dim sare present. If @a weakTest is + have to be present if those attributes of @a dims are present. If @a weakTest is @false, the function will fail if an attribute is present in @a dims but not in this object. diff --git a/interface/wx/richtext/richtextctrl.h b/interface/wx/richtext/richtextctrl.h index da43e12720..3af29d13a5 100644 --- a/interface/wx/richtext/richtextctrl.h +++ b/interface/wx/richtext/richtextctrl.h @@ -1453,7 +1453,7 @@ public: virtual bool WordLeft(int noPages = 1, int flags = 0); /** - Move a nuber of words to the right. + Move a number of words to the right. */ virtual bool WordRight(int noPages = 1, int flags = 0); diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp index f76418958c..4449f2a699 100644 --- a/src/common/xpmdecod.cpp +++ b/src/common/xpmdecod.cpp @@ -246,7 +246,7 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream) * A hard coded rgb.txt. To keep it short I removed all colornames with * * trailing numbers, Blue3 etc, except the GrayXX. Sorry Grey-lovers I prefer * * Gray ;-). But Grey is recognized on lookups, only on save Gray will be * -* used, maybe you want to do some substitue there too. * +* used, maybe you want to do some substitute there too. * * * * To save memory the RGBs are coded in one long value, as done by the RGB * * macro. * diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 635fba4a87..b75e127ecd 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -290,7 +290,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, // So far we assumed that label doesn't contain mnemonic // and therefore single underscore characters were not // replaced by two underscores. Now we have to double - // all exisiting underscore characters. + // all existing underscore characters. label.Replace(wxS("_"), wxS("__")); label += wxS('_'); } diff --git a/src/html/chm.cpp b/src/html/chm.cpp index 1ae32fb805..37012f4e23 100644 --- a/src/html/chm.cpp +++ b/src/html/chm.cpp @@ -201,7 +201,7 @@ bool wxChmTools::Contains(const wxString& pattern) /** * Find() * - * Finds the next file descibed by a pattern in the archive, starting + * Finds the next file described by a pattern in the archive, starting * the file given by second parameter * * @param pattern The file-pattern to search for. May contain '*' and/or '?' @@ -410,7 +410,7 @@ private: /** * Constructor * @param archive The name of the .chm archive. Remember that archive must - * be local file accesible via fopen, fread functions! + * be local file accessible via fopen, fread functions! * @param filename The Name of the file to be extracted from archive * @param simulate if true than class should simulate .HHP-File based on #SYSTEM * if false than class does nothing if it doesn't find .hhp @@ -553,8 +553,8 @@ wxFileOffset wxChmInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode) /** * Help Browser tries to read the contents of the - * file by interpreting a .hhp file in the Archiv. - * For .chm doesn't include such a file, we need + * file by interpreting a .hhp file in the Archive. + * Because .chm doesn't include such a file, we need * to rebuild the information based on stored * system-files. */ diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp index a259100ee7..6bf809572f 100644 --- a/src/motif/dcclient.cpp +++ b/src/motif/dcclient.cpp @@ -2058,7 +2058,7 @@ void wxWindowDCImpl::SetDCClipping( WXRegion userRegion ) m_clipRegion ); } // intersect the user region, if any, with the - // exisiting clip region + // existing clip region else // if( userRegion ) { if( !m_clipRegion ) diff --git a/src/msw/mediactrl_wmp10.cpp b/src/msw/mediactrl_wmp10.cpp index d6a80fbacf..955303ca58 100644 --- a/src/msw/mediactrl_wmp10.cpp +++ b/src/msw/mediactrl_wmp10.cpp @@ -29,7 +29,7 @@ // // The ActiveX control itself is particularly stubborn, calling // IOleInPlaceSite::OnPosRectChange every file change trying to set itself -// to something different then what we told it to before. +// to something different from what we told it to before. // // The docs are at // http://msdn.microsoft.com/library/en-us/wmplay10/mmp_sdk/windowsmediaplayer10sdk.asp diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 1378f51131..4ebd6a5d2d 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -356,7 +356,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) // Update radio groups data if we're inserting a new menu item. // Inserting radio and non-radio item has a different impact // on radio groups so we have to handle each case separately. - // (Inserting a radio item in the middle of exisiting group extends + // (Inserting a radio item in the middle of existing group extends // the group, but inserting non-radio item breaks it into two subgroups.) // bool checkInitially = false; @@ -372,7 +372,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) { if ( m_radioData->UpdateOnInsertNonRadio(pos) ) { - // One of the exisiting groups has been split into two subgroups. + // One of the existing groups has been split into two subgroups. wxFAIL_MSG(wxS("Inserting non-radio item inside a radio group?")); } } diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp index b2f65a6b3c..2225a2998a 100644 --- a/src/msw/ole/activex.cpp +++ b/src/msw/ole/activex.cpp @@ -429,7 +429,7 @@ public: // // Result of several hours and days of bug hunting - // this is called by an object when it wants to resize - // itself to something different then our parent window - + // itself to something different from our parent window - // don't let it :) // // m_window->m_oleInPlaceObject->SetObjectRects( diff --git a/src/osx/menu_osx.cpp b/src/osx/menu_osx.cpp index 0351c2dce6..f9d1f0d792 100644 --- a/src/osx/menu_osx.cpp +++ b/src/osx/menu_osx.cpp @@ -136,7 +136,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *item, size_t pos) // Update radio groups if we're inserting a new menu item. // Inserting radio and non-radio item has a different impact // on radio groups, so we have to handle each case separately. - // (Inserting a radio item in the middle of exisiting groups extends this group, + // (Inserting a radio item in the middle of existing groups extends this group, // but inserting a non-radio item breaks it into two subgroups.) bool check = false; if ( item->IsRadio() ) @@ -151,7 +151,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *item, size_t pos) { if ( m_radioData->UpdateOnInsertNonRadio(pos) ) { - // One of the exisiting groups has been split into two subgroups. + // One of the existing groups has been split into two subgroups. wxFAIL_MSG(wxS("Inserting non-radio item inside a radio group?")); } }