From 668a2186cd89fd4576bed224df3624811eebeca1 Mon Sep 17 00:00:00 2001 From: Blake Madden Date: Sat, 2 Oct 2021 14:46:08 -0400 Subject: [PATCH] Fix comment typos in sources No real changes. Closes https://github.com/wxWidgets/wxWidgets/pull/2541 --- include/wx/accel.h | 2 +- include/wx/android/setup.h | 2 +- include/wx/animdecod.h | 2 +- include/wx/any.h | 2 +- include/wx/anystr.h | 4 ++-- include/wx/archive.h | 2 +- include/wx/aui/framemanager.h | 2 +- include/wx/bmpbuttn.h | 2 +- include/wx/datetime.h | 2 +- include/wx/defs.h | 2 +- include/wx/dialup.h | 4 ++-- include/wx/dynarray.h | 6 +++--- include/wx/dynload.h | 2 +- include/wx/event.h | 4 ++-- include/wx/evtloop.h | 2 +- include/wx/filename.h | 2 +- include/wx/fontpicker.h | 2 +- include/wx/gdicmn.h | 6 +++--- include/wx/generic/gridsel.h | 2 +- include/wx/generic/progdlgg.h | 2 +- include/wx/geometry.h | 2 +- include/wx/glcanvas.h | 2 +- include/wx/gtk/dcmemory.h | 2 +- include/wx/gtk/private/event.h | 2 +- include/wx/gtk/setup.h | 2 +- include/wx/gtk/window.h | 2 +- include/wx/gtk1/dc.h | 2 +- include/wx/html/htmlcell.h | 2 +- include/wx/html/htmltag.h | 2 +- include/wx/layout.h | 2 +- include/wx/motif/setup.h | 2 +- include/wx/motif/window.h | 2 +- include/wx/msw/dib.h | 2 +- include/wx/msw/enhmeta.h | 2 +- include/wx/msw/ole/automtn.h | 2 +- include/wx/msw/private/fswatcher.h | 2 +- include/wx/msw/setup.h | 2 +- include/wx/msw/uxtheme.h | 2 +- include/wx/osx/fswatcher_fsevents.h | 2 +- include/wx/osx/setup.h | 2 +- include/wx/private/markupparserattr.h | 2 +- include/wx/private/rescale.h | 2 +- include/wx/private/wxprintf.h | 2 +- include/wx/propgrid/manager.h | 2 +- include/wx/propgrid/propgridiface.h | 2 +- include/wx/propgrid/props.h | 2 +- include/wx/rawbmp.h | 2 +- include/wx/setup_inc.h | 2 +- include/wx/stockitem.h | 2 +- include/wx/strconv.h | 2 +- include/wx/string.h | 2 +- include/wx/strvararg.h | 2 +- include/wx/thread.h | 2 +- include/wx/univ/setup.h | 2 +- include/wx/xlocale.h | 2 +- include/wx/xtistrm.h | 4 ++-- include/wx/xtixml.h | 2 +- src/aui/tabartgtk.cpp | 2 +- src/common/appcmn.cpp | 2 +- src/common/combocmn.cpp | 4 ++-- src/common/containr.cpp | 2 +- src/common/dcbase.cpp | 4 ++-- src/common/dcgraph.cpp | 2 +- src/common/docview.cpp | 2 +- src/common/evtloopcmn.cpp | 2 +- src/common/fldlgcmn.cpp | 2 +- src/common/fs_arc.cpp | 4 ++-- src/common/gdicmn.cpp | 2 +- src/common/gifdecod.cpp | 2 +- src/common/http.cpp | 2 +- src/common/imagbmp.cpp | 2 +- src/common/menucmn.cpp | 4 ++-- src/common/object.cpp | 6 +++--- src/common/webviewarchivehandler.cpp | 2 +- src/dfb/nonownedwnd.cpp | 2 +- src/dfb/window.cpp | 2 +- src/generic/combog.cpp | 2 +- src/generic/filedlgg.cpp | 2 +- src/generic/renderg.cpp | 2 +- src/gtk/clipbrd.cpp | 2 +- src/gtk1/button.cpp | 2 +- src/gtk1/listbox.cpp | 2 +- src/gtk1/textctrl.cpp | 2 +- src/msw/dc.cpp | 2 +- src/msw/window.cpp | 2 +- src/qt/textentry.cpp | 4 ++-- src/richtext/richtextstyledlg.cpp | 2 +- src/richtext/richtextxml.cpp | 2 +- src/univ/listbox.cpp | 6 +++--- src/univ/menu.cpp | 8 ++++---- src/univ/notebook.cpp | 8 ++++---- src/univ/spinbutt.cpp | 4 ++-- src/univ/statusbr.cpp | 2 +- src/univ/themes/gtk.cpp | 8 ++++---- src/univ/themes/win32.cpp | 4 ++-- src/x11/app.cpp | 6 +++--- src/x11/dataobj.cpp | 2 +- src/x11/dcclient.cpp | 2 +- src/x11/palette.cpp | 10 +++++----- 99 files changed, 133 insertions(+), 133 deletions(-) diff --git a/include/wx/accel.h b/include/wx/accel.h index c1f78d58ed..6011c39c6a 100644 --- a/include/wx/accel.h +++ b/include/wx/accel.h @@ -100,7 +100,7 @@ public: // string <-> wxAcceleratorEntry conversion // ---------------------------------------- - // returns a wxString for the this accelerator. + // returns a wxString for this accelerator. // this function formats it using the - format // where maybe a hyphen-separated list of "shift|alt|ctrl" wxString ToString() const { return AsPossiblyLocalizedString(true); } diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h index 03875c1dbf..740ee3bdf6 100644 --- a/include/wx/android/setup.h +++ b/include/wx/android/setup.h @@ -1057,7 +1057,7 @@ // Default is 1. // // Recommended setting: 1 but can be safely set to 0 except for wxUniv where it -// it used by wxComboBox +// is used by wxComboBox #define wxUSE_COMBOCTRL 1 // wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox diff --git a/include/wx/animdecod.h b/include/wx/animdecod.h index 58177e68fd..b5a0326aff 100644 --- a/include/wx/animdecod.h +++ b/include/wx/animdecod.h @@ -28,7 +28,7 @@ class WXDLLIMPEXP_FWD_CORE wxImage; object converting from the format-specific data representation to the wxImage native format (RGB24). wxAnimationDecoders always load an input stream using some optimized format - to store it which is format-depedent. This allows to store a (possibly big) + to store it which is format-dependent. This allows to store a (possibly big) animation using a format which is a good compromise between required memory and time required to blit it on the screen. diff --git a/include/wx/any.h b/include/wx/any.h index 7fb297956c..6a26e68fee 100644 --- a/include/wx/any.h +++ b/include/wx/any.h @@ -148,7 +148,7 @@ private: /** Helper macro for defining user value types. - Even though C++ RTTI would be fully available to use, we'd have to to + Even though C++ RTTI would be fully available to use, we'd have to facilitate sub-type system which allows, for instance, wxAny with signed short '15' to be treated equal to wxAny with signed long long '15'. Having sm_instance is important here. diff --git a/include/wx/anystr.h b/include/wx/anystr.h index 3f2fec3613..b2740bc172 100644 --- a/include/wx/anystr.h +++ b/include/wx/anystr.h @@ -106,7 +106,7 @@ public: // surrogates as we do for now) // // just remember that this works as long as wxString keeps an internal - // buffer with its wide wide char representation, just as with AsChar() + // buffer with its wide char representation, just as with AsChar() // above return m_str->c_str().AsWChar() + (m_iter - m_str->begin()); } @@ -114,7 +114,7 @@ public: // Because the objects of this class are only used as return type for // functions which can return NULL we can skip providing dereferencing // operators: the code using this class must test it for NULL first and if - // it does anything else with it it has to assign it to either char* or + // it does anything else with it has to assign it to either char* or // wchar_t* itself, before dereferencing. // // IOW this diff --git a/include/wx/archive.h b/include/wx/archive.h index 1d0b45e2fb..2e32e7a497 100644 --- a/include/wx/archive.h +++ b/include/wx/archive.h @@ -80,7 +80,7 @@ private: ///////////////////////////////////////////////////////////////////////////// // wxArchiveInputStream // -// GetNextEntry() returns an wxArchiveEntry object containing the meta-data +// GetNextEntry() returns a wxArchiveEntry object containing the meta-data // for the next entry in the archive (and gives away ownership). Reading from // the wxArchiveInputStream then returns the entry's data. Eof() becomes true // after an attempt has been made to read past the end of the entry's data. diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h index feaa9a8aba..4b727ad9ea 100644 --- a/include/wx/aui/framemanager.h +++ b/include/wx/aui/framemanager.h @@ -486,7 +486,7 @@ public: public: - // deprecated -- please use SetManagedWindow() and + // deprecated -- please use SetManagedWindow() // and GetManagedWindow() instead wxDEPRECATED( void SetFrame(wxFrame* frame) ); diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index 91a00a742d..8a40d9891c 100644 --- a/include/wx/bmpbuttn.h +++ b/include/wx/bmpbuttn.h @@ -73,7 +73,7 @@ public: wxWindowID winid, const wxString& name = wxString()); - which is used used by NewCloseButton(), and, as Create(), must be + which is used by NewCloseButton(), and, as Create(), must be called on default-constructed wxBitmapButton object. */ diff --git a/include/wx/datetime.h b/include/wx/datetime.h index 8c5bfbd09a..dd184db557 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -1070,7 +1070,7 @@ public: // if the overloads above were used. // // And then we also have to provide the overloads for wxCStrData, as usual. - // Unfortunately those ones can't return anything as we don't have any + // Unfortunately those can't return anything as we don't have any // sufficiently long-lived wxAnyStrPtr to return from them: any temporary // strings it would point to would be destroyed when this function returns // making it impossible to dereference the return value. So we just don't diff --git a/include/wx/defs.h b/include/wx/defs.h index c3810641ca..09b35e7572 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -522,7 +522,7 @@ typedef short int WXTYPE; #define wxC_CALLING_CONV #endif /* compiler */ -/* callling convention for the qsort(3) callback */ +/* calling convention for the qsort(3) callback */ #define wxCMPFUNC_CONV wxC_CALLING_CONV /* compatibility :-( */ diff --git a/include/wx/dialup.h b/include/wx/dialup.h index 7563f54bc2..fab11359e4 100644 --- a/include/wx/dialup.h +++ b/include/wx/dialup.h @@ -66,7 +66,7 @@ public: // parameter to Dial() on this machine and returns their number (may be 0) virtual size_t GetISPNames(wxArrayString& names) const = 0; - // dial the given ISP, use username and password to authentificate + // dial the given ISP, use username and password to authenticate // // if no nameOfISP is given, the function will select the default one // @@ -122,7 +122,7 @@ public: // wxEVT_DIALUP_CONNECTED/wxEVT_DIALUP_DISCONNECTED events. The interval // parameter is only for Unix where we do the check manually: under // Windows, the notification about the change of connection status is - // instantenous. + // instantaneous. // // Returns false if couldn't set up automatic check for online status. virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds = 60) = 0; diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index 03cb8c6c1f..9317776aac 100644 --- a/include/wx/dynarray.h +++ b/include/wx/dynarray.h @@ -445,7 +445,7 @@ private: // under Windows if needed. // // The first (just EXPORTED) macros do it if wxWidgets was compiled as a DLL -// and so must be used used inside the library. The second kind (USER_EXPORTED) +// and so must be used inside the library. The second kind (USER_EXPORTED) // allow the user code to do it when it wants. This is needed if you have a dll // that wants to export a wxArray daubed with your own import/export goo. // @@ -615,7 +615,7 @@ private: // 2) Detach() just removes the object from the array (returning pointer to it) // // NB1: Base type T should have an accessible copy ctor if Add(T&) is used -// NB2: Never ever cast a array to it's base type: as dtor is not virtual +// NB2: Never ever cast an array to it's base type: as dtor is not virtual // and so you risk having at least the memory leaks and probably worse // // Some functions of this class are not inline, so it takes some space to @@ -631,7 +631,7 @@ private: // This is necessary because at the moment of DEFINE_OBJARRAY class parsing the // element_type must be fully defined (i.e. forward declaration is not // enough), while WX_DECLARE_OBJARRAY may be done anywhere. The separation of -// two allows to break cicrcular dependencies with classes which have member +// two allows to break circcular dependencies with classes which have member // variables of objarray type. // ---------------------------------------------------------------------------- diff --git a/include/wx/dynload.h b/include/wx/dynload.h index 1c538c7d51..5637387c88 100644 --- a/include/wx/dynload.h +++ b/include/wx/dynload.h @@ -36,7 +36,7 @@ typedef wxDLManifest wxDLImports; // --------------------------------------------------------------------------- // NOTE: Do not attempt to use a base class pointer to this class. -// wxDL is not virtual and we deliberately hide some of it's +// wxDL is not virtual and we deliberately hide some of its // methods here. // // Unless you know exactly why you need to, you probably shouldn't diff --git a/include/wx/event.h b/include/wx/event.h index 49f2bce205..2b3cad6bb7 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -1692,7 +1692,7 @@ private: }; -// Scroll event class, derived form wxCommandEvent. wxScrollEvents are +// Scroll event class, derived from wxCommandEvent. wxScrollEvents are // sent by wxSlider and wxScrollBar. /* wxEVT_SCROLL_TOP @@ -3086,7 +3086,7 @@ private: /* wxEVT_MOUSE_CAPTURE_LOST - The window losing the capture receives this message, unless it released it + The window losing the capture receives this message, unless it released it itself or unless wxWindow::CaptureMouse was called on another window (and so capture will be restored when the new capturer releases it). */ diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h index 223dee060c..257b7574dc 100644 --- a/include/wx/evtloop.h +++ b/include/wx/evtloop.h @@ -41,7 +41,7 @@ It's important to note that YieldFor() is used to selectively process the events generated by the NATIVE toolkit. - Events syntethized by wxWidgets code or by user code are instead selectively + Events synthesized by wxWidgets code or by user code are instead selectively processed thanks to the logic built into wxEvtHandler::ProcessPendingEvents(). In fact, when wxEvtHandler::ProcessPendingEvents gets called from inside a YieldFor() call, wxEventLoopBase::IsEventAllowedInsideYield is used to decide diff --git a/include/wx/filename.h b/include/wx/filename.h index 003674df85..1bdb3b7299 100644 --- a/include/wx/filename.h +++ b/include/wx/filename.h @@ -495,7 +495,7 @@ public: // is the char a path separator for this format? static bool IsPathSeparator(wxChar ch, wxPathFormat format = wxPATH_NATIVE); - // is this is a DOS path which beings with a windows unique volume name + // is this is a DOS path which begins with a windows unique volume name // ('\\?\Volume{guid}\')? static bool IsMSWUniqueVolumeNamePath(const wxString& path, wxPathFormat format = wxPATH_NATIVE); diff --git a/include/wx/fontpicker.h b/include/wx/fontpicker.h index d4bdfd3022..3c12f28783 100644 --- a/include/wx/fontpicker.h +++ b/include/wx/fontpicker.h @@ -95,7 +95,7 @@ protected: // ---------------------------------------------------------------------------- // wxFontPickerCtrl: platform-independent class which embeds the -// platform-dependent wxFontPickerWidget andm if wxFNTP_USE_TEXTCTRL style is +// platform-dependent wxFontPickerWidget and if wxFNTP_USE_TEXTCTRL style is // used, a textctrl next to it. // ---------------------------------------------------------------------------- diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index a7c3877327..6a0ad01e88 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -834,7 +834,7 @@ public: return r; } - // return true if the point is (not strcitly) inside the rect + // return true if the point is (not strictly) inside the rect bool Contains(int x, int y) const; bool Contains(const wxPoint& pt) const { return Contains(pt.x, pt.y); } // return true if the rectangle 'rect' is (not strictly) inside this rect @@ -846,7 +846,7 @@ public: // like Union() but don't ignore empty rectangles wxRect& operator+=(const wxRect& rect); - // intersections of two rectrangles not testing for empty rectangles + // intersections of two rectangles not testing for empty rectangles wxRect& operator*=(const wxRect& rect); // centre this rectangle in the given (usually, but not necessarily, @@ -948,7 +948,7 @@ public: wxStockGDI creates the stock GDI objects on demand. Pointers to the created objects are stored in the ms_stockObject array, which is indexed - by the Item enum values. Platorm-specific fonts can be created by + by the Item enum values. Platform-specific fonts can be created by implementing a derived class with an override for the GetFont function. wxStockGDI operates as a singleton, accessed through the ms_instance pointer. By default this pointer is set to an instance of wxStockGDI. diff --git a/include/wx/generic/gridsel.h b/include/wx/generic/gridsel.h index a39a42e128..4a895e4166 100644 --- a/include/wx/generic/gridsel.h +++ b/include/wx/generic/gridsel.h @@ -71,7 +71,7 @@ public: // Extend (or shrink) the current selection block (creating it if // necessary, i.e. if there is no selection at all currently or if the - // current current cell isn't selected, as in this case a new block + // current cell isn't selected, as in this case a new block // containing it is always added) to the one specified by the start and end // coordinates of its opposite corners (which don't have to be in // top/bottom left/right order). diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index 3551ccfbeb..0252498569 100644 --- a/include/wx/generic/progdlgg.h +++ b/include/wx/generic/progdlgg.h @@ -188,7 +188,7 @@ private: *m_remaining; // Reference to the parent top level window, automatically becomes NULL if - // it it is destroyed and could be always NULL if it's not given at all. + // it is destroyed and could be always NULL if it's not given at all. wxWindowRef m_parentTop; // Progress dialog styles: this is not the same as m_windowStyle because diff --git a/include/wx/geometry.h b/include/wx/geometry.h index 48214eae05..bfb18c88e7 100644 --- a/include/wx/geometry.h +++ b/include/wx/geometry.h @@ -478,7 +478,7 @@ inline wxPoint2DDouble operator/(const wxPoint2DDouble& pt , wxInt32 n) return wxPoint2DDouble( pt.m_x / n , pt.m_y / n ); } -// wxRect2Ds are a axis-aligned rectangles, each side of the rect is parallel to the x- or m_y- axis. The rectangle is either defined by the +// wxRect2Ds are an axis-aligned rectangles, each side of the rect is parallel to the x- or m_y- axis. The rectangle is either defined by the // top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if // left <= x < right and top <= m_y < bottom , thus it is a half open interval. diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h index 9338c850d7..00f14953d5 100644 --- a/include/wx/glcanvas.h +++ b/include/wx/glcanvas.h @@ -162,7 +162,7 @@ public: wxGLAttributes& FrameBuffersRGB(); void EndList(); // No more values can be chained - // This function is undocumented and can not be chained on purpose! + // This function is undocumented and cannot be chained on purpose! // To keep backwards compatibility with versions before wx3.1 we add here // the default values used in those versions for the case of NULL list. void AddDefaultsForWXBefore31(); diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h index 8371d721e3..08036ac9c8 100644 --- a/include/wx/gtk/dcmemory.h +++ b/include/wx/gtk/dcmemory.h @@ -26,7 +26,7 @@ public: virtual ~wxMemoryDCImpl(); // these get reimplemented for mono-bitmaps to behave - // more like their Win32 couterparts. They now interpret + // more like their Win32 counterparts. They now interpret // wxWHITE, wxWHITE_BRUSH and wxWHITE_PEN as drawing 0 // and everything else as drawing 1. virtual void SetPen( const wxPen &pen ) wxOVERRIDE; diff --git a/include/wx/gtk/private/event.h b/include/wx/gtk/private/event.h index 4ea9d587d1..851fd93710 100644 --- a/include/wx/gtk/private/event.h +++ b/include/wx/gtk/private/event.h @@ -22,7 +22,7 @@ // In other words, it isn't guaranteed to map to Meta. This is a real // problem: it is common to map NumLock to it (in fact, it's an exception // if the X server _doesn't_ use it for NumLock). So the old code caused - // wxKeyEvent::MetaDown() to always return true as long as NumLock was on + // wxKeyEvent::MetaDown() to always return true as long as NumLock was // on many systems, which broke all applications using // wxKeyEvent::GetModifiers() to check modifiers state (see e.g. here: // http://tinyurl.com/56lsk2). diff --git a/include/wx/gtk/setup.h b/include/wx/gtk/setup.h index 85ffff1c21..ffde7df8c6 100644 --- a/include/wx/gtk/setup.h +++ b/include/wx/gtk/setup.h @@ -1058,7 +1058,7 @@ // Default is 1. // // Recommended setting: 1 but can be safely set to 0 except for wxUniv where it -// it used by wxComboBox +// is used by wxComboBox #define wxUSE_COMBOCTRL 1 // wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 53d2c88d57..a28bec5902 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -182,7 +182,7 @@ public: bool GTKShouldIgnoreEvent() const; - // override this if some events should never be consumed by wxWidgets but + // override this if some events should never be consumed by wxWidgets // but have to be left for the native control // // base version just calls HandleWindowEvent() diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h index 0771c6321d..3f907579cc 100644 --- a/include/wx/gtk1/dc.h +++ b/include/wx/gtk1/dc.h @@ -54,7 +54,7 @@ private: wxDECLARE_ABSTRACT_CLASS(wxDC); }; -// this must be defined when wxDC::Blit() honours the DC origian and needed to +// this must be defined when wxDC::Blit() honours the DC origin and needed to // allow wxUniv code in univ/winuniv.cpp to work with versions of wxGTK // 2.3.[23] #ifndef wxHAS_WORKING_GTK_DC_BLIT diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h index e555c26416..d1644060b9 100644 --- a/include/wx/html/htmlcell.h +++ b/include/wx/html/htmlcell.h @@ -295,7 +295,7 @@ public: // // 'window' is pointer to wxHtmlWindowInterface of the window which // generated the event. - // HINT: if this handling is not enough for you you should use + // HINT: if this handling is not enough for you should use // wxHtmlWidgetCell virtual bool ProcessMouseClick(wxHtmlWindowInterface *window, const wxPoint& pos, diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index f7b4f9b5b0..9fd14c1b53 100644 --- a/include/wx/html/htmltag.h +++ b/include/wx/html/htmltag.h @@ -39,7 +39,7 @@ public: wxHtmlTagsCache(const wxString& source); virtual ~wxHtmlTagsCache(); - // Finds parameters for tag starting at at and fills the variables + // Finds parameters for tag starting at and fills the variables void QueryTag(const wxString::const_iterator& at, const wxString::const_iterator& inputEnd, wxString::const_iterator *end1, diff --git a/include/wx/layout.h b/include/wx/layout.h index 2b062584d9..504ee35e33 100644 --- a/include/wx/layout.h +++ b/include/wx/layout.h @@ -28,7 +28,7 @@ #if wxUSE_CONSTRAINTS // ---------------------------------------------------------------------------- -// forward declrations +// forward declarations // ---------------------------------------------------------------------------- class WXDLLIMPEXP_FWD_CORE wxWindowBase; diff --git a/include/wx/motif/setup.h b/include/wx/motif/setup.h index d6474006fb..f013d65ac2 100644 --- a/include/wx/motif/setup.h +++ b/include/wx/motif/setup.h @@ -1058,7 +1058,7 @@ // Default is 1. // // Recommended setting: 1 but can be safely set to 0 except for wxUniv where it -// it used by wxComboBox +// is used by wxComboBox #define wxUSE_COMBOCTRL 1 // wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h index 6029e297ac..d8cf29da1d 100644 --- a/include/wx/motif/window.h +++ b/include/wx/motif/window.h @@ -131,7 +131,7 @@ public: // (for wxWindowDC and Motif callbacks only) // ----------------------------------------- - // Adds a recangle to the updates list + // Adds a rectangle to the updates list void AddUpdateRect(int x, int y, int w, int h); void ClearUpdateRegion() { m_updateRegion.Clear(); } diff --git a/include/wx/msw/dib.h b/include/wx/msw/dib.h index a3b8cb98e9..15fd23318d 100644 --- a/include/wx/msw/dib.h +++ b/include/wx/msw/dib.h @@ -49,7 +49,7 @@ public: wxDIB(HBITMAP hbmp) { Init(); (void)Create(hbmp); } - // load a DIB from file (any depth is supoprted here unlike above) + // load a DIB from file (any depth is supported here unlike above) // // as above, use IsOk() to see if the bitmap was loaded successfully wxDIB(const wxString& filename) diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h index 80f380cf31..7b5934ef8d 100644 --- a/include/wx/msw/enhmeta.h +++ b/include/wx/msw/enhmeta.h @@ -155,7 +155,7 @@ protected: // ---------------------------------------------------------------------------- // wxEnhMetaFileSimpleDataObject does derive from wxDataObjectSimple which // makes it more convenient to use (it can be used with wxDataObjectComposite) -// at the price of not supoprting any more CF_METAFILEPICT but only +// at the price of not supporting any more CF_METAFILEPICT but only // CF_ENHMETAFILE // ---------------------------------------------------------------------------- diff --git a/include/wx/msw/ole/automtn.h b/include/wx/msw/ole/automtn.h index beea810f6e..250aaefdd2 100644 --- a/include/wx/msw/ole/automtn.h +++ b/include/wx/msw/ole/automtn.h @@ -96,7 +96,7 @@ public: // Uses DISPATCH_PROPERTYGET // and returns a dispatch pointer. The calling code should call Release - // on the pointer, though this could be implicit by constructing an wxAutomationObject + // on the pointer, though this could be implicit by constructing a wxAutomationObject // with it and letting the destructor call Release. WXIDISPATCH* GetDispatchProperty(const wxString& property, int noArgs, wxVariant args[]) const; WXIDISPATCH* GetDispatchProperty(const wxString& property, int noArgs, const wxVariant **args) const; diff --git a/include/wx/msw/private/fswatcher.h b/include/wx/msw/private/fswatcher.h index 31daa038fc..44b9c92871 100644 --- a/include/wx/msw/private/fswatcher.h +++ b/include/wx/msw/private/fswatcher.h @@ -297,7 +297,7 @@ public: protected: // structure to hold information needed to process one native event - // this is just a dummy holder, so it doesn't take ownership of it's data + // this is just a dummy holder, so it doesn't take ownership of its data struct wxEventProcessingData { wxEventProcessingData(const FILE_NOTIFY_INFORMATION* ne, diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h index 3a9bceef80..78f37584ee 100644 --- a/include/wx/msw/setup.h +++ b/include/wx/msw/setup.h @@ -1058,7 +1058,7 @@ // Default is 1. // // Recommended setting: 1 but can be safely set to 0 except for wxUniv where it -// it used by wxComboBox +// is used by wxComboBox #define wxUSE_COMBOCTRL 1 // wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox diff --git a/include/wx/msw/uxtheme.h b/include/wx/msw/uxtheme.h index 83393c6c57..a0a2df4d8c 100644 --- a/include/wx/msw/uxtheme.h +++ b/include/wx/msw/uxtheme.h @@ -165,7 +165,7 @@ enum POPUPCHECKSTATES // If we declare them as taking LOGFONT below, the code would be able to // silently pass LOGFONTA to them in ANSI build and would crash at run-time // under Windows Vista/7 because of a buffer overrun (LOGFONTA being smaller -// than LOGFONTW expected by these functions). If we we declare them as taking +// than LOGFONTW expected by these functions). If we declare them as taking // LOGFONTW, the code wouldn't work correctly under XP. So we use a special // wxUxThemeFont class to encapsulate this and intentionally change the LOGFONT // output parameters of the theme functions to take it instead. diff --git a/include/wx/osx/fswatcher_fsevents.h b/include/wx/osx/fswatcher_fsevents.h index 3a3843c472..69889519d9 100644 --- a/include/wx/osx/fswatcher_fsevents.h +++ b/include/wx/osx/fswatcher_fsevents.h @@ -57,7 +57,7 @@ public: // watches from kqeueue and from FSEvents bool RemoveAll() wxOVERRIDE; - // post an file change event to the owner + // post a file change event to the owner void PostChange(const wxFileName& oldFileName, const wxFileName& newFileName, int event); diff --git a/include/wx/osx/setup.h b/include/wx/osx/setup.h index 5254f4e6b2..79a157a410 100644 --- a/include/wx/osx/setup.h +++ b/include/wx/osx/setup.h @@ -1064,7 +1064,7 @@ // Default is 1. // // Recommended setting: 1 but can be safely set to 0 except for wxUniv where it -// it used by wxComboBox +// is used by wxComboBox #define wxUSE_COMBOCTRL 1 // wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox diff --git a/include/wx/private/markupparserattr.h b/include/wx/private/markupparserattr.h index 4c33b39755..75d8749710 100644 --- a/include/wx/private/markupparserattr.h +++ b/include/wx/private/markupparserattr.h @@ -33,7 +33,7 @@ public: // A container of font and colours with inheritance support. It holds two // sets of attributes: // 1. The currently specified ones from parsed tags that contain - // information on on what should change in the output; some of them + // information on what should change in the output; some of them // may be invalid if only the others are affected by a change. // 2. The _effective_ attributes that are always valid and accumulate // all past changes as the markup is being parser; these are used diff --git a/include/wx/private/rescale.h b/include/wx/private/rescale.h index 81c80c66b1..969e758a2d 100644 --- a/include/wx/private/rescale.h +++ b/include/wx/private/rescale.h @@ -19,7 +19,7 @@ #endif // wxRescaleCoord is used to scale the components of the given wxSize by the -// ratio between 2 scales, with rounding. It doesn't not scale the components +// ratio between 2 scales, with rounding. It doesn't scale the components // if they're set to -1 (wxDefaultCoord), as this value is special in wxSize. // // The way it's used is special because we want to ensure there is no confusion diff --git a/include/wx/private/wxprintf.h b/include/wx/private/wxprintf.h index 71876de610..2d06abffa6 100644 --- a/include/wx/private/wxprintf.h +++ b/include/wx/private/wxprintf.h @@ -181,7 +181,7 @@ public: bool LoadArg(wxPrintfArg *p, va_list &argptr); private: - // An helper function of LoadArg() which is used to handle the '*' flag + // A helper function of LoadArg() which is used to handle the '*' flag void ReplaceAsteriskWith(int w); }; diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h index aaed57dd97..2e4a83f343 100644 --- a/include/wx/propgrid/manager.h +++ b/include/wx/propgrid/manager.h @@ -207,7 +207,7 @@ public: return InsertPage(-1, label, bmp, pageObj); } - // Deletes all all properties and all pages. + // Deletes all properties and all pages. virtual void Clear() wxOVERRIDE; // Deletes all properties on given page. diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h index 90d3833846..930d8606fd 100644 --- a/include/wx/propgrid/propgridiface.h +++ b/include/wx/propgrid/propgridiface.h @@ -324,7 +324,7 @@ public: const wxPGAttributeStorage& GetPropertyAttributes( wxPGPropArg id ) const { // If 'id' refers to invalid property, then we will return dummy - // attributes (i.e. root property's attributes, which contents should + // attributes (i.e. root property's attributes, which contents // should always be empty and of no consequence). wxPG_PROP_ARG_CALL_PROLOG_RETVAL(m_pState->DoGetRoot()->GetAttributes()) return p->GetAttributes(); diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h index f2d9c531cc..25a4d730c7 100644 --- a/include/wx/propgrid/props.h +++ b/include/wx/propgrid/props.h @@ -463,7 +463,7 @@ private: // ----------------------------------------------------------------------- // wxEnumProperty with wxString value and writable combo box editor. -// Uses int value, similar to wxEnumProperty, unless text entered by user is +// Uses int value, similar to wxEnumProperty, unless text entered by user // is not in choices (in which case string value is used). class WXDLLIMPEXP_PROPGRID wxEditEnumProperty : public wxEnumProperty { diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h index c32122d5b9..eb5065a9dc 100644 --- a/include/wx/rawbmp.h +++ b/include/wx/rawbmp.h @@ -31,7 +31,7 @@ // bother to inline them unless we crank the optimization levels way up. // Therefore, we also provide macros to wring maximum speed out of compiler // unconditionally (e.g. even in debug builds). Of course, if the performance -// isn't absolutely crucial for you you shouldn't be using them but the inline +// isn't absolutely crucial for you shouldn't be using them but the inline // functions instead. // ---------------------------------------------------------------------------- diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index 52b1ca4d2c..37ec2422e6 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -1054,7 +1054,7 @@ // Default is 1. // // Recommended setting: 1 but can be safely set to 0 except for wxUniv where it -// it used by wxComboBox +// is used by wxComboBox #define wxUSE_COMBOCTRL 1 // wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox diff --git a/include/wx/stockitem.h b/include/wx/stockitem.h index 72d3e714d8..a03d55a7ec 100644 --- a/include/wx/stockitem.h +++ b/include/wx/stockitem.h @@ -65,7 +65,7 @@ enum wxStockHelpStringClient wxSTOCK_MENU // help string to use for menu items }; -// Returns an help string for the given stock UI element and for the given "context". +// Returns a help string for the given stock UI element and for the given "context". WXDLLIMPEXP_CORE wxString wxGetStockHelpString(wxWindowID id, wxStockHelpStringClient client = wxSTOCK_MENU); diff --git a/include/wx/strconv.h b/include/wx/strconv.h index c1b070d36a..aceed78c2d 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -143,7 +143,7 @@ public: // return true if the converter's charset is UTF-8, i.e. char* strings // decoded using this object can be directly copied to wxString's internal - // storage without converting to WC and than back to UTF-8 MB string + // storage without converting to WC and then back to UTF-8 MB string virtual bool IsUTF8() const { return false; } // The old conversion functions. The existing classes currently mostly diff --git a/include/wx/string.h b/include/wx/string.h index df2a088e1e..73fc59fb20 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -1507,7 +1507,7 @@ public: } /* - Note that we we must define all of the overloads below to avoid + Note that we must define all of the overloads below to avoid ambiguity when using str[0]. */ wxUniChar operator[](int n) const diff --git a/include/wx/strvararg.h b/include/wx/strvararg.h index 91af35e7fa..f80298bc22 100644 --- a/include/wx/strvararg.h +++ b/include/wx/strvararg.h @@ -76,7 +76,7 @@ wxGCC_WARNING_SUPPRESS(ctor-dtor-privacy) // using wxArgNormalizer, unlike the rest of // the function's arguments [2] // fixed List of types of the leading "fixed" arguments, in -// parenthesis [(FILE*,const wxString&)] +// parentheses [(FILE*,const wxString&)] // impl Name of the variadic function that implements 'name' for // the native strings representation (wchar_t* if // wxUSE_UNICODE_WCHAR or wxUSE_UNICODE_UTF8 when running under diff --git a/include/wx/thread.h b/include/wx/thread.h index 78dcc49cb4..3a4303d669 100644 --- a/include/wx/thread.h +++ b/include/wx/thread.h @@ -102,7 +102,7 @@ enum // // However recursive mutexes have several important drawbacks: first, in the // POSIX implementation, they're less efficient. Second, and more importantly, -// they CAN NOT BE USED WITH CONDITION VARIABLES under Unix! Using them with +// they CANNOT BE USED WITH CONDITION VARIABLES under Unix! Using them with // wxCondition will work under Windows and some Unices (notably Linux) but will // deadlock under other Unix versions (e.g. Solaris). As it might be difficult // to ensure that a recursive mutex is not used with wxCondition, it is a good diff --git a/include/wx/univ/setup.h b/include/wx/univ/setup.h index 0b07bfbdfe..45ae8a3120 100644 --- a/include/wx/univ/setup.h +++ b/include/wx/univ/setup.h @@ -1057,7 +1057,7 @@ // Default is 1. // // Recommended setting: 1 but can be safely set to 0 except for wxUniv where it -// it used by wxComboBox +// is used by wxComboBox #define wxUSE_COMBOCTRL 1 // wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h index 476a3a737e..c433d25d05 100644 --- a/include/wx/xlocale.h +++ b/include/wx/xlocale.h @@ -139,7 +139,7 @@ public: wxXLocale() { m_isC = false; } // Construct from a symbolic language constant: unless the language is - // wxLANGUAGE_ENGLISH_US (which we suppose to be the same as "C" locale) + // wxLANGUAGE_ENGLISH_US (which we assume to be the same as "C" locale) // the object will be invalid wxXLocale(wxLanguage lang) { diff --git a/include/wx/xtistrm.h b/include/wx/xtistrm.h index a6e3fa8809..c0d03564ca 100644 --- a/include/wx/xtistrm.h +++ b/include/wx/xtistrm.h @@ -154,7 +154,7 @@ public: virtual void DoBeginWriteObject(const wxObject *object, const wxClassInfo *classInfo, int objectID, const wxStringToAnyHashMap &metadata ) = 0; - // end of writing an toplevel object name param is used for unique + // end of writing a toplevel object name param is used for unique // identification within the container virtual void DoEndWriteObject(const wxObject *object, const wxClassInfo *classInfo, int objectID ) = 0; @@ -213,7 +213,7 @@ Streaming callbacks for depersisting XML to code, or running objects class WXDLLIMPEXP_BASE wxObjectReaderCallback; /* -wxObjectReader handles streaming in a class from a arbitrary format. +wxObjectReader handles streaming in a class from an arbitrary format. While walking through it issues calls out to interfaces to readercallback the guts from the underlying storage format. */ diff --git a/include/wx/xtixml.h b/include/wx/xtixml.h index df91f2bbd7..d083203cbe 100644 --- a/include/wx/xtixml.h +++ b/include/wx/xtixml.h @@ -56,7 +56,7 @@ public: virtual void DoBeginWriteObject(const wxObject *object, const wxClassInfo *classInfo, int objectID, const wxStringToAnyHashMap &metadata ); - // end of writing an toplevel object name param is used for unique + // end of writing a toplevel object name param is used for unique // identification within the container virtual void DoEndWriteObject(const wxObject *object, const wxClassInfo *classInfo, int objectID ); diff --git a/src/aui/tabartgtk.cpp b/src/aui/tabartgtk.cpp index ac6d6bb2ee..7f08f7201a 100644 --- a/src/aui/tabartgtk.cpp +++ b/src/aui/tabartgtk.cpp @@ -353,7 +353,7 @@ void wxAuiGtkTabArt::DrawTab(wxDC& dc, wxWindow* wnd, const wxAuiNotebookPage& p if(page.active && (wnd->FindFocus() == wnd) && focus_area.x <= (area.x + area.width)) { - // clipping seems not to work here, so we we have to recalc the focus-area manually + // clipping seems not to work here, so we have to recalc the focus-area manually if((focus_area.x + focus_area.width) > (area.x + area.width)) focus_area.width = area.x + area.width - focus_area.x + focus_width - GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder; gtk_paint_focus (style_notebook, window, diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index 73611dfc48..bfda967ead 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -499,7 +499,7 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg) if ( wxIsMainThread() ) { // Note that this and the other messages here are intentionally not - // translated -- they are for developpers only. + // translated -- they are for developers only. static const wxStringCharType* caption = wxS("wxWidgets Debug Alert"); wxString msgDlg = wxS("A debugging check in this application ") diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp index 307240e424..d6007631c0 100644 --- a/src/common/combocmn.cpp +++ b/src/common/combocmn.cpp @@ -948,7 +948,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth ) wxSize sz = GetClientSize(); int btnBorder; // border for button only - // check if button should really be outside the border: we'll do it it if + // check if button should really be outside the border: we'll do it if // its platform default or bitmap+pushbutton background is used, but not if // there is vertical size adjustment or horizontal spacing. if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) || @@ -2378,7 +2378,7 @@ wxSize wxComboCtrlBase::GetButtonSize() wxSize retSize(m_btnWid,m_btnHei); - // Need to call CalculateAreas now if button size is + // Need to call CalculateAreas now if button size // is not explicitly specified. if ( retSize.x <= 0 || retSize.y <= 0) { diff --git a/src/common/containr.cpp b/src/common/containr.cpp index 44d9fee718..e5101acce9 100644 --- a/src/common/containr.cpp +++ b/src/common/containr.cpp @@ -607,7 +607,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) { wxCHECK_MSG( win, false, wxT("wxSetFocusToChild(): invalid window") ); // wxCHECK_MSG( childLastFocused, false, - // wxT("wxSetFocusToChild(): NULL child poonter") ); + // wxT("wxSetFocusToChild(): NULL child pointer") ); if ( childLastFocused && *childLastFocused ) { diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp index fe93ee18bb..82be5c669d 100644 --- a/src/common/dcbase.cpp +++ b/src/common/dcbase.cpp @@ -365,7 +365,7 @@ void wxDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxS("Clipping box size values cannot be negative") ); // If we set clipping box with this method we can operate on device coordinates - // and calculate clipping box properly also when transfromations were applied to DC. + // and calculate clipping box properly also when transformations were applied to DC. m_useDevClipCoords = true; wxRect clipRegion(LogicalToDevice(x, y), LogicalToDeviceRel(w, h)); @@ -1252,7 +1252,7 @@ void wxDC::DrawLabel(const wxString& text, { if ( pc == text.end() || *pc == '\n' ) { - int xRealStart = x; // init it here to avoid compielr warnings + int xRealStart = x; // init it here to avoid compiler warnings if ( !curLine.empty() ) { diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp index 3936df0fff..6672c4b9cb 100644 --- a/src/common/dcgraph.cpp +++ b/src/common/dcgraph.cpp @@ -616,7 +616,7 @@ wxAffineMatrix2D wxGCDCImpl::GetTransformMatrix() const void wxGCDCImpl::ResetTransformMatrix() { - // Reset affine transfrom matrix (extended) to identity matrix. + // Reset affine transform matrix (extended) to identity matrix. m_matrixExtTransform.Set(wxMatrix2D(), wxPoint2DDouble()); ComputeScaleAndOrigin(); } diff --git a/src/common/docview.cpp b/src/common/docview.cpp index d2d0892cb4..d6a7349cde 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -2160,7 +2160,7 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page)) GetPPIPrinter(&ppiPrinterX, &ppiPrinterY); wxUnusedVar(ppiPrinterY); - // This scales the DC so that the printout roughly represents the + // This scales the DC so that the printout roughly represents // the screen scaling. The text point size _should_ be the right size // but in fact is too small for some reason. This is a detail that will // need to be addressed at some point but can be fudged for the diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp index f61322e4ee..0ff7dfbe82 100644 --- a/src/common/evtloopcmn.cpp +++ b/src/common/evtloopcmn.cpp @@ -360,7 +360,7 @@ int wxEventLoopManual::DoRun() } catch ( ... ) { - // OnException() throwed, possibly rethrowing the same + // OnException() thrown, possibly rethrowing the same // exception again: very good, but we still need OnExit() to // be called OnExit(); diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp index 340df47af4..bd93a71657 100644 --- a/src/common/fldlgcmn.cpp +++ b/src/common/fldlgcmn.cpp @@ -77,7 +77,7 @@ bool wxFileDialogBase::Create(wxWindow *parent, assert in wxRegion::DoOffset is triggered later on. Another solution was to override GetWindowStyleFlag() to not include wxFD_FILE_MUST_EXIST in its return value, but as other wxFileDialog - style flags (that are actually used) dont't seem to cause problems + style flags (that are actually used) don't seem to cause problems this seemed an easier solution. */ style &= ~wxFD_FILE_MUST_EXIST; diff --git a/src/common/fs_arc.cpp b/src/common/fs_arc.cpp index d786123327..8209ced597 100644 --- a/src/common/fs_arc.cpp +++ b/src/common/fs_arc.cpp @@ -182,7 +182,7 @@ wxArchiveFSEntry *wxArchiveFSCacheDataImpl::GetNext(wxArchiveFSEntry *fse) //--------------------------------------------------------------------------- // wxArchiveFSCacheData // -// This is the inteface for wxArchiveFSCacheDataImpl above. Holds the catalog +// This is the interface for wxArchiveFSCacheDataImpl above. Holds the catalog // of an archive file, and if it is being read from a non-seekable stream, a // copy of its backing file. //--------------------------------------------------------------------------- @@ -501,7 +501,7 @@ wxString wxArchiveFSHandler::DoFind() match = m_ZipFile + dir + wxT("/") + filename; } else - break; // already tranversed + break; // already transversed } } diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 20442bbc73..db8a01f961 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -418,7 +418,7 @@ wxColour wxColourDatabase::Find(const wxString& colour) const wxColourDatabase * const self = wxConstCast(this, wxColourDatabase); self->Initialize(); - // make the comparaison case insensitive and also match both grey and gray + // make the comparison case insensitive and also match both grey and gray wxString colName = colour; colName.MakeUpper(); wxString colNameAlt = colName; diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp index 90f7ac8dcd..7f5c07333d 100644 --- a/src/common/gifdecod.cpp +++ b/src/common/gifdecod.cpp @@ -370,7 +370,7 @@ wxGIFDecoder::dgif(wxInputStream& stream, GIFImage *img, int interl, int bits) int ab_free; // first free position in alphabet int ab_max; // last possible character in alphabet int pass; // pass number in interlaced images - int pos; // index into decompresion stack + int pos; // index into decompression stack unsigned int x, y; // position in image buffer int code, lastcode, abcabca; diff --git a/src/common/http.cpp b/src/common/http.cpp index c21633e48a..7ff7bb75dd 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -475,7 +475,7 @@ size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize) // if m_httpsize is (size_t) -1 this means read until connection closed // which is equivalent to getting a READ_ERROR, for clients however this // must be translated into EOF, as it is the expected way of signalling - // end end of the content + // end of the content m_lasterror = wxSTREAM_EOF; } diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp index 7c9309612a..b5ba0d2af8 100644 --- a/src/common/imagbmp.cpp +++ b/src/common/imagbmp.cpp @@ -1380,7 +1380,7 @@ bool wxICOHandler::SaveFile(wxImage *image, } image->SetOption(wxIMAGE_OPTION_BMP_FORMAT, bppFormat); - // monochome bitmap: + // monochrome bitmap: mask.SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_1BPP_BW); bool IsBmp = false; bool IsMask = false; diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp index b71cd0bb4b..b6bcbb7a97 100644 --- a/src/common/menucmn.cpp +++ b/src/common/menucmn.cpp @@ -90,7 +90,7 @@ wxEND_FLAGS( wxMenuBarStyle ) #if wxUSE_EXTENDED_RTTI // the negative id would lead the window (its superclass !) to -// vetoe streaming out otherwise +// veto streaming out otherwise bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxObjectWriter *, wxObjectWriterCallback *, const wxStringToAnyHashMap & ) { @@ -509,7 +509,7 @@ int wxMenuBase::FindItem(const wxString& text) const return rc; } - // we execute this code for submenus as well to alllow finding them by + // we execute this code for submenus as well to allow finding them by // name just like the ordinary items if ( !item->IsSeparator() ) { diff --git a/src/common/object.cpp b/src/common/object.cpp index 52d11f3fd7..258ed6ed61 100644 --- a/src/common/object.cpp +++ b/src/common/object.cpp @@ -202,7 +202,7 @@ wxClassInfo *wxClassInfo::FindClass(const wxString& className) // first time the problem will no longer happen; all the modules it depends on // will have been loaded. The assumption is checked using the 'entry' variable // as a reentrance guard, it checks that once the hash table is global it is -// not accessed multiple times simulateously. +// not accessed multiple times simultaneously. void wxClassInfo::Register() { @@ -220,7 +220,7 @@ void wxClassInfo::Register() } else { - // guard againt reentrance once the global has been created + // guard against reentrance once the global has been created wxASSERT_MSG(++entry == 1, wxT("wxClassInfo::Register() reentrance")); classTable = sm_classTable; } @@ -250,7 +250,7 @@ void wxClassInfo::Register() } else { - // the gobal hash has already been created by a reentrant call, + // the global hash has already been created by a reentrant call, // so delete the local hash and try again delete classTable; Register(); diff --git a/src/common/webviewarchivehandler.cpp b/src/common/webviewarchivehandler.cpp index f74e2eba64..697ee6337e 100644 --- a/src/common/webviewarchivehandler.cpp +++ b/src/common/webviewarchivehandler.cpp @@ -73,7 +73,7 @@ wxFSFile* wxWebViewArchiveHandler::GetFile(const wxString &uri) } } - //We do not have a protocol string so we just pass the path withouth the + //We do not have a protocol string so we just pass the path without the if(start == wxString::npos) { size_t doubleslash = path.find("//"); diff --git a/src/dfb/nonownedwnd.cpp b/src/dfb/nonownedwnd.cpp index e54333c68f..5133a19a63 100644 --- a/src/dfb/nonownedwnd.cpp +++ b/src/dfb/nonownedwnd.cpp @@ -430,7 +430,7 @@ void wxNonOwnedWindow::SetDfbFocus() // Note that the events are processed by event loop, i.e. not between // execution of lines (1) and (2) above. So by the time the first // DWET_GOTFOCUS event is handled, tlw2->SetFocus() was already executed. - // If we onconditionally called RequestFocus() from here, handling the + // If we unconditionally called RequestFocus() from here, handling the // first event would result in this change to the event queue: // // DWET_LOSTFOCUS(tlw1) diff --git a/src/dfb/window.cpp b/src/dfb/window.cpp index 4f94d8c9ab..a988485a1a 100644 --- a/src/dfb/window.cpp +++ b/src/dfb/window.cpp @@ -1039,7 +1039,7 @@ void wxWindowDFB::HandleKeyEvent(const wxDFBWindowEvent& event_) return; } - // Synthetize navigation key event, but do it only if the TAB key + // Synthesize navigation key event, but do it only if the TAB key // wasn't handled yet: if ( isTab && GetParent() && GetParent()->HasFlag(wxTAB_TRAVERSAL) ) { diff --git a/src/generic/combog.cpp b/src/generic/combog.cpp index 5b1bcc26ca..625293e32e 100644 --- a/src/generic/combog.cpp +++ b/src/generic/combog.cpp @@ -316,7 +316,7 @@ void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) ) dc.SetPen(tcCol); dc.DrawRectangle(tcRect); - // this is intentionally here to allow drawed rectangle's + // this is intentionally here to allow drawn rectangle's // right edge to be hidden if ( m_text ) tcRect.width = m_widthCustomPaint; diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 5929901511..904c55ad8d 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -306,7 +306,7 @@ int wxGenericFileDialog::ShowModal() bool wxGenericFileDialog::Show( bool show ) { - // Called by ShowModal, so don't repeate the update + // Called by ShowModal, so don't repeat the update #ifndef __WIN32__ if (show) { diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 35a9da4974..3b440be455 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -175,7 +175,7 @@ public: static wxRendererGeneric* DoGetGeneric(); protected: - // draw the rectange using the first pen for the left and top sides and + // draw the rectangle using the first pen for the left and top sides and // the second one for the bottom and right ones void DrawShadedRect(wxDC& dc, wxRect *rect, const wxPen& pen1, const wxPen& pen2); diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp index 4677f922e8..9c3b069b52 100644 --- a/src/gtk/clipbrd.cpp +++ b/src/gtk/clipbrd.cpp @@ -57,7 +57,7 @@ extern GdkAtom g_altTextAtom; // wxClipboardSync: used to perform clipboard operations synchronously // ---------------------------------------------------------------------------- -// constructing this object on stack will wait wait until the latest clipboard +// constructing this object on stack will wait until the latest clipboard // operation is finished on block exit // // notice that there can be no more than one such object alive at any moment, diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index 932ef8bdbc..41e5b765ee 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/button.cpp @@ -212,7 +212,7 @@ wxSize wxButton::DoGetBestSize() const { // the default button in wxGTK is bigger than the other ones because of an // extra border around it, but we don't want to take it into account in - // our size calculations (otherwsie the result is visually ugly), so + // our size calculations (otherwise the result is visually ugly), so // always return the size of non default button from here const bool isDefault = GTK_WIDGET_HAS_DEFAULT(m_widget); if ( isDefault ) diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 0bc35bc65d..8a033e064f 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -771,7 +771,7 @@ wxString wxListBox::GetRealLabel(GList *item) const str = wxString( label->label ); #if wxUSE_CHECKLISTBOX - // checklistboxes have "[±] " prepended to their lables, remove it + // checklistboxes have "[±] " prepended to their labels, remove it // // NB: 4 below is the length of wxCHECKLBOX_STRING from wx/gtk1/checklst.h if ( m_hasCheckBoxes ) diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index fbce6fc20e..f3bedbc3e5 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -1018,7 +1018,7 @@ bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window ) } } -// the font will change for subsequent text insertiongs +// the font will change for subsequent text insertions bool wxTextCtrl::SetFont( const wxFont &font ) { wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") ); diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 7f566f34a6..468d1687c5 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -2510,7 +2510,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest, actually is applied not only to the source but also dest] Be conservative about using the offset and only do it for - currently currently known failing cases: when xdest and xsrc are + currently known failing cases: when xdest and xsrc are equal and only when not actually stretching. */ const wxCoord ofs = (GetLayoutDirection() == wxLayout_RightToLeft diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 4b96c2dec4..87d3486ae8 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -5016,7 +5016,7 @@ bool wxWindowMSW::HandlePaletteChanged(WXHWND hWndPalChange) // same as below except we don't respond to our own messages if ( hWndPalChange != GetHWND() ) { - // check to see if we our our parents have a custom palette + // check to see if we our parents have a custom palette wxWindowMSW *win = this; while ( win && !win->HasCustomPalette() ) { diff --git a/src/qt/textentry.cpp b/src/qt/textentry.cpp index 6a5cbc71dd..b6266f14db 100644 --- a/src/qt/textentry.cpp +++ b/src/qt/textentry.cpp @@ -73,12 +73,12 @@ long wxTextEntry::GetLastPosition() const void wxTextEntry::SetSelection(long WXUNUSED(from), long WXUNUSED(to)) { - wxFAIL_MSG("wxTextEntry::SetSelection should be overriden"); + wxFAIL_MSG("wxTextEntry::SetSelection should be overridden"); } void wxTextEntry::GetSelection(long *from, long *to) const { - // no unified get selection method in Qt (overriden in textctrl & combobox) + // no unified get selection method in Qt (overridden in textctrl & combobox) // only called if no selection // If the return values from and to are the same, there is no // selection. diff --git a/src/richtext/richtextstyledlg.cpp b/src/richtext/richtextstyledlg.cpp index 5a2f8bb6de..eec303cec1 100644 --- a/src/richtext/richtextstyledlg.cpp +++ b/src/richtext/richtextstyledlg.cpp @@ -346,7 +346,7 @@ void wxRichTextStyleOrganiserDialog::CreateControls() else { // Avoid the Escape key logic falling back on OK after finding - // a hidden wxID_CANCEL contol + // a hidden wxID_CANCEL control m_closeButton->SetId(wxID_HIGHEST); m_buttonSizer->Show(m_closeButton, false); } diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp index 80eca90ca8..717f455e5f 100644 --- a/src/richtext/richtextxml.cpp +++ b/src/richtext/richtextxml.cpp @@ -1291,7 +1291,7 @@ wxString wxRichTextXMLHelper::MakeStringFromProperty(const wxVariant& var) return var.MakeString(); } -// Create a proprty from the string read from the XML file. +// Create a property from the string read from the XML file. wxVariant wxRichTextXMLHelper::MakePropertyFromString(const wxString& name, const wxString& value, const wxString& WXUNUSED(type)) { wxVariant var(value, name); diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp index 899d3e3ec1..f2fada0daa 100644 --- a/src/univ/listbox.cpp +++ b/src/univ/listbox.cpp @@ -353,8 +353,8 @@ void wxListBox::DoDeleteOneItem(unsigned int n) } //else: current item may stay - // update the selections array: the indices of all seletected items after - // the one being deleted must change and the item itselfm ust be removed + // update the selections array: the indices of all selected items after + // the one being deleted must change and the item itself just be removed int index = wxNOT_FOUND; unsigned int count = m_selections.GetCount(); for ( unsigned int item = 0; item < count; item++ ) @@ -1429,7 +1429,7 @@ bool wxStdListboxInputHandler::HandleMouse(wxInputConsumer *consumer, winCapture->ReleaseMouse(); m_btnCapture = 0; } - //else: the mouse wasn't presed over the listbox, only released here + //else: the mouse wasn't pressed over the listbox, only released here } else if ( event.LeftDClick() ) { diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp index 49cf5165fc..99fe79c716 100644 --- a/src/univ/menu.cpp +++ b/src/univ/menu.cpp @@ -207,7 +207,7 @@ protected: // show the submenu for this item void OpenSubmenu(wxMenuItem *item, InputMethod how = WithKeyboard); - // can this tiem be opened? + // can this time be opened? bool CanOpen(wxMenuItem *item) { return item && item->IsEnabled() && item->IsSubMenu(); @@ -216,7 +216,7 @@ protected: // dismiss the menu and all parent menus too void DismissAndNotify(); - // react to dimissing this menu and also dismiss the parent if + // react to dismissing this menu and also dismiss the parent if // dismissParent void HandleDismiss(bool dismissParent); @@ -1235,7 +1235,7 @@ wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) if ( pos <= start ) { - // Item is inserted in the begining of the range + // Item is inserted in the beginning of the range // we need to update its end item m_startRadioGroup = pos; item->SetAsRadioGroupStart(); @@ -1465,7 +1465,7 @@ bool wxMenu::ClickItem(wxMenuItem *item) } else { - // not applicabled + // not applicable isChecked = -1; } diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp index b801b9e29b..175d2ebd78 100644 --- a/src/univ/notebook.cpp +++ b/src/univ/notebook.cpp @@ -163,7 +163,7 @@ bool wxNotebook::SetPageText(size_t nPage, const wxString& strText) if ( FixedSizeTabs() ) { - // it's enough to just reresh this one + // it's enough to just refresh this one RefreshTab(nPage); } else // var width tabs @@ -556,7 +556,7 @@ void wxNotebook::DoDraw(wxControlRenderer *renderer) { // unfortunately we can't do this because the selected tab hangs // over its neighbours and so we might need to refresh more tabs - - // of course, we could still avoid rereshing some of them with more + // of course, we could still avoid refreshing some of them with more // complicated checks, but it doesn't seem too bad to refresh all // of them, I still don't see flicker, so leaving as is for now @@ -1105,7 +1105,7 @@ void wxNotebook::UpdateSpinBtn() // efficient m_offset -= GetTabWidth(m_firstVisible--); - // reclaculate after m_firstVisible change + // recalculate after m_firstVisible change CalcLastVisibleTab(); } @@ -1247,7 +1247,7 @@ void wxNotebook::ScrollLastTo(size_t page) // go to it ScrollTo(m_firstVisible); - // consitency check: the page we were asked to show should be shown + // consistency check: the page we were asked to show should be shown wxASSERT_MSG( (size_t)page < m_lastVisible, wxT("bug in ScrollLastTo") ); } diff --git a/src/univ/spinbutt.cpp b/src/univ/spinbutt.cpp index 97d67097ff..32062e7eb9 100644 --- a/src/univ/spinbutt.cpp +++ b/src/univ/spinbutt.cpp @@ -108,7 +108,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal) // because the arrows disabled state might have changed - we don't check if // it really changed or not because SetRange() is called rarely enough and - // son an extre refresh here doesn't really hurt + // an extra refresh here doesn't really hurt Refresh(); } @@ -165,7 +165,7 @@ bool wxSpinButton::ChangeValue(int inc) if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() ) { - // programm has vetoed the event + // program has vetoed the event return false; } diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp index 5759f32ee3..42fcf8b542 100644 --- a/src/univ/statusbr.cpp +++ b/src/univ/statusbr.cpp @@ -232,7 +232,7 @@ wxRect wxStatusBarUniv::DoGetFieldRect(int n) const wxCoord borderBetweenFields; wxRect rect = self->GetTotalFieldRect(&borderBetweenFields); - // it's the caller responsability to check this, if unsure - call + // it's the caller responsibility to check this, if unsure - call // GetFieldRect() instead wxCHECK_MSG( !m_widthsAbs.IsEmpty(), rect, wxT("can't be called if we don't have the widths") ); diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp index eba730d16b..f0005e7946 100644 --- a/src/univ/themes/gtk.cpp +++ b/src/univ/themes/gtk.cpp @@ -932,7 +932,7 @@ void wxGTKRenderer::DrawUndeterminedBitmap(wxDC& dc, bool isPressed) { // FIXME: For sure it is not GTK look but it is better than nothing. - // Show me correct look and I will immediatelly make it better (ABX) + // Show me correct look and I will immediately make it better (ABX) wxRect rect = rectTotal; wxColour col1, col2; @@ -1080,7 +1080,7 @@ wxBitmap wxGTKRenderer::GetCheckBitmap(int flags) dc.SelectObject(m_bitmapsCheckbox[0][1]); DrawUncheckBitmap(dc, rect, false); - // normal undeterminated + // normal undetermined dc.SelectObject(m_bitmapsCheckbox[0][2]); DrawUndeterminedBitmap(dc, rect, false); @@ -1091,7 +1091,7 @@ wxBitmap wxGTKRenderer::GetCheckBitmap(int flags) dc.SelectObject(m_bitmapsCheckbox[1][1]); DrawUncheckBitmap(dc, rect, true); - // pressed undeterminated + // pressed undetermined dc.SelectObject(m_bitmapsCheckbox[1][2]); DrawUndeterminedBitmap(dc, rect, true); } @@ -1809,7 +1809,7 @@ wxMenuGeometryInfo *wxGTKRenderer::GetMenuGeometry(wxWindow *win, gi->m_ofsAccel = gi->m_ofsLabel + widthLabelMax; if ( widthAccelMax > 0 ) { - // if we actually have any accesl, add a margin + // if we actually have any accels, add a margin gi->m_ofsAccel += MENU_ACCEL_MARGIN; } diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp index bb6e6778ce..620bf778fe 100644 --- a/src/univ/themes/win32.cpp +++ b/src/univ/themes/win32.cpp @@ -1768,7 +1768,7 @@ void wxWin32Renderer::DrawToolBarButton(wxDC& dc, } else if (style == wxTOOL_STYLE_SEPARATOR) { - // leave a small gap aroudn the line, also account for the toolbar + // leave a small gap around the line, also account for the toolbar // border itself if(rectOrig.height > rectOrig.width) { @@ -3145,7 +3145,7 @@ void wxWin32Renderer::AdjustSize(wxSize *size, const wxWindow *window) { if ( !(window->GetWindowStyle() & wxBU_EXACTFIT) ) { - // TODO: don't harcode all this + // TODO: don't hardcode all this size->x += 3*window->GetCharWidth(); wxCoord heightBtn = (11*(window->GetCharHeight() + 8))/10; diff --git a/src/x11/app.cpp b/src/x11/app.cpp index 40bb2fd7bc..63ba5bc0b7 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -400,7 +400,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) switch ( keyEvent.m_keyCode ) { // for modifiers, don't send wxEVT_CHAR event. - // the definition of Modifiers, plese see the doc of + // the definition of Modifiers, please see the doc of // wxKeyModifier. we only take care of wxMOD_ALT, wxMOD_CONTROL // wxMOD_SHIFT under X11 platform. Other modifiers is handled // by window manager. @@ -441,7 +441,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) wxKeyEvent keyEvent(wxEVT_KEY_UP); wxTranslateKeyEvent(keyEvent, win, window, event); - // if recieve the modifiers key up. set the corresponding + // if receive the modifiers key up. set the corresponding // keyboardState to false. switch ( keyEvent.m_keyCode ) { @@ -771,7 +771,7 @@ Window wxGetWindowParent(Window window) return (Window) 0; #ifndef __VMS - // VMS chokes on unreacheable code + // VMS chokes on unreachable code Window parent, root = 0; #if wxUSE_NANOX int noChildren = 0; diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp index ac53d637a7..4a5016c502 100644 --- a/src/x11/dataobj.cpp +++ b/src/x11/dataobj.cpp @@ -213,7 +213,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) { // VZ: old format #if 0 - // filenames are stores as a string with #0 as deliminators + // filenames are stores as a string with #0 as delimitors const char *filenames = (const char*) buf; size_t pos = 0; for(;;) diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp index b3f7d8c8c5..58f3bc2e24 100644 --- a/src/x11/dcclient.cpp +++ b/src/x11/dcclient.cpp @@ -1374,7 +1374,7 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoor { /* we SHOULD use the direct way if all of the bitmap in the memory dc is copied in which case XCopyArea - wouldn't be able able to boost performace by reducing + wouldn't be able able to boost performance by reducing the area to be scaled */ use_bitmap_method = true; } diff --git a/src/x11/palette.cpp b/src/x11/palette.cpp index 1559ecac17..52196caa33 100644 --- a/src/x11/palette.cpp +++ b/src/x11/palette.cpp @@ -228,11 +228,11 @@ int wxPalette::GetPixel(unsigned char WXUNUSED(red), return wxNOT_FOUND; } -// In all wx ports, when declare GetRGB, the first parameter is "int pixel" -// the docs said the function is used to "Returns RGB values for a given -// palette index." And in GetRGB implementation, all port named the first -// parameter to " int index". I don't it is whether intended, but "index" -// is more meanning for, and to be consistent with other ports, I renamed +// In all wx ports, when declaring GetRGB, the first parameter is "int pixel." +// The docs said the function is used to "Returns RGB values for a given +// palette index." And in GetRGB implementation, all ports name the first +// parameter to "int index". I don't know whether that is intended, but "index" +// is more meaningful, and to be consistent with other ports, I renamed // the first parameter from pixel to index. bool wxPalette::GetRGB(int index, unsigned char *red,