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
This commit is contained in:
@@ -706,7 +706,7 @@ public:
|
|||||||
wxDateTime& SetToPrevWeekDay(WeekDay weekday);
|
wxDateTime& SetToPrevWeekDay(WeekDay weekday);
|
||||||
inline wxDateTime GetPrevWeekDay(WeekDay weekday) const;
|
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
|
// 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
|
// failure. n may be positive (1..5) or negative to count from the end
|
||||||
// of the month (see helper function SetToLastWeekDay())
|
// of the month (see helper function SetToLastWeekDay())
|
||||||
|
@@ -100,7 +100,7 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxHtmlHelpDataItem, wxHtmlHelpDataItems,
|
|||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// wxHtmlSearchEngine
|
// wxHtmlSearchEngine
|
||||||
// This class takes input streams and scans them for occurence
|
// This class takes input streams and scans them for occurrence
|
||||||
// of keyword(s)
|
// of keyword(s)
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@@ -130,16 +130,16 @@ public:
|
|||||||
// pattern match
|
// pattern match
|
||||||
//
|
//
|
||||||
// maxMatches may be used to limit the number of replacements made, setting
|
// 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
|
// pattern in the text while default value of 0 means replace all
|
||||||
int Replace(wxString *text, const wxString& replacement,
|
int Replace(wxString *text, const wxString& replacement,
|
||||||
size_t maxMatches = 0) const;
|
size_t maxMatches = 0) const;
|
||||||
|
|
||||||
// replace the first occurence
|
// replace the first occurrence
|
||||||
int ReplaceFirst(wxString *text, const wxString& replacement) const
|
int ReplaceFirst(wxString *text, const wxString& replacement) const
|
||||||
{ return Replace(text, replacement, 1); }
|
{ 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
|
int ReplaceAll(wxString *text, const wxString& replacement) const
|
||||||
{ return Replace(text, replacement, 0); }
|
{ return Replace(text, replacement, 0); }
|
||||||
|
|
||||||
|
@@ -2117,16 +2117,16 @@ public:
|
|||||||
wxString Left(size_t nCount) const;
|
wxString Left(size_t nCount) const;
|
||||||
// get last nCount characters
|
// get last nCount characters
|
||||||
wxString Right(size_t nCount) const;
|
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)
|
// (returns the whole string if ch not found)
|
||||||
wxString BeforeFirst(wxUniChar ch) const;
|
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)
|
// (returns empty string if ch not found)
|
||||||
wxString BeforeLast(wxUniChar ch) const;
|
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)
|
// (returns empty string if ch not found)
|
||||||
wxString AfterFirst(wxUniChar ch) const;
|
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)
|
// (returns the whole string if ch not found)
|
||||||
wxString AfterLast(wxUniChar ch) const;
|
wxString AfterLast(wxUniChar ch) const;
|
||||||
|
|
||||||
@@ -2191,7 +2191,7 @@ public:
|
|||||||
int Find(const wxWCharBuffer& sub) const
|
int Find(const wxWCharBuffer& sub) const
|
||||||
{ return Find(sub.data()); }
|
{ 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
|
// another string, returns the number of replacements made
|
||||||
size_t Replace(const wxString& strOld,
|
size_t Replace(const wxString& strOld,
|
||||||
const wxString& strNew,
|
const wxString& strNew,
|
||||||
@@ -3014,7 +3014,7 @@ public:
|
|||||||
size_t find(const wxCStrData& s, size_t nStart = 0, size_t n = npos) const
|
size_t find(const wxCStrData& s, size_t nStart = 0, size_t n = npos) const
|
||||||
{ return find(s.AsWChar(), nStart, n); }
|
{ 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
|
size_t find(wxUniChar ch, size_t nStart = 0) const
|
||||||
{
|
{
|
||||||
#if wxUSE_UNICODE_UTF8
|
#if wxUSE_UNICODE_UTF8
|
||||||
@@ -3080,7 +3080,7 @@ public:
|
|||||||
size_t rfind(wchar_t ch, size_t nStart = npos) const
|
size_t rfind(wchar_t ch, size_t nStart = npos) const
|
||||||
{ return rfind(wxUniChar(ch), nStart); }
|
{ 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
|
#if wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
|
||||||
// FIXME-UTF8: this is not entirely correct, because it doesn't work if
|
// FIXME-UTF8: this is not entirely correct, because it doesn't work if
|
||||||
// sizeof(wchar_t)==2 and surrogates are present in the string;
|
// 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
|
size_t find_last_of(wxUniChar c, size_t nStart = npos) const
|
||||||
{ return rfind(c, nStart); }
|
{ 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
|
// as strspn() (starting from nStart), returns npos on failure
|
||||||
size_t find_first_not_of(const wxString& str, size_t nStart = 0) const
|
size_t find_first_not_of(const wxString& str, size_t nStart = 0) const
|
||||||
|
@@ -1276,7 +1276,7 @@ wxString wxString::Right(size_t nCount) const
|
|||||||
return dest;
|
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)
|
// (returns the whole string if ch not found)
|
||||||
wxString wxString::AfterLast(wxUniChar ch) const
|
wxString wxString::AfterLast(wxUniChar ch) const
|
||||||
{
|
{
|
||||||
@@ -1303,7 +1303,7 @@ wxString wxString::Left(size_t nCount) const
|
|||||||
return dest;
|
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)
|
// (returns the whole string if ch not found)
|
||||||
wxString wxString::BeforeFirst(wxUniChar ch) const
|
wxString wxString::BeforeFirst(wxUniChar ch) const
|
||||||
{
|
{
|
||||||
@@ -1313,7 +1313,7 @@ wxString wxString::BeforeFirst(wxUniChar ch) const
|
|||||||
return wxString(*this, 0, iPos);
|
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)
|
/// (returns empty string if ch not found)
|
||||||
wxString wxString::BeforeLast(wxUniChar ch) const
|
wxString wxString::BeforeLast(wxUniChar ch) const
|
||||||
{
|
{
|
||||||
@@ -1325,7 +1325,7 @@ wxString wxString::BeforeLast(wxUniChar ch) const
|
|||||||
return str;
|
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)
|
/// (returns empty string if ch not found)
|
||||||
wxString wxString::AfterFirst(wxUniChar ch) const
|
wxString wxString::AfterFirst(wxUniChar ch) const
|
||||||
{
|
{
|
||||||
@@ -1337,7 +1337,7 @@ wxString wxString::AfterFirst(wxUniChar ch) const
|
|||||||
return str;
|
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,
|
size_t wxString::Replace(const wxString& strOld,
|
||||||
const wxString& strNew, bool bReplaceAll)
|
const wxString& strNew, bool bReplaceAll)
|
||||||
{
|
{
|
||||||
|
@@ -1040,7 +1040,7 @@ static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags)
|
|||||||
// in is -1 (meaning "current") by default, replace it with
|
// in is -1 (meaning "current") by default, replace it with
|
||||||
// 0 which means "new" (see KB article 160957)
|
// 0 which means "new" (see KB article 160957)
|
||||||
ok = ddeCmd.Replace(wxT("-1"), wxT("0"),
|
ok = ddeCmd.Replace(wxT("-1"), wxT("0"),
|
||||||
false /* only first occurence */) == 1;
|
false /* only first occurrence */) == 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ok )
|
if ( ok )
|
||||||
|
@@ -533,7 +533,7 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id,
|
|||||||
m_SearchWholeWords = new wxCheckBox(dummy, wxID_ANY, _("Whole words only"));
|
m_SearchWholeWords = new wxCheckBox(dummy, wxID_ANY, _("Whole words only"));
|
||||||
m_SearchButton = new wxButton(dummy, wxID_HTML_SEARCHBUTTON, _("Search"));
|
m_SearchButton = new wxButton(dummy, wxID_HTML_SEARCHBUTTON, _("Search"));
|
||||||
#if wxUSE_TOOLTIPS
|
#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
|
#endif //wxUSE_TOOLTIPS
|
||||||
m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST,
|
m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST,
|
||||||
wxDefaultPosition, wxDefaultSize,
|
wxDefaultPosition, wxDefaultSize,
|
||||||
|
Reference in New Issue
Block a user