From e3f14236329524dde04e02a5103238206ac98d06 Mon Sep 17 00:00:00 2001 From: orbitcowboy Date: Tue, 12 Apr 2016 17:02:14 +0200 Subject: [PATCH] Fix typos in comments in C++ code No real changes. Closes https://github.com/wxWidgets/wxWidgets/pull/268 --- include/wx/combo.h | 12 ++++++------ include/wx/datetime.h | 2 +- include/wx/platinfo.h | 2 +- include/wx/scopedptr.h | 2 +- include/wx/treectrl.h | 2 +- include/wx/window.h | 12 ++++++------ include/wx/xtitypes.h | 4 ++-- interface/wx/collheaderctrl.h | 6 +++--- interface/wx/docview.h | 4 ++-- interface/wx/grid.h | 6 +++--- interface/wx/log.h | 4 ++-- interface/wx/mimetype.h | 2 +- interface/wx/taskbarbutton.h | 2 +- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/include/wx/combo.h b/include/wx/combo.h index 29cd02e819..9e26ddd318 100644 --- a/include/wx/combo.h +++ b/include/wx/combo.h @@ -327,7 +327,7 @@ public: // side: wxLEFT or wxRIGHT, indicates on which side the button will be placed. // spacingX: empty space on sides of the button. Default is 0. // Remarks: - // There is no spacingY - the button will be centered vertically. + // There is no spacingY - the button will be centred vertically. void SetButtonPosition( int width = -1, int height = -1, int side = wxRIGHT, @@ -397,7 +397,7 @@ public: } // - // Utilies needed by the popups or native implementations + // Utilities needed by the popups or native implementations // // Returns true if given key combination should toggle the popup. @@ -494,7 +494,7 @@ protected: // called from wxSizeEvent handler virtual void OnResize() = 0; - // Return native text identation + // Return native text indentation // (i.e. text margin, for pure text, not textctrl) virtual wxCoord GetNativeTextIndent() const; @@ -553,7 +553,7 @@ protected: // NULL popup can be used to indicate default in a derived class virtual void DoSetPopupControl(wxComboPopup* popup); - // ensures there is atleast the default popup + // ensures there is at least the default popup void EnsurePopupControl(); // Recalculates button and textctrl areas. Called when size or button setup change. @@ -711,7 +711,7 @@ protected: // draw blank button background under bitmap? bool m_blankButtonBg; - // is the popup window currenty shown? + // is the popup window currently shown? wxByte m_popupWinState; // should the focus be reset to the textctrl in idle time? @@ -831,7 +831,7 @@ public: virtual bool LazyCreate(); // - // Utilies + // Utilities // // Hides the popup diff --git a/include/wx/datetime.h b/include/wx/datetime.h index d35667246f..be8bbdc30a 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -1243,7 +1243,7 @@ public: // there is intentionally no division because we don't want to // introduce rounding errors in time calculations - // comparaison (see also operator versions below) + // comparison (see also operator versions below) // ------------------------------------------------------------------------ // is the timespan null? diff --git a/include/wx/platinfo.h b/include/wx/platinfo.h index cc13959567..af14dd2fb9 100644 --- a/include/wx/platinfo.h +++ b/include/wx/platinfo.h @@ -108,7 +108,7 @@ enum wxEndianness wxENDIAN_MAX }; -// informations about a linux distro returned by the lsb_release utility +// information about a linux distro returned by the lsb_release utility struct wxLinuxDistributionInfo { wxString Id; diff --git a/include/wx/scopedptr.h b/include/wx/scopedptr.h index 9cc8f3968e..ea83299fec 100644 --- a/include/wx/scopedptr.h +++ b/include/wx/scopedptr.h @@ -9,7 +9,7 @@ ///////////////////////////////////////////////////////////////////////////// // This class closely follows the implementation of the boost -// library scoped_ptr and is an adaption for c++ macro's in +// library scoped_ptr and is an adaptation for c++ macro's in // the wxWidgets project. The original authors of the boost // scoped_ptr are given below with their respective copyrights. diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h index 9dfc85fb85..f73ade7b2a 100644 --- a/include/wx/treectrl.h +++ b/include/wx/treectrl.h @@ -362,7 +362,7 @@ public: // this function is called to compare 2 items and should return -1, 0 // or +1 if the first item is less than, equal to or greater than the - // second one. The base class version performs alphabetic comparaison + // second one. The base class version performs alphabetic comparison // of item labels (GetText) virtual int OnCompareItems(const wxTreeItemId& item1, const wxTreeItemId& item2) diff --git a/include/wx/window.h b/include/wx/window.h index 80938e9fb1..c5bac6248f 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -101,7 +101,7 @@ struct WXDLLIMPEXP_CORE wxVisualAttributes wxColour colBg; }; -// different window variants, on platforms like eg mac uses different +// different window variants, on platforms like e.g. mac uses different // rendering sizes enum wxWindowVariant { @@ -205,7 +205,7 @@ public: virtual void SetLabel(const wxString& label) = 0; virtual wxString GetLabel() const = 0; - // the window name is used for ressource setting in X, it is not the + // the window name is used for resource setting in X, it is not the // same as the window title/label virtual void SetName( const wxString &name ) { m_windowName = name; } virtual wxString GetName() const { return m_windowName; } @@ -508,7 +508,7 @@ public: } // Override these methods for windows that have a virtual size - // independent of their client size. eg. the virtual area of a + // independent of their client size. e.g. the virtual area of a // wxScrolledWindow. virtual void DoSetVirtualSize( int x, int y ); @@ -526,7 +526,7 @@ public: } // returns the magnification of the content of this window - // eg 2.0 for a window on a retina screen + // e.g. 2.0 for a window on a retina screen virtual double GetContentScaleFactor() const; // return the size of the left/right and top/bottom borders in x and y @@ -842,7 +842,7 @@ public: void SetEventHandler( wxEvtHandler *handler ); // push/pop event handler: allows to chain a custom event handler to - // alreasy existing ones + // already existing ones void PushEventHandler( wxEvtHandler *handler ); wxEvtHandler *PopEventHandler( bool deleteHandler = false ); @@ -1069,7 +1069,7 @@ public: const wxRegion& GetUpdateRegion() const { return m_updateRegion; } wxRegion& GetUpdateRegion() { return m_updateRegion; } - // get the update rectangleregion bounding box in client coords + // get the update rectangle region bounding box in client coords wxRect GetUpdateClientRect() const; // these functions verify whether the given point/rectangle belongs to diff --git a/include/wx/xtitypes.h b/include/wx/xtitypes.h index afd5c07b45..f8d7165643 100644 --- a/include/wx/xtitypes.h +++ b/include/wx/xtitypes.h @@ -30,7 +30,7 @@ class WXDLLIMPEXP_BASE wxClassInfo; // Enum Support // // In the header files XTI requires no change from pure c++ code, however in the -// implementation, an enum needs to be enumerated eg: +// implementation, an enum needs to be enumerated e.g.: // // wxBEGIN_ENUM( wxFlavor ) // wxENUM_MEMBER( Vanilla ) @@ -60,7 +60,7 @@ public: int GetEnumMemberValue(const wxChar *name ) const; // returns the name of the enum member having the passed in value - // returns an emtpy string if not found + // returns an empty string if not found const wxChar *GetEnumMemberName(int value) const; // returns the number of members in this enum diff --git a/interface/wx/collheaderctrl.h b/interface/wx/collheaderctrl.h index 7e2182de6b..de1bf82ebc 100644 --- a/interface/wx/collheaderctrl.h +++ b/interface/wx/collheaderctrl.h @@ -12,9 +12,9 @@ Header control above a collapsible pane. - The collapsible header usually constists of a small indicator of the + The collapsible header usually consists of a small indicator of the collapsed state and the label text beside it. - This class is used by the generic implemetation of wxCollapsiblePane but + This class is used by the generic implementation of wxCollapsiblePane but maybe used in more complex layouts for other uses. @beginEventTable{wxCommandEvent} @@ -65,7 +65,7 @@ public: const wxString& name = wxCollapsibleHeaderCtrlNameStr); /** - Set collpased state of the header. + Set collapsed state of the header. */ virtual void SetCollapsed(bool collapsed = true); diff --git a/interface/wx/docview.h b/interface/wx/docview.h index af3d47d930..b4670d759d 100644 --- a/interface/wx/docview.h +++ b/interface/wx/docview.h @@ -716,7 +716,7 @@ public: @beginWxPerlOnly In wxPerl @a templates is a reference to a list of templates. If you override this method in your document manager it must - return two values, eg: + return two values, e.g.: @code (doctemplate, path) = My::DocManager->SelectDocumentPath(...); @@ -1302,7 +1302,7 @@ public: Calls wxView::Close() and deletes each view. Deleting the final view will implicitly delete the document itself, because the wxView destructor calls RemoveView(). This in turns calls OnChangedViewList(), - whose default implemention is to save and delete the document if no + whose default implementation is to save and delete the document if no views exist. */ virtual bool DeleteAllViews(); diff --git a/interface/wx/grid.h b/interface/wx/grid.h index 8929f09492..677af21bf0 100644 --- a/interface/wx/grid.h +++ b/interface/wx/grid.h @@ -626,7 +626,7 @@ public: @class wxGridCellEnumEditor Grid cell editor which displays an enum number as a textual equivalent - (eg. data in cell is 0,1,2 ... n the cell could be displayed as + (e.g. data in cell is 0,1,2 ... n the cell could be displayed as "John","Fred"..."Bob" in the combo choice box). @library{wxadv} @@ -1741,8 +1741,8 @@ public: /*! @name Table Row and Column Labels - By default the numbers are used for labeling rows and Latin letters for - labeling columns. If the table has more than 26 columns, the pairs of + By default the numbers are used for labelling rows and Latin letters for + labelling columns. If the table has more than 26 columns, the pairs of letters are used starting from the 27-th one and so on, i.e. the sequence of labels is A, B, ..., Z, AA, AB, ..., AZ, BA, ..., ..., ZZ, AAA, ... diff --git a/interface/wx/log.h b/interface/wx/log.h index d365548d54..c92daf9a7a 100644 --- a/interface/wx/log.h +++ b/interface/wx/log.h @@ -134,7 +134,7 @@ public: associated with this log record. @return - The formated message. + The formatted message. @note Time stamping is disabled for Visual C++ users in debug builds by @@ -157,7 +157,7 @@ protected: Time to format. @return - The formated time string, may be empty. + The formatted time string, may be empty. */ virtual wxString FormatTime(time_t time) const; }; diff --git a/interface/wx/mimetype.h b/interface/wx/mimetype.h index 18426b6f68..54d0e10666 100644 --- a/interface/wx/mimetype.h +++ b/interface/wx/mimetype.h @@ -447,7 +447,7 @@ public: ...); /** - Constuctor using an array of string elements corresponding to the + Constructor using an array of string elements corresponding to the parameters of the ctor above in the same order. */ wxFileTypeInfo(const wxArrayString& sArray); diff --git a/interface/wx/taskbarbutton.h b/interface/wx/taskbarbutton.h index 18497de0f7..fdd9bf34b1 100644 --- a/interface/wx/taskbarbutton.h +++ b/interface/wx/taskbarbutton.h @@ -268,7 +268,7 @@ public: @param rect The portion inside of the window. Setting with an empty wxRect will - restore the default diaplay of the thumbnail. + restore the default display of the thumbnail. */ virtual void SetThumbnailClip(const wxRect& rect);