From e75e8815757816135722ee8c8c144979449b14a7 Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Sun, 19 Feb 2012 14:49:37 +0000 Subject: [PATCH] Spelling fixed for comments and a wxASSERT_MSG. Fixes #14022. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/grid.cpp | 2 +- src/generic/odcombo.cpp | 2 +- src/generic/regiong.cpp | 2 +- src/generic/statusbr.cpp | 2 +- src/generic/treectlg.cpp | 2 +- src/generic/wizard.cpp | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 37ee7707ee..fc9cc7e598 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -419,7 +419,7 @@ void wxGridCellAttr::SetSize(int num_rows, int num_cols) wxASSERT_MSG( (!((num_rows > 0) && (num_cols <= 0)) || !((num_rows <= 0) && (num_cols > 0)) || !((num_rows == 0) && (num_cols == 0))), - wxT("wxGridCellAttr::SetSize only takes two postive values or negative/zero values")); + wxT("wxGridCellAttr::SetSize only takes two positive values or negative/zero values")); m_sizeRows = num_rows; m_sizeCols = num_cols; diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp index 6425dd145d..8d664eb25f 100644 --- a/src/generic/odcombo.cpp +++ b/src/generic/odcombo.cpp @@ -375,7 +375,7 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar keychar // The m_combo->SetValue() call above sets m_value to the index of this // string. But if there are more identical string, the index is of the - // first occurence, which may be wrong, so set the index explicitly here, + // first occurrence, which may be wrong, so set the index explicitly here, // _after_ the SetValue() call. m_value = value; diff --git a/src/generic/regiong.cpp b/src/generic/regiong.cpp index bc3a24f8e2..caf5cc7a4a 100644 --- a/src/generic/regiong.cpp +++ b/src/generic/regiong.cpp @@ -1645,7 +1645,7 @@ miSubtractO ( else if (r2->x1 <= x1) { /* - * Subtrahend preceeds minuend: nuke left edge of minuend. + * Subtrahend precedes minuend: nuke left edge of minuend. */ x1 = r2->x2; if (x1 >= r1->x2) diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index 3fdc2d8bc8..c7d209caef 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -275,7 +275,7 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i, int textHeight) GetFieldRect(i, rect); if (rect.GetWidth() <= 0) - return; // happens when the status bar is shrinked in a very small area! + return; // happens when the status bar is shrunk in a very small area! int style = m_panes[i].GetStyle(); if (style != wxSB_FLAT) diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index 180e451364..b11fd4b449 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -2879,7 +2879,7 @@ wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem *item, yOrigin = abs(yOrigin); GetClientSize(&width, &height); - // Move end points to the begining/end of the view? + // Move end points to the beginning/end of the view? if (y_mid < yOrigin) y_mid = yOrigin; if (oldY > yOrigin + height) diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp index d87d766a07..d8dbd11137 100644 --- a/src/generic/wizard.cpp +++ b/src/generic/wizard.cpp @@ -396,7 +396,7 @@ void wxWizard::AddButtonRow(wxBoxSizer *mainColumn) // to activate the 'next' button first (create the next button before the back button). // The reason is: The user will repeatedly enter information in the wizard pages and then wants to // press 'next'. If a user uses mostly the keyboard, he would have to skip the 'back' button - // everytime. This is annoying. There is a second reason: RETURN acts as TAB. If the 'next' + // every time. This is annoying. There is a second reason: RETURN acts as TAB. If the 'next' // button comes first in the TAB order, the user can enter information very fast using the RETURN // key to TAB to the next entry field and page. This would not be possible, if the 'back' button // was created before the 'next' button. @@ -782,7 +782,7 @@ void wxWizard::OnBackOrNext(wxCommandEvent& event) wxCHECK_RET( m_page, wxT("should have a valid current page") ); // ask the current page first: notice that we do it before calling - // GetNext/Prev() because the data transfered from the controls of the page + // GetNext/Prev() because the data transferred from the controls of the page // may change the value returned by these methods if ( !m_page->Validate() || !m_page->TransferDataFromWindow() ) { -- 2.45.2