From 7929902d65215d481c59733a5d05b81e373b8237 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 29 Sep 2008 12:10:58 +0000 Subject: [PATCH] no real changes, just fixed all occurences of 'occurence' typo git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/datetime.h | 2 +- include/wx/html/helpdata.h | 2 +- include/wx/regex.h | 6 +++--- include/wx/string.h | 16 ++++++++-------- src/common/string.cpp | 10 +++++----- src/common/utilscmn.cpp | 2 +- src/html/helpwnd.cpp | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/wx/datetime.h b/include/wx/datetime.h index 7da0c17a28..5942e0cc33 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -706,7 +706,7 @@ public: wxDateTime& SetToPrevWeekDay(WeekDay weekday); inline wxDateTime GetPrevWeekDay(WeekDay weekday) const; - // set to Nth occurence of given weekday in the given month of the + // set to Nth occurrence of given weekday in the given month of the // given year (time is set to 0), return true on success and false on // failure. n may be positive (1..5) or negative to count from the end // of the month (see helper function SetToLastWeekDay()) diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h index 2ee6fa33b8..320235a446 100644 --- a/include/wx/html/helpdata.h +++ b/include/wx/html/helpdata.h @@ -100,7 +100,7 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxHtmlHelpDataItem, wxHtmlHelpDataItems, //------------------------------------------------------------------------------ // wxHtmlSearchEngine -// This class takes input streams and scans them for occurence +// This class takes input streams and scans them for occurrence // of keyword(s) //------------------------------------------------------------------------------ diff --git a/include/wx/regex.h b/include/wx/regex.h index 1659c6231e..5aa6368e82 100644 --- a/include/wx/regex.h +++ b/include/wx/regex.h @@ -130,16 +130,16 @@ public: // pattern match // // maxMatches may be used to limit the number of replacements made, setting - // it to 1, for example, will only replace first occurence (if any) of the + // it to 1, for example, will only replace first occurrence (if any) of the // pattern in the text while default value of 0 means replace all int Replace(wxString *text, const wxString& replacement, size_t maxMatches = 0) const; - // replace the first occurence + // replace the first occurrence int ReplaceFirst(wxString *text, const wxString& replacement) const { return Replace(text, replacement, 1); } - // replace all occurences: this is actually a synonym for Replace() + // replace all occurrences: this is actually a synonym for Replace() int ReplaceAll(wxString *text, const wxString& replacement) const { return Replace(text, replacement, 0); } diff --git a/include/wx/string.h b/include/wx/string.h index 44e0d7d2ae..43dfbcb175 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -2117,16 +2117,16 @@ public: wxString Left(size_t nCount) const; // get last nCount characters wxString Right(size_t nCount) const; - // get all characters before the first occurance of ch + // get all characters before the first occurrence of ch // (returns the whole string if ch not found) wxString BeforeFirst(wxUniChar ch) const; - // get all characters before the last occurence of ch + // get all characters before the last occurrence of ch // (returns empty string if ch not found) wxString BeforeLast(wxUniChar ch) const; - // get all characters after the first occurence of ch + // get all characters after the first occurrence of ch // (returns empty string if ch not found) wxString AfterFirst(wxUniChar ch) const; - // get all characters after the last occurence of ch + // get all characters after the last occurrence of ch // (returns the whole string if ch not found) wxString AfterLast(wxUniChar ch) const; @@ -2191,7 +2191,7 @@ public: int Find(const wxWCharBuffer& sub) const { return Find(sub.data()); } - // replace first (or all of bReplaceAll) occurences of substring with + // replace first (or all of bReplaceAll) occurrences of substring with // another string, returns the number of replacements made size_t Replace(const wxString& strOld, const wxString& strNew, @@ -3014,7 +3014,7 @@ public: size_t find(const wxCStrData& s, size_t nStart = 0, size_t n = npos) const { return find(s.AsWChar(), nStart, n); } - // find the first occurence of character ch after nStart + // find the first occurrence of character ch after nStart size_t find(wxUniChar ch, size_t nStart = 0) const { #if wxUSE_UNICODE_UTF8 @@ -3080,7 +3080,7 @@ public: size_t rfind(wchar_t ch, size_t nStart = npos) const { return rfind(wxUniChar(ch), nStart); } - // find first/last occurence of any character (not) in the set: + // find first/last occurrence of any character (not) in the set: #if wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8 // FIXME-UTF8: this is not entirely correct, because it doesn't work if // sizeof(wchar_t)==2 and surrogates are present in the string; @@ -3171,7 +3171,7 @@ public: size_t find_last_of(wxUniChar c, size_t nStart = npos) const { return rfind(c, nStart); } - // find first/last occurence of any character not in the set + // find first/last occurrence of any character not in the set // as strspn() (starting from nStart), returns npos on failure size_t find_first_not_of(const wxString& str, size_t nStart = 0) const diff --git a/src/common/string.cpp b/src/common/string.cpp index 573e5073c2..5729c48c65 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1276,7 +1276,7 @@ wxString wxString::Right(size_t nCount) const return dest; } -// get all characters after the last occurence of ch +// get all characters after the last occurrence of ch // (returns the whole string if ch not found) wxString wxString::AfterLast(wxUniChar ch) const { @@ -1303,7 +1303,7 @@ wxString wxString::Left(size_t nCount) const return dest; } -// get all characters before the first occurence of ch +// get all characters before the first occurrence of ch // (returns the whole string if ch not found) wxString wxString::BeforeFirst(wxUniChar ch) const { @@ -1313,7 +1313,7 @@ wxString wxString::BeforeFirst(wxUniChar ch) const return wxString(*this, 0, iPos); } -/// get all characters before the last occurence of ch +/// get all characters before the last occurrence of ch /// (returns empty string if ch not found) wxString wxString::BeforeLast(wxUniChar ch) const { @@ -1325,7 +1325,7 @@ wxString wxString::BeforeLast(wxUniChar ch) const return str; } -/// get all characters after the first occurence of ch +/// get all characters after the first occurrence of ch /// (returns empty string if ch not found) wxString wxString::AfterFirst(wxUniChar ch) const { @@ -1337,7 +1337,7 @@ wxString wxString::AfterFirst(wxUniChar ch) const return str; } -// replace first (or all) occurences of some substring with another one +// replace first (or all) occurrences of some substring with another one size_t wxString::Replace(const wxString& strOld, const wxString& strNew, bool bReplaceAll) { diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 09e45f2a47..24cd3374d3 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -1040,7 +1040,7 @@ static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags) // in is -1 (meaning "current") by default, replace it with // 0 which means "new" (see KB article 160957) ok = ddeCmd.Replace(wxT("-1"), wxT("0"), - false /* only first occurence */) == 1; + false /* only first occurrence */) == 1; } if ( ok ) diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp index 115a299cdf..e350f6e1b4 100644 --- a/src/html/helpwnd.cpp +++ b/src/html/helpwnd.cpp @@ -533,7 +533,7 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id, m_SearchWholeWords = new wxCheckBox(dummy, wxID_ANY, _("Whole words only")); m_SearchButton = new wxButton(dummy, wxID_HTML_SEARCHBUTTON, _("Search")); #if wxUSE_TOOLTIPS - m_SearchButton->SetToolTip(_("Search contents of help book(s) for all occurences of the text you typed above")); + m_SearchButton->SetToolTip(_("Search contents of help book(s) for all occurrences of the text you typed above")); #endif //wxUSE_TOOLTIPS m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, -- 2.45.2