diff --git a/docs/doxygen/mainpages/introduction.h b/docs/doxygen/mainpages/introduction.h index e060f5ec32..c08cb581e9 100644 --- a/docs/doxygen/mainpages/introduction.h +++ b/docs/doxygen/mainpages/introduction.h @@ -100,7 +100,7 @@ wxGTK1, wxX11, wxDFB, wxPM...) are also supported but to a lesser extent. Please see the @subpage page_port "platform details page" for more information. There are no CPU speed requirements but the faster (and more) CPU(s) you have, -faster will the library compile. You do need to have enough RAM, especially +the faster the library will compile. You do need to have enough RAM, especially under Windows platforms, to avoid running out of memory during link phase. Depending on the compiler used, you may need at least 4GB to be able to link. Under all platforms it's recommended to have large amounts of free hard disk diff --git a/docs/doxygen/overviews/xrc.h b/docs/doxygen/overviews/xrc.h index c1d7c07fdb..82502dac57 100644 --- a/docs/doxygen/overviews/xrc.h +++ b/docs/doxygen/overviews/xrc.h @@ -464,7 +464,7 @@ IMPLEMENT_DYNAMIC_CLASS(MyControlXmlHandler, wxXmlResourceHandler) MyControlXmlHandler::MyControlXmlHandler() { - // this call adds support for all wxWindows class styles + // this call adds support for all wxWidgets class styles // (e.g. wxBORDER_SIMPLE, wxBORDER_SUNKEN, wxWS_EX_* etc etc) AddWindowStyles(); diff --git a/docs/gtk/wxGNOME/wxGNOME.html b/docs/gtk/wxGNOME/wxGNOME.html index 6f83576715..2b9df2577a 100644 --- a/docs/gtk/wxGNOME/wxGNOME.html +++ b/docs/gtk/wxGNOME/wxGNOME.html @@ -22,7 +22,7 @@ and another one, which only uses X11 calls and which draws its widgets entirely itself, without using any outside library. This port is called wxX11 or sometimes more generally wxUniv (short for wxUniversal), since this widget set (implemented entirely within -wxWidgets) is available whereever wxWidgets is available. Since this +wxWidgets) is available wherever wxWidgets is available. Since this short overview is mainly about how to write wxWidgets applications for the GNOME[3] desktop, I will focus on the GTK+ port, which is generally referred diff --git a/docs/publicity/WoWoW30.html b/docs/publicity/WoWoW30.html index d81e2d80f6..8b8130248c 100644 --- a/docs/publicity/WoWoW30.html +++ b/docs/publicity/WoWoW30.html @@ -41,7 +41,7 @@ mention that wxWidgets is a C++ framework for building rich GUI applications from a single source which can then be compiled on different operating systems, resulting in a native application on each system. wxWidgets uses native controls (or widgets) and other -native functions whereever possible so that the resulting +native functions wherever possible so that the resulting applications will look and feel as native as possible, and they are usually not distinguishable from applications written using single platform toolkits such as MFC for Windows, GTK+ for Linux or Cocoa @@ -209,7 +209,7 @@ and may thus be the most important changes from a user's perspective control used to display lists and hierarchies of name-value pairs. Like wxDataViewCtrl, it offers a number of ready-to-use editors for editing text, numbers, lists, fonts, file names etc. using in-place - editing or using pop-up dialog and combo boxes. Developement of + editing or using pop-up dialog and combo boxes. Development of wxPropertyGrid has so far taken place outside of wxWidgets as a separate project, but it has not been included in wxWidgets per se. See also wxPropertyGrid.

@@ -271,7 +271,7 @@ iPhone and iPod, and these are devices are clearly not Macs. Apart from the name change – wxMac has undergone the most fundamental changes of the three main ports, even if some of the changes were mostly reorganizing code instead of writing new code. The code has -been reorganized into common code (common to Carbon, Cocoa and Cocoa +been reorganized into common code (common to Carbon, Cocoa, and Cocoa Touch) including both general wrapping or front-end classes for much of the GUI code as well as a wrapper for the so called CoreFoundation classes of OS X, which are responsible on all OS X variants for diff --git a/include/wx/combo.h b/include/wx/combo.h index 4bae2cfea6..6a040b3d22 100644 --- a/include/wx/combo.h +++ b/include/wx/combo.h @@ -560,7 +560,7 @@ protected: // just recalculate. void CalculateAreas( int btnWidth = 0 ); - // Standard textctrl positioning routine. Just give it platform-dependant + // Standard textctrl positioning routine. Just give it platform-dependent // textctrl coordinate adjustment. virtual void PositionTextCtrl( int textCtrlXAdjust = 0, int textCtrlYAdjust = 0); @@ -701,7 +701,7 @@ protected: // area used by the button wxSize m_btnSize; - // platform-dependant customization and other flags + // platform-dependent customization and other flags wxUint32 m_iFlags; // custom style for m_text diff --git a/include/wx/private/textmeasure.h b/include/wx/private/textmeasure.h index 69fbf85ab2..a4db67cb50 100644 --- a/include/wx/private/textmeasure.h +++ b/include/wx/private/textmeasure.h @@ -156,7 +156,7 @@ protected: wxDECLARE_NO_COPY_CLASS(wxTextMeasureBase); }; -// Include the platform dependant class declaration, if any. +// Include the platform dependent class declaration, if any. #if defined(__WXGTK20__) #include "wx/gtk/private/textmeasure.h" #elif defined(__WXMSW__) diff --git a/interface/wx/graphics.h b/interface/wx/graphics.h index 96b3457508..8e2113bea6 100644 --- a/interface/wx/graphics.h +++ b/interface/wx/graphics.h @@ -9,7 +9,7 @@ @class wxGraphicsPath A wxGraphicsPath is a native representation of a geometric path. The - contents are specific an private to the respective renderer. Instances are + contents are specific and private to the respective renderer. Instances are reference counted and can therefore be assigned as usual. The only way to get a valid instance is by using wxGraphicsContext::CreatePath() or wxGraphicsRenderer::CreatePath(). diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp index b0efa231f6..bbee40053e 100644 --- a/src/univ/textctrl.cpp +++ b/src/univ/textctrl.cpp @@ -870,10 +870,10 @@ bool wxTextCtrl::ReplaceLine(wxTextCoord line, // now change the line MData().m_lines[line] = text; - // OPT: we choose to lay it our immediately instead of delaying it + // OPT: we choose to lay it out immediately instead of delaying it // until it is needed because it allows us to avoid invalidating - // lines further down if the number of rows didn't chnage, but - // maybe we can imporve this even further? + // lines further down if the number of rows didn't change, but + // maybe we can improve this even further? LayoutLine(line, lineData); int rowsNew = lineData.GetExtraRowCount();